Compare commits

...

2 Commits

Author SHA1 Message Date
Andrius Štikonas 386a6888d5 Bump version to 4.1.0. 2020-02-01 15:23:02 +00:00
l10n daemon script 702c4ffd27 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"
2020-01-20 05:46:17 +01:00
2 changed files with 3 additions and 3 deletions

View File

@ -21,7 +21,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
# Dependencies
set(QT_MIN_VERSION "5.10.0")
set(KF5_MIN_VERSION "5.56")
set(KPMCORE_MIN_VERSION "4.0.0")
set(KPMCORE_MIN_VERSION "4.1.0")
set(CMAKE_USE_RELATIVE_PATHS OFF)
set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
@ -29,7 +29,7 @@ set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Install mkspecs files, Plugins a
# Check KPMcore dependency when bumping
set(VERSION_MAJOR "4")
set(VERSION_MINOR "0")
set(VERSION_MINOR "1")
set(VERSION_RELEASE "0")
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE})
add_definitions(-D'VERSION="${VERSION}"') #"

View File

@ -181,7 +181,7 @@ Keywords[id]=partisi;disk;
Keywords[it]=partizione;disco;
Keywords[ko]=partition;disk;파티션;디스크;
Keywords[lt]=skaidinys;diskas;
Keywords[nl]=partitie;schijf
Keywords[nl]=partitie;schijf;
Keywords[nn]=partisjon;disk;
Keywords[pl]=partycja;dysk;
Keywords[pt]=partição;disco;