Unverified Commit ff9ec863 authored by Luca Beltrame's avatar Luca Beltrame
Browse files

Merge branch 'Applications/19.08'

parents 155ae2ba 68a717f5
Pipeline #5865 passed with stage
in 29 minutes and 2 seconds
...@@ -6,7 +6,7 @@ project(Kdenlive) ...@@ -6,7 +6,7 @@ project(Kdenlive)
# KDE Application Version, managed by release script # KDE Application Version, managed by release script
set(KDE_APPLICATIONS_VERSION_MAJOR "19") set(KDE_APPLICATIONS_VERSION_MAJOR "19")
set(KDE_APPLICATIONS_VERSION_MINOR "11") set(KDE_APPLICATIONS_VERSION_MINOR "11")
set(KDE_APPLICATIONS_VERSION_MICRO "70") set(KDE_APPLICATIONS_VERSION_MICRO "80")
set(KDENLIVE_VERSION ${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}) set(KDENLIVE_VERSION ${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO})
...@@ -145,7 +145,12 @@ ki18n_install(po) ...@@ -145,7 +145,12 @@ ki18n_install(po)
include(GNUInstallDirs) include(GNUInstallDirs)
install(FILES AUTHORS COPYING README.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) install(FILES AUTHORS COPYING README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
install(FILES kdenlive.categories DESTINATION ${KDE_INSTALL_CONFDIR})
if (ECM_VERSION VERSION_GREATER_EQUAL "5.59.0")
install(FILES kdenlive.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
else()
install(FILES kdenlive.categories DESTINATION ${KDE_INSTALL_CONFDIR})
endif()
############################ ############################
# Tests # Tests
......
...@@ -236,7 +236,7 @@ Rectangle { ...@@ -236,7 +236,7 @@ Rectangle {
} }
contentItem: Label { contentItem: Label {
color: activePalette.text color: activePalette.text
text: i18n("Click to make track active/inactive. Active tracks will react to insert/remove operations") text: i18n("Click to make track active/inactive. Active tracks will react to editing operations")
} }
} }
state: 'normalled' state: 'normalled'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment