Compare commits

...

13 Commits

Author SHA1 Message Date
Christoph Feck
08602905f0 GIT_SILENT Upgrade KDE Applications version to 18.12.2. 2019-02-03 05:50:18 +01:00
l10n daemon script
0530f56e0b GIT_SILENT made messages (after extraction) 2019-01-26 07:16:57 +01:00
l10n daemon script
a4c6a0c575 GIT_SILENT made messages (after extraction) 2019-01-20 07:40:27 +01:00
Jean-Baptiste Mardelle
d35a26afcf Merge branch 'patch-3' into 'Applications/18.12'
Update copyright year also (2019).

See merge request kde/kdenlive!9
2019-01-07 19:16:16 +00:00
Camille M
196294886d Update copyright year also. 2019-01-07 18:44:23 +00:00
Jean-Baptiste Mardelle
b112192abd Fix empty warning dialog on missing font in project
BUG: 401903
2019-01-07 13:24:05 +01:00
Jean-Baptiste Mardelle
822d219c06 Fix bin item description cannot be edited if it contains zone subclips
BUG: 402817
2019-01-07 11:58:58 +01:00
Jean-Baptiste Mardelle
dc13bd5e13 Merge branch 'cherry-pick-b8e8b66d' into 'Applications/18.12'
Fix screengrab with audio broken

See merge request kde/kdenlive!5
2019-01-07 08:36:06 +00:00
Akhil K Gangadharan
0839ebf4c4 Fix screengrab with audio broken
Differential revision: https://phabricator.kde.org/D17948


(cherry picked from commit b8e8b66d4c)
2019-01-07 08:23:43 +00:00
l10n daemon script
1c3c1382d1 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-01-06 08:41:43 +01:00
Jean-Baptiste Mardelle
a584c8908d Merge branch 'cherry-pick-187a0f8e' into 'Applications/18.12'
Move Gain effect to "Audio correction" category

See merge request kde/kdenlive!3
2019-01-05 13:52:54 +00:00
Jean-Baptiste Mardelle
a899240c6b Move Gain effect to "Audio correction" category
Patch by Juku Trump
https://phabricator.kde.org/D17968

(cherry picked from commit 187a0f8e44)
2019-01-05 13:28:24 +00:00
Christoph Feck
d8ac1c1e89 GIT_SILENT Upgrade KDE Applications version to 18.12.1. 2019-01-03 22:56:25 +01:00
8 changed files with 25 additions and 13 deletions

View File

@@ -6,7 +6,7 @@ project(Kdenlive)
# KDE Application Version, managed by release script
set (KDE_APPLICATIONS_VERSION_MAJOR "18")
set (KDE_APPLICATIONS_VERSION_MINOR "12")
set (KDE_APPLICATIONS_VERSION_MICRO "0")
set (KDE_APPLICATIONS_VERSION_MICRO "2")
set(KDENLIVE_VERSION ${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO})
cmake_minimum_required(VERSION 3.0)

View File

@@ -10,7 +10,7 @@ MJPEG=-vf yadif,scale=960:-2 -qscale 3 -vcodec mjpeg -acodec pcm_s16le;mkv
[screengrab]
X264 mute=-crf 25 -vcodec libx264 -preset veryfast -threads 0;mov
X264 with audio=-i pulse -crf 25 -ab 192k -vcodec libx264 -acodec libvorbis -preset veryfast -threads 0;mov
X264 with audio=-f pulse -i default -crf 25 -ab 192k -vcodec libx264 -acodec libvorbis -preset veryfast -threads 0;mov
[video4linux]
x264=crf=25 ab=192k vcodec=libx264 acodec=libvorbis ab=192k preset=veryfast threads=%threads;mov

View File

@@ -380,7 +380,7 @@ Name[tr]=Hata
Name[ug]=خاتالىق
Name[uk]=Помилка
Name[x-test]=xxErrorxx
Name[zh_CN]=
Name[zh_CN]=误
Name[zh_TW]=錯誤
Comment=An error occurred in Kdenlive
Comment[ar]=حدث خطأ في «كدينلايڤ»

View File

@@ -13,7 +13,7 @@
<group list="volume,normalise,gain,ladspa.1049,ladspa.1048,ladspa.1413,mute">
<text>Audio correction</text>
</group>
<group list="audiobalance,audiopan,gain,swapchannels,ladspa.1406,channelcopy">
<group list="audiobalance,audiopan,swapchannels,ladspa.1406,channelcopy">
<text>Audio channels</text>
</group>
<group list="audiowave,audiospectrum,frei0r.pr0be,frei0r.pr0file,frei0r.rgbparade,frei0r.timeout,frei0r.vectorscope">

View File

@@ -19,6 +19,7 @@
<name xml:lang="fi">Kdenlive</name>
<name xml:lang="fr">Kdenlive</name>
<name xml:lang="gl">Kdenlive</name>
<name xml:lang="id">Kdenlive</name>
<name xml:lang="it">Kdenlive</name>
<name xml:lang="ko">Kdenlive</name>
<name xml:lang="nl">Kdenlive</name>
@@ -51,6 +52,7 @@
<summary xml:lang="fi">Videoeditori</summary>
<summary xml:lang="fr">Éditeur vidéo</summary>
<summary xml:lang="gl">Editor de vídeo</summary>
<summary xml:lang="id">Editor Video</summary>
<summary xml:lang="it">Editor video</summary>
<summary xml:lang="ko">동영상 편집기</summary>
<summary xml:lang="nl">Videobewerker</summary>
@@ -83,6 +85,7 @@
<p xml:lang="fi">Kdenlive on epälineaarinen videoeditori. Se perustuu MLT-frameworkiin ja toimii monen eri ääni- ja videoformaatin kanssa. Voit lisätä efektejä ja siirtymiä, sekä renderöidä projektin haluamaasi tiedostomuotoon.</p>
<p xml:lang="fr">Kdenlive est un éditeur vidéo non-linéaire. Il utilise le moteur MLT et accèpte de nombreux formats audio et vidéos, permet d'ajouter des effets et transitions, et exporte le rendu dans le format de votre choix.</p>
<p xml:lang="gl">Kdenlive é un editor de vídeo non lineal. Está baseado na infraestrutura MLT e permite moitos formatos de son e vídeo, e permite engadir efectos, engadir transicións, e exportar en calquera formato.</p>
<p xml:lang="id">Kdenlive adalah sebuah editor video non linier. Ia berdasarkan pada MLT framework dan menerima berbagai format audio dan video, yang memungkinkan kamu untuk menambahkan efek, transisi, dan render ke dalam format yang kamu pilih.</p>
<p xml:lang="it">Kdenlive è un editor video non lineare. È basato sull'infrastruttura MLT e accetta numerosi formati audio e video, consente di aggiungere effetti, transizioni e produrre il formato che si desidera.</p>
<p xml:lang="ko">Kdenlive는 비선형 동영상 편집기입니다. MLT 프레임워크를 사용하며 여러 음악 및 동영상 형식을 지원하고, 효과 및 트랜지션을 추가할 수 있으며, 원하는 형식으로 렌더링할 수 있습니다.</p>
<p xml:lang="nl">Kdenlive is een niet lineaire videobewerker. Het is gebaseerd op het MLT-framework en accepteert vele audio- en video-formaten, biedt de mogelijkheid effecten en overgangen toe te voegen en om te zetten naar het formaat van uw keuze.</p>
@@ -114,6 +117,7 @@
<p xml:lang="fi">Ominaisuuksia:</p>
<p xml:lang="fr">Fonctionnalités :</p>
<p xml:lang="gl">Funcionalidades:</p>
<p xml:lang="id">Fitur:</p>
<p xml:lang="it">Funzionalità:</p>
<p xml:lang="ko">기능:</p>
<p xml:lang="nl">Mogelijkheden:</p>
@@ -146,6 +150,7 @@
<li xml:lang="fi">Selkeä moniraitainen käyttöliittymä</li>
<li xml:lang="fr">Interface multipiste intuitive.</li>
<li xml:lang="gl">Interface intuitiva con varias pistas.</li>
<li xml:lang="id">Antarmuka multitrack yang intuitif.</li>
<li xml:lang="it">Interfaccia multitraccia intuitiva.</li>
<li xml:lang="ko">사용하기 편한 다중 트랙 인터페이스.</li>
<li xml:lang="nl">Intuïtief interface met meerdere tracks.</li>
@@ -176,6 +181,7 @@
<li xml:lang="fi">Monia erilaisia efektejä ja siirtymiä</li>
<li xml:lang="fr">Nombreux effets et transitions.</li>
<li xml:lang="gl">Moitos efectos e transicións.</li>
<li xml:lang="id">Banyak efek dan transisi.</li>
<li xml:lang="it">Numerosi effetti e transizioni.</li>
<li xml:lang="ko">다양한 효과와 트랜지션.</li>
<li xml:lang="nl">Veel effecten en overgangen.</li>
@@ -206,6 +212,7 @@
<li xml:lang="fi">Väriavaruuksien säätömahdollisuus</li>
<li xml:lang="fr">Graphes des couleurs</li>
<li xml:lang="gl">Ámbitos de cores.</li>
<li xml:lang="id">Cakupan warna</li>
<li xml:lang="it">Diagrammi di colore</li>
<li xml:lang="ko">색상 범위</li>
<li xml:lang="nl">Kleurreeksen</li>
@@ -236,6 +243,7 @@
<li xml:lang="fi">Yksinkertainen DVD:n luonti</li>
<li xml:lang="fr">Assistant DVD de base</li>
<li xml:lang="gl">Asistente básico para DVD</li>
<li xml:lang="id">Dasar Asisten DVD</li>
<li xml:lang="it">Procedura guidata di base DVD</li>
<li xml:lang="ko">기본 DVD 마법사</li>
<li xml:lang="nl">Basis dvd-assistent</li>
@@ -265,12 +273,14 @@
<caption>Kdenlive 18.08</caption>
<caption xml:lang="ca">Kdenlive 18.08</caption>
<caption xml:lang="ca-valencia">Kdenlive 18.08</caption>
<caption xml:lang="cs">Kdenlive 18.08</caption>
<caption xml:lang="de">Kdenlive 18.08</caption>
<caption xml:lang="en-GB">Kdenlive 18.08</caption>
<caption xml:lang="es">Kdenlive 18.08</caption>
<caption xml:lang="fi">Kdenlive 18.08</caption>
<caption xml:lang="fr">Kdenlive 18.08</caption>
<caption xml:lang="gl">Kdenlive 18.08</caption>
<caption xml:lang="id">Kdenlive 18.08</caption>
<caption xml:lang="it">Kdenlive 18.08</caption>
<caption xml:lang="nl">Kdenlive 18.08</caption>
<caption xml:lang="pl">Kdenlive 18.08</caption>

View File

@@ -1955,10 +1955,14 @@ void Bin::slotItemDoubleClicked(const QModelIndex &ix, const QPoint pos)
return;
}
} else {
if (item->count() > 0) {
QTreeView *view = static_cast<QTreeView *>(m_itemView);
view->setExpanded(ix, !view->isExpanded(ix));
return;
if (ix.column() == 0 && item->count() > 0) {
QRect IconRect = m_itemView->visualRect(ix);
IconRect.setWidth((double)IconRect.height() / m_itemView->iconSize().height() * m_itemView->iconSize().width());
if (!pos.isNull() && (IconRect.contains(pos) || pos.y() > (IconRect.y() + IconRect.height()/2))) {
QTreeView *view = static_cast<QTreeView *>(m_itemView);
view->setExpanded(ix, !view->isExpanded(ix));
return;
}
}
}
if (ix.isValid()) {

View File

@@ -394,17 +394,15 @@ bool DocumentChecker::hasErrorInClips()
}
}
//TODO the following loop is disabled because m_missingFonts is cleared (line 124), but not filled, that looks suspicious
/*foreach (const QString &font, m_missingFonts) {
foreach (const QString &font, m_missingFonts) {
QString clipType = i18n("Title Font");
QTreeWidgetItem *item = new QTreeWidgetItem(m_ui.treeWidget, QStringList() << clipType);
item->setData(0, statusRole, CLIPPLACEHOLDER);
item->setIcon(0, KoIconUtils::themedIcon(QStringLiteral("dialog-warning")));
item->setToolTip(1, e.attribute(QStringLiteral("name")));
QString newft = QFontInfo(QFont(font)).family();
item->setText(1, i18n("%1 will be replaced by %2", font, newft));
item->setData(0, typeRole, CLIPMISSING);
}*/
}
if (!m_missingClips.isEmpty()) {
m_ui.infoLabel->setText(i18n("The project file contains missing clips or files"));

View File

@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
i18n("Kdenlive"), KDENLIVE_VERSION,
i18n("An open source video editor."),
KAboutLicense::GPL,
i18n("Copyright © 20072017 Kdenlive authors"),
i18n("Copyright © 20072019 Kdenlive authors"),
i18n("Please report bugs to http://bugs.kde.org"),
QStringLiteral("https://kdenlive.org"));
aboutData.addAuthor(i18n("Jean-Baptiste Mardelle"), i18n("MLT and KDE SC 4 / KF5 port, main developer and maintainer"), QStringLiteral("jb@kdenlive.org"));