Merge branch 'master' into next

diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..01739df
--- /dev/null
+++ b/TODO
@@ -0,0 +1,69 @@
+Some ideas for a big refactoring of code.
+
+
+Input
+=========
+        handle MLT connection ((re-)move from renderer.cpp (hacks, special cases))
+        handle project document entry
+        draw layer on clip instances in timeline (thumbnails)
+        settings management (available through project tree items)
+        proxy creation
+        input method (register mimetype in file dialog, custom widget)
+        effect support (a, v, av, special effects (freeze, speed))
+
+        => modules for avformat, qimage/gtk_image(?), generators (slideshow, color, f0r)
+
+
+Timeline
+=========
+        provides basic operations (resize, move, add, remove) (GUI + XML + MLT) to be applied on any item
+
+        => modules for input modes (drag & drop, 3/4-point editing, cut, resize by dragging end), spacer, ripple edit, push/pull edit, ...)
+
+Clip instances
+-------
+        connection to input module
+        manage project document entry
+        information about support for timeline operations
+        owns an effect device
+        per instance settings (functionality provided by input module)
+        graphical timeline item (modules can register layers they want to draw (thumbnails, effect names, keyframes))
+
+Clip groups
+------
+        manage project document entry
+        pass on operations to items
+
+
+Effect system
+=========
+Keyframe manager
+------
+        pipe information from/to timeline effect device, effect stack, effect parameter
+
+Effect parameter
+------
+        custom widget
+        function to handle keyframes -> connect to keyframe manager
+        written in QScript/QML ?
+
+Effect device
+------
+        manages list of effects attached to clip, track, timeline, group, the world
+        passes info from/to timeline items and effect stack
+        manage project document entry
+
+
+Project
+=========
+        read/write
+        project settings management
+        provide functionality to manage settings (remove hardcoded stuff (slideshow, proxy, ...))
+
+
+Interface
+=========
+        provide functions to add menu items, global actions (for shortcut management)
+        layout management
+        styles management (see digikam)
+        ...

diff --git a/src/kdenlive.desktop b/src/kdenlive.desktop
index 66fd8f1b355b5e66d151c70b7fd0570be2daacc0..ebb6457039793b861de7b98696d04911d5be6150 100644 (file)
--- a/src/kdenlive.desktop
+++ b/src/kdenlive.desktop
@@ -1,8 +1,27 @@
 # KDE Config File
 [Desktop Entry]
 Name=Kdenlive
+Name[cs]=Kdenlive
+Name[de]=Kdenlive
+Name[nds]=Kdenlive
+Name[nl]=Kdenlive
+Name[pt]=Kdenlive
+Name[sv]=Kdenlive
+Name[uk]=Kdenlive
+Name[x-test]=xxKdenlivexx
 GenericName=Video Editor
+GenericName[cs]=Editor videí
+GenericName[de]=Video-Editor
+GenericName[pt]=Editor de Vídeo
+GenericName[sv]=Videoeditor
+GenericName[uk]=Відеоредактор
+GenericName[x-test]=xxVideo Editorxx
 Comment=Nonlinear video editor for KDE
+Comment[de]=Nichtlinearer Video-Editor für KDE
+Comment[pt]=Editor de vídeo não-linear para o KDE
+Comment[sv]=Icke-linjär videoeditor för KDE
+Comment[uk]=Нелінійний редактор відео для KDE
+Comment[x-test]=xxNonlinear video editor for KDExx
 Type=Application
 Exec=kdenlive %i -caption "%c" %u
 Icon=kdenlive

diff --git a/src/kdenlive.notifyrc b/src/kdenlive.notifyrc
index 1e3d883af279b342cc3a3bc9d4e2de1a545a9447..63338121be7c51652eeeb007dd9e5664b348a7f2 100644 (file)
--- a/src/kdenlive.notifyrc
+++ b/src/kdenlive.notifyrc
@@ -1,30 +1,82 @@
 [Global]
 IconName=kdenlive
 Comment=Kdenlive
+Comment[cs]=Kdenlive
+Comment[de]=Kdenlive
+Comment[nds]=Kdenlive
+Comment[pt]=Kdenlive
+Comment[sv]=Kdenlive
+Comment[uk]=Kdenlive
+Comment[x-test]=xxKdenlivexx
 
 [Event/RenderFinished]
 Name=Rendering finished
+Name[cs]=Renderování bylo dokončeno
+Name[pt]=A geração terminou
+Name[sv]=Framställning klar
+Name[uk]=Обробку завершено
+Name[x-test]=xxRendering finishedxx
 Comment=Rendering is over
+Comment[cs]=Renderování je hotové
+Comment[pt]=A geração terminou
+Comment[sv]=Framställning är gjord
+Comment[uk]=Виконання обробки завершено
+Comment[x-test]=xxRendering is overxx
 Action=Popup
 
 [Event/RenderStarted]
 Name=Rendering started
+Name[cs]=Renderování začalo
+Name[pt]=A geração foi iniciada
+Name[sv]=Framställning startad
+Name[uk]=Обробку розпочато
+Name[x-test]=xxRendering startedxx
 Comment=Rendering was started
+Comment[cs]=Renderování bylo začato
+Comment[pt]=A geração foi iniciada
+Comment[sv]=Framställning har startats
+Comment[uk]=Було розпочато обробку
+Comment[x-test]=xxRendering was startedxx
 Action=Popup
 
 [Event/FrameCaptured]
 Name=Frame captured
+Name[pt]=Imagem capturada
+Name[sv]=Ram lagrad
+Name[uk]=Захоплено кадр
+Name[x-test]=xxFrame capturedxx
 Comment=A frame was captured to disk
+Comment[pt]=Foi capturada uma imagem para o disco
+Comment[sv]=En ram har lagrats på disk
+Comment[uk]=Було захоплено кадр, програма зберегла його на диску
+Comment[x-test]=xxA frame was captured to diskxx
 Sound=KDE-Sys-App-Message.ogg
 Action=Sound
 
 [Event/ReadyToCapture]
 Name=Ready to capture
+Name[pt]=Pronto para capturar
+Name[sv]=Klar att lagra
+Name[uk]=Приготовано до захоплення
+Name[x-test]=xxReady to capturexx
 Sound=KDE-Sys-App-Positive.ogg
 Action=Sound
 
 [Event/ErrorMessage]
 Name=Error
+Name[cs]=Chyba
+Name[de]=Fehler
+Name[nds]=Fehler
+Name[nl]=Fout
+Name[pt]=Erro
+Name[sv]=Fel
+Name[uk]=Помилка
+Name[x-test]=xxErrorxx
 Comment=An error occured 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
+Comment[uk]=У коді Kdenlive сталася помилка
+Comment[x-test]=xxAn error occured in Kdenlivexx
 Sound=KDE-Sys-Warning.ogg
 Action=Sound

diff --git a/thumbnailer/westleypreview.desktop b/thumbnailer/westleypreview.desktop
index 9fde803eb6b9e906d373beb28f100d9c1bc2f207..fec9097a021475811b302cf7ddd33ce8bed79ab8 100644 (file)
--- a/thumbnailer/westleypreview.desktop
+++ b/thumbnailer/westleypreview.desktop
@@ -1,6 +1,12 @@
 [Desktop Entry]
 Type=Service
 Name=MLT Playlist
+Name[cs]=Seznam skladeb MLT
+Name[de]=MLT-Wiedergabeliste
+Name[pt]=Lista de Reprodução MLT
+Name[sv]=MLT-spellista
+Name[uk]=Список відтворення MLT
+Name[x-test]=xxMLT Playlistxx
 X-KDE-ServiceTypes=ThumbCreator
 CacheThumbnail=true
 IgnoreMaximumSize=true