commit b7a36195e4a94dd6c4b224ef20fff0b2c94ddf35 Author: Jonathan Riddell Date: Tue May 23 12:32:04 2017 +0100 Update version number for 5.8.7 GIT_SILENT diff --git a/CMakeLists.txt b/CMakeLists.txt index a0efbc1..dc93fb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(systemsettings) -set(PROJECT_VERSION "5.8.6") +set(PROJECT_VERSION "5.8.7") cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(QT_MIN_VERSION "5.4.0") commit f61f9d8c100fe94471b1a8f23ac905e9311b7436 Author: Eike Hein Date: Sat Mar 11 01:34:49 2017 +0900 Set the correct desktop file name when in a KDE session. Summary: System Settings installs two .desktop files: - kdesystemsettings.desktop setting NotShowIn=KDE, for non-KDE desktops - systemsettings.desktop, the one we use in Plasma As of 39e13de3468a, it sets "kdesystemsettings" as its desktop file name using KAboutData. As this is not the one we show in our menus, it's not the one used as applicationId for the KStartupInfo provided to the Task Manager after starting System Settings. With the eventual window telling the Task Manager to use a different .desktop file, the Task Manager can no longer match up the startup notification and the window, causing them to co-exist instead of replace each other. Telling the environment you're running in to look at a .desktop file you've also told it to ignore is wrong app behavior, and this should not be worked around in the Task Manager (especially as it would cause I/O in a hotpath, requiring it to open and parse the .desktop file to realize it's crummy and ignore it, falling back from the window hint to a slow heuristic). This patch instead makes it use the correct desktop file name when KDE_FULL_SESSION is set. This completes the original hack of shipping two .desktop files. Reviewers: #plasma, graesslin, mart, bshah Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D5006 diff --git a/app/main.cpp b/app/main.cpp index d0f70e8..49da113 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -38,7 +38,13 @@ int main( int argc, char *argv[] ) aboutData.addAuthor(i18n("Ben Cooksley"), i18n("Maintainer"), "bcooksley@kde.org"); aboutData.addAuthor(i18n("Mathias Soeken"), i18n("Developer"), "msoeken@informatik.uni-bremen.de"); aboutData.addAuthor(i18n("Will Stephenson"), i18n("Internal module representation, internal module model"), "wstephenson@kde.org"); - aboutData.setDesktopFileName(QStringLiteral("kdesystemsettings")); + + if (qEnvironmentVariableIsSet("KDE_FULL_SESSION")) { + aboutData.setDesktopFileName(QStringLiteral("systemsettings")); + } else { + aboutData.setDesktopFileName(QStringLiteral("kdesystemsettings")); + } + KAboutData::setApplicationData(aboutData); application.setAttribute(Qt::AA_UseHighDpiPixmaps, true); commit e12efe8970cdc4794442a03a398e6f2964c39a82 Author: l10n daemon script Date: Thu Feb 23 08:50:43 2017 +0100 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" diff --git a/categories/settings-workspace-search.desktop b/categories/settings-workspace-search.desktop index 852243a..8538589 100644 --- a/categories/settings-workspace-search.desktop +++ b/categories/settings-workspace-search.desktop @@ -11,7 +11,7 @@ Name[ar]=البحث Name[ast]=Guetar Name[bs]=Pretraga Name[ca]=Cerca -Name[ca@valencia]=Cerca +Name[ca@valencia]=Busca Name[cs]=Hledání Name[da]=Søgning Name[de]=Suchen commit e27c303518b0723195050b36a0848b05aedb455f Author: Jonathan Riddell Date: Tue Feb 21 11:50:35 2017 +0000 Update version number for 5.8.6 GIT_SILENT diff --git a/CMakeLists.txt b/CMakeLists.txt index 7deb483..a0efbc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(systemsettings) -set(PROJECT_VERSION "5.8.5") +set(PROJECT_VERSION "5.8.6") cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(QT_MIN_VERSION "5.4.0") commit fa62b2995f035a827d0c314119d0ceab3ce580b1 Author: Jonathan Riddell Date: Tue Dec 27 09:32:41 2016 +0000 Update version number for 5.8.5 GIT_SILENT diff --git a/CMakeLists.txt b/CMakeLists.txt index 78d17b9..7deb483 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(systemsettings) -set(PROJECT_VERSION "5.8.4") +set(PROJECT_VERSION "5.8.5") cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(QT_MIN_VERSION "5.4.0") commit f2a3b48e2ba2b1d26f0a4df0f19d32dd5509ca85 Author: l10n daemon script Date: Wed Dec 21 07:42:39 2016 +0100 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" diff --git a/categories/settings-hardware-removable-storage.desktop b/categories/settings-hardware-removable-storage.desktop index 0b1365a..3571780 100644 --- a/categories/settings-hardware-removable-storage.desktop +++ b/categories/settings-hardware-removable-storage.desktop @@ -24,6 +24,7 @@ Name[nl]=Verwijderbare opslag Name[nn]=Flyttbare lagringseiningar Name[pl]=Nośniki wymienne Name[pt]=Armazenamento Removível +Name[pt_BR]=Armazenamento removível Name[ru]=Внешние носители Name[sk]=Vymeniteľné úložisko Name[sl]=Odstranljivi nosilci commit 19bcb1689366b1da6f76a79030020feeffda831c Author: l10n daemon script Date: Tue Dec 13 05:43:19 2016 +0100 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" diff --git a/categories/settings-personalization.desktop b/categories/settings-personalization.desktop index 5154055..0d6433a 100644 --- a/categories/settings-personalization.desktop +++ b/categories/settings-personalization.desktop @@ -31,7 +31,7 @@ Name[ko]=사용자 정의 Name[lt]=Suasmeninimas Name[nb]=Personalisering Name[nds]=Persöönlich Topassen -Name[nl]=Personalisatie +Name[nl]=Persoonlijke instellingen Name[nn]=Personalisering Name[pa]=ਨਿੱਜੀ Name[pl]=Dopasowywanie