From 813e8866b76aea307fc323317389ad09dcd179a8 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Mon, 29 Jul 2019 15:44:58 +0200 Subject: GIT_SILENT Upgrade KDE Applications version to 19.07.90. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07c1ef27a..302f9666a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "19") set (KDE_APPLICATIONS_VERSION_MINOR "07") -set (KDE_APPLICATIONS_VERSION_MICRO "80") +set (KDE_APPLICATIONS_VERSION_MICRO "90") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION}) -- cgit v1.3 From 2baa6d187167825c9d58367e399e04764f5a9c70 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 31 Jul 2019 07:41:55 +0200 Subject: GIT_SILENT made messages (after extraction) --- src/org.kde.dolphin.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index 011bad45f..f2746dab6 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -282,7 +282,7 @@
  • Vista dividida, que lle permite copiar ou mover ficheiros facilmente entre dous lugares.
  • Osztott nézet, amely lehetővé teszi a fájlok könnyű másolását és áthelyezését a helyek között.
  • Scinde vista, il permitte te copiar o mover facilemente files inter locationes.
    • -
  • Tampilan pisah, memungkinkanmu untuk menyalin atau memindah file antar lokasi dengan mudah.
    • +
  • Tampilan belah, memungkinkanmu untuk menyalin atau memindah file antar lokasi dengan mudah.
  • La vista divisa, che ti consente di copiare o spostare i file tra le diverse posizioni in maniera semplice.
  • 화면을 나누어서 서로 다른 위치 간 파일을 쉽게 이동하거나 복사할 수 있도록 합니다.
  • Delt visning, så du lett kan kopiere eller flytte filer mellom steder.
    • -- cgit v1.3 From 50c1fcce3777c6dbb8ba64824262da3edda98fc3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 31 Jul 2019 08:56:25 +0200 Subject: 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" --- src/settings/kcm/kcmdolphingeneral.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 01163842b..ac3956144 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -61,7 +61,7 @@ Comment[fr]=Ce service permet de configurer les paramètres généraux de Dolphi Comment[gl]=Este servizo permite configurar opcións xerais de Dolphin. Comment[hu]=Ez a szolgáltatás lehetővé teszi a Dolphin általános beállításainak módosítását. Comment[ia]=Iste servicio permitte configuration del preferentias general de Dolphin. -Comment[id]=Layanan ini memungkinkan konfigurasi setelan umum Dolphin. +Comment[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin. Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin. Comment[ja]=Dolphin の全般的な設定を行います Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다. @@ -162,7 +162,7 @@ Comment[fr]=Configuration des paramètres généraux du gestionnaire de fichiers Comment[gl]=Configurar opcións xerais de xestores de ficheiros. Comment[hu]=A fájlkezelő általános beállításainak módosítása Comment[ia]=Configura preferentias del gerente general de file -Comment[id]=Konfigurasikan setelan pengelola file umum +Comment[id]=Konfigurasikan pengaturan pengelola file umum Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います Comment[ko]=일반 파일 관리자 설정 -- cgit v1.3 From 68aee5ed51b55a3938ab71de4fa42c469cbbaf26 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 7 Aug 2019 18:08:57 +0200 Subject: Fix build with cmake < 3.7 `VERSION_GREATER_EQUAL` was introduced in cmake 3.7, but the specified minimum version is 3.0. So use `NOT VERSION_LESS` instead to still support older cmake versions too. Differential Revision: https://phabricator.kde.org/D22984 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 302f9666a..838ca1445 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,7 +150,7 @@ configure_file(org.kde.dolphin.FileManager1.service.in install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) -if (ECM_VERSION VERSION_GREATER_EQUAL "5.59.0") +if (NOT ECM_VERSION VERSION_LESS "5.59.0") install(FILES dolphin.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) else() install(FILES dolphin.categories DESTINATION ${KDE_INSTALL_CONFDIR}) -- cgit v1.3