Merge branch 'master' of git://anongit.kde.org/kdenlive

diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt
index c94871eb7df9a14ca895d6a8cd94ba5b037fd5ca..3b3d11d2c59e35e2149cb5d410fd1b41e5bdf1e6 100644 (file)
--- a/data/blacklisted_effects.txt
+++ b/data/blacklisted_effects.txt
@@ -38,7 +38,7 @@ frei0r.facedetect
 frei0r.facebl0r
 frei0r.flippo
 frei0r.glow
-frei0r.iirblur
+frei0r.IIRblur
 frei0r.hqdn3d
 frei0r.hueshift0r
 frei0r.lenscorrection

diff --git a/effects/boxblur.xml b/effects/boxblur.xml
index 570de690415093185e87b0665e13a139fbde964f..761388e11f90e618f6552aa478e6ef7dd889629d 100644 (file)
--- a/effects/boxblur.xml
+++ b/effects/boxblur.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE kpartgui>
 <effect tag="boxblur" id="boxblur">
        <name>Box Blur</name>
-       <description>Blur image with keyframes</description>
+       <description>Box blur (separate horizontal and vertical blur)</description>
        <author>Leny Grisel</author>
        <parameter type="constant" name="hori" max="50" min="1" default="1">
                <name>Horizontal multiplicator</name>

diff --git a/effects/frei0r_iirblur.xml b/effects/frei0r_iirblur.xml
index f17750855b6dd6aa361043da233f2fa34ac91303..f190444a40b7925ddf0410141db52eff8038be98 100644 (file)
--- a/effects/frei0r_iirblur.xml
+++ b/effects/frei0r_iirblur.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE kpartgui>
 <effect tag="frei0r.IIRblur" id="frei0r.IIRblur">
-        <name>IIR Blur</name>
-        <description>Blur using 2D IIR filters</description>
+        <name>Blur</name>
+        <description>Blur using 2D IIR filters (Exponential, Lowpass, Gaussian)</description>
         <author>Marko Cebokli</author>
         
         <parameter type="simplekeyframe" name="Amount" default="40" min="0" max="1000" factor="1000">

diff --git a/effects/frei0r_squareblur.xml b/effects/frei0r_squareblur.xml
index 642bd20e431db10782dd318c298a385a68a8e007..1c0c3be32cb2f662e4e696a6ed88563184e6eb34 100644 (file)
--- a/effects/frei0r_squareblur.xml
+++ b/effects/frei0r_squareblur.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE kpartgui>
 <effect tag="frei0r.squareblur" id="frei0r.squareblur">
        <name>Square Blur</name>
-       <description>Variable-size square blur (frei0r.squareblur)</description>
+       <description>Square blur</description>
        <author>Drone</author>
        <parameter type="simplekeyframe" name="Kernel size" max="500" min="0" default="50" factor="1000">
                <name>Kernel size</name>

diff --git a/src/kdenlive.desktop b/src/kdenlive.desktop
index 95230c6986ea71d0a8650e11472c5bd9cd89f62c..c72301a3bd02328193db385c26f0edc1f48adc12 100644 (file)
--- a/src/kdenlive.desktop
+++ b/src/kdenlive.desktop
@@ -39,6 +39,7 @@ GenericName[zh_CN]=视频编辑器
 GenericName[zh_TW]=影像編輯器
 Comment=Nonlinear video editor for KDE
 Comment[ca]=Editor de vídeo no lineal per al KDE
+Comment[cs]=Nelineární editor videí pro KDE
 Comment[da]=Ikke-lineær videoredigering til KDE
 Comment[de]=Nichtlinearer Video-Editor für KDE
 Comment[el]=Μη γραμμικός επεξεργαστής βίντεο για το KDE

diff --git a/src/kdenlive.notifyrc b/src/kdenlive.notifyrc
index 57cc2f7cc00562fb3db614fc072d59700bf1f633..2f56c5bb98637b8f0da4e24f74be96cda901261d 100644 (file)
--- a/src/kdenlive.notifyrc
+++ b/src/kdenlive.notifyrc
@@ -97,6 +97,7 @@ Action=Popup
 [Event/FrameCaptured]
 Name=Frame captured
 Name[ca]=S'ha capturat un fotograma
+Name[cs]=Snímek zachycen
 Name[da]=Billed indfanget
 Name[el]=Σύλληψη πλαισίου
 Name[es]=Fotograma capturado
@@ -113,6 +114,7 @@ Name[zh_CN]=已抓取帧
 Name[zh_TW]=影格已擷取
 Comment=A frame was captured to disk
 Comment[ca]=S'ha capturat i desat un fotograma al disc
+Comment[cs]=Snímek byl zachycen na disk
 Comment[da]=Et billed blev indfanget til disken
 Comment[el]=Έγινε σύλληψη πλαισίου στο δίσκο
 Comment[es]=Un fotograma fue capturado al disco
@@ -172,6 +174,7 @@ Name[zh_CN]=错误
 Name[zh_TW]=錯誤
 Comment=An error occurred in Kdenlive
 Comment[ca]=S'ha produït un error al Kdenlive
+Comment[cs]=V Kdenlive došlo k chybě
 Comment[da]=En fejl opstod i Kdenlive
 Comment[de]=In Kdenlive ist ein Fehler aufgetreten.
 Comment[el]=Εμφανίστηκε σφάλμα στο Kdenlive

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4e1d59a21a452471d6ee9ca922ad1a63c074d8b0..084ec2c30becdca1bd43eee7a4b760ea255b4d5e 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1545,7 +1545,7 @@ void MainWindow::setupActions()
     collection.addAction("delete_space", removeSpace);
     connect(removeSpace, SIGNAL(triggered()), this, SLOT(slotRemoveSpace()));
 
-    m_tracksActionCollection = new KActionCollection(m_tracksActionCollection, KGlobal::mainComponent());
+    m_tracksActionCollection = new KActionCollection(this, KGlobal::mainComponent());
     m_tracksActionCollection->addAssociatedWidget(m_timelineArea);
     
     KAction *insertTrack = new KAction(KIcon(), i18n("Insert Track"), m_tracksActionCollection);