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

diff --git a/AUTHORS b/AUTHORS
index 23f96dbdda286ff5f57fa3c848874c76199754bb..696800e858223b6894d84c2c8a150a54a42e07b3 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,3 +29,4 @@ Former Kdenlive authors
         2009
     Jason Wood <jasonwood@blueyonder.co.uk>
         Original KDE 3 version author
+        2002-2005

diff --git a/Messages.sh b/Messages.sh
index 5310e950503e3f514c007487b0edc6e9f0af8c52..f69bd55238535007a9bedbeb71260dded0c8a12b 100755 (executable)
--- a/Messages.sh
+++ b/Messages.sh
@@ -3,7 +3,7 @@
 kdenlive_subdirs="plugins renderer src src/widgets"
 
 $EXTRACTRC --tag=name --tag=description --tag=label --tag=comment --tag=paramlistdisplay effects/*.xml data/kdenliveeffectscategory.rc >> rc.cpp
-$EXTRACTRC `find $kdenlive_subdirs -name \*.rc -o -name \*.ui` >> rc.cpp
+$EXTRACTRC `find $kdenlive_subdirs -name \*.rc -a ! -name encodingprofiles.rc -o -name \*.ui` >> rc.cpp
 
 $XGETTEXT `find $kdenlive_subdirs -name \*.cpp -o -name \*.h` *.cpp -o $podir/kdenlive.pot
 rm -f rc.cpp

diff --git a/src/kdenlive.notifyrc b/src/kdenlive.notifyrc
index 63338121be7c51652eeeb007dd9e5664b348a7f2..bff10575f881b6f1199018b3eff4b98b4ee80cf4 100644 (file)
--- a/src/kdenlive.notifyrc
+++ b/src/kdenlive.notifyrc
@@ -72,7 +72,7 @@ Name[pt]=Erro
 Name[sv]=Fel
 Name[uk]=Помилка
 Name[x-test]=xxErrorxx
-Comment=An error occured in Kdenlive
+Comment=An error occurred in Kdenlive
 Comment[de]=Es ist ein Fehler in Kdenlive aufgetreten
 Comment[pt]=Ocorreu um erro no Kdenlive
 Comment[sv]=Ett fel uppstod i Kdenlive

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 8cfa793fd4b55e10b3a231417469904f132c0fc8..7315bb921e692459e29dc2a308d785a2efc9d988 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -183,6 +183,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
     connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int)));
 
     if (name != "clip") {
+        connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int)));
         connect(render, SIGNAL(durationChanged(int)), this, SIGNAL(durationChanged(int)));
         connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SIGNAL(zoneUpdated(QPoint)));
     } else {