From 42a0c5637a4f6c964f58d193eceadc7fa12b4bee Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 18 Feb 2019 08:18:21 +0100 Subject: [PATCH 1/5] 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" --- applets/batterymonitor/package/metadata.desktop | 2 +- dataengines/activities/plasma-dataengine-activities.desktop | 2 +- freespacenotifier/freespacenotifier.notifyrc | 2 +- klipper/klipperrc.desktop | 4 ++-- plasma-windowed/plasma-windowed.desktop | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/applets/batterymonitor/package/metadata.desktop b/applets/batterymonitor/package/metadata.desktop index ceca5c071..97943bdb7 100644 --- a/applets/batterymonitor/package/metadata.desktop +++ b/applets/batterymonitor/package/metadata.desktop @@ -16,7 +16,7 @@ Name[fr]=Batterie et luminosité Name[gl]=Batería e brillo Name[he]=סוללה ובהירות Name[hu]=Akkumulátor és fényerő -Name[id]=Battery and Brightness +Name[id]=Baterai dan Kecerahan Name[is]=Rafhlaða og skjábirta Name[it]=Batteria e luminosità Name[ja]=バッテリーと明るさ diff --git a/dataengines/activities/plasma-dataengine-activities.desktop b/dataengines/activities/plasma-dataengine-activities.desktop index 8e7e0106d..9d01624ae 100644 --- a/dataengines/activities/plasma-dataengine-activities.desktop +++ b/dataengines/activities/plasma-dataengine-activities.desktop @@ -79,7 +79,7 @@ Comment[he]=מידע אודות הפעילויות של Plasma Comment[hr]=Informacije o Plasminim aktivnostima Comment[hu]=Információk a Plasma aktivitásokról Comment[ia]=Information re activitates de Plasma -Comment[id]=Informasi tentang Aktivitas Plasma +Comment[id]=Informasi tentang Activities Plasma Comment[is]=Upplýsingar um Plasma virkni Comment[it]=Informazioni sulle attività di Plasma Comment[ja]=Plasma アクティビティの情報 diff --git a/freespacenotifier/freespacenotifier.notifyrc b/freespacenotifier/freespacenotifier.notifyrc index df63b8b47..a70eee5cc 100644 --- a/freespacenotifier/freespacenotifier.notifyrc +++ b/freespacenotifier/freespacenotifier.notifyrc @@ -24,7 +24,7 @@ Comment[hi]=केडीई खाली स्थान सूचना डे Comment[hr]=KDE-ov servis za obavještavanje o slobodnom prostoru Comment[hu]=KDE szabad hely értesítő szolgáltatás Comment[ia]=Demone de notification de spatio libere de KDE -Comment[id]=Jurik Notifikasi RUang Kosong KDE +Comment[id]=Daemon Notifikasi RUang Kosong KDE Comment[is]=KDE tilkynningaþjónn fyrir laust pláss Comment[it]=Demone di notifica dello spazio libero di KDE Comment[ja]=KDE 空き領域デーモン diff --git a/klipper/klipperrc.desktop b/klipper/klipperrc.desktop index 1b34d6c79..3f92bea17 100644 --- a/klipper/klipperrc.desktop +++ b/klipper/klipperrc.desktop @@ -313,7 +313,7 @@ Description[hr]=Otvori pomoću &zadanog preglednika Description[hsb]=Ze &standardnym browserom wočinić Description[hu]=Megnyitás az &alapértelmezett böngészővel Description[ia]=Aperi con navigator pre&definite -Description[id]=Buka &dengan Penelusur default +Description[id]=Buka &dengan Penelusur baku Description[is]=Opna með sjálf&gefnum vefskoðara Description[it]=Apri con il browser pre&definito Description[ja]=デフォルトのブラウザで開く(&D) @@ -1979,7 +1979,7 @@ Description[hr]=Otvori pomoću &zadanog preglednika Description[hsb]=Ze &standardnym browserom wočinić Description[hu]=Megnyitás az &alapértelmezett böngészővel Description[ia]=Aperi con navigator pre&definite -Description[id]=Buka &dengan Penelusur default +Description[id]=Buka &dengan Penelusur baku Description[is]=Opna með sjálf&gefnum vefskoðara Description[it]=Apri con il browser pre&definito Description[ja]=デフォルトのブラウザで開く(&D) diff --git a/plasma-windowed/plasma-windowed.desktop b/plasma-windowed/plasma-windowed.desktop index d40790615..57b000c46 100755 --- a/plasma-windowed/plasma-windowed.desktop +++ b/plasma-windowed/plasma-windowed.desktop @@ -56,7 +56,7 @@ Comment[et]=Plasmoidide käivitamine tavaliste rakendustena Comment[eu]=Exekutatu Plasmoideak aplikazio arrunt gisa Comment[fi]=Suorita plasmoideja sovelluksina Comment[fr]=Lancer les plasmoïdes comme de simples applications -Comment[gl]=Execute trebellos de Plasma como se fosen aplicativos sinxelos. +Comment[gl]=Execute plasmoides como se fosen aplicativos sinxelos Comment[hu]=Plazmoidok futtatása egyszerű alkalmazásként Comment[id]=Menjalankan Plasmoids sebagai aplikasi sederhana Comment[is]=Keyra Plasmíð sem einföld forrit From 8a6c45553ee67aec1a71197d732b7f253a6f56d8 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 19 Feb 2019 10:28:45 +0000 Subject: [PATCH 2/5] Update version number for 5.15.1 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aee81e102..7107f1a3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) project(plasma-workspace) -set(PROJECT_VERSION "5.15.0") +set(PROJECT_VERSION "5.15.1") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.11.0") From f6bf54808f32390009fdf6cdbb52627670be733a Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Wed, 20 Feb 2019 20:15:21 +0200 Subject: [PATCH 3/5] improve screen filtering for global menu applet Summary: --when the user has enabled PLASMA_USE_QT_SCALING under X11 environment the screen and window geometries can not be trusted for comparison before window geometries have been adjusted properly BUG: 404500 FIXED-IN: 5.15.2 Test Plan: check that global menu still works properly Reviewers: #plasma, davidedmundson, broulik Reviewed By: #plasma, davidedmundson Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D19126 --- applets/appmenu/plugin/appmenumodel.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/applets/appmenu/plugin/appmenumodel.cpp b/applets/appmenu/plugin/appmenumodel.cpp index fdccd20e9..32091bdea 100644 --- a/applets/appmenu/plugin/appmenumodel.cpp +++ b/applets/appmenu/plugin/appmenumodel.cpp @@ -260,7 +260,17 @@ void AppMenuModel::onWindowChanged(WId id) { if (m_currentWindowId == id) { KWindowInfo info(id, NET::WMState | NET::WMGeometry); - const bool contained = m_screenGeometry.isNull() || m_screenGeometry.contains(info.geometry().center()); + + //! HACK: if the user has enabled screen scaling under X11 environment + //! then the window and screen geometries can not be trusted for comparison + //! before windows coordinates be adjusted properly. + //! BUG: 404500 + QPoint windowCenter = info.geometry().center(); + if (KWindowSystem::isPlatformX11()) { + windowCenter /= qApp->devicePixelRatio(); + } + + const bool contained = m_screenGeometry.isNull() || m_screenGeometry.contains(windowCenter); setVisible(contained && !info.isMinimized()); } From 8192bd3aec27a77bb1ab903bb928ffe0a2f4c517 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 19 Feb 2019 14:21:56 +0100 Subject: [PATCH 4/5] Don't show entries with NoDisplay=true with the applauncher containmentaction Summary: Currently NoDisplay services are shown, which doesn't make much sense. Test Plan: Installed and looked through the menu, no excessive or duplicate items anymore. Reviewers: #plasma, hein Reviewed By: #plasma, hein Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D19157 --- containmentactions/applauncher/launch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containmentactions/applauncher/launch.cpp b/containmentactions/applauncher/launch.cpp index 4f70337ad..a06eaa9ae 100644 --- a/containmentactions/applauncher/launch.cpp +++ b/containmentactions/applauncher/launch.cpp @@ -49,7 +49,7 @@ QList AppLauncher::contextualActions() void AppLauncher::makeMenu(QMenu *menu, const KServiceGroup::Ptr group) { - foreach (KSycocaEntry::Ptr p, group->entries(true, false, true)) { + foreach (KSycocaEntry::Ptr p, group->entries(true, true, true)) { if (p->isType(KST_KService)) { const KService::Ptr service(static_cast(p.data())); From 7816978b51204b82471359a8c0960a13710d489f Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 19 Feb 2019 14:21:56 +0100 Subject: [PATCH 5/5] Don't show entries with NoDisplay=true with the applauncher containmentaction Summary: Currently NoDisplay services are shown, which doesn't make much sense. Test Plan: Installed and looked through the menu, no excessive or duplicate items anymore. Reviewers: #plasma, hein Reviewed By: #plasma, hein Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D19157 --- containmentactions/applauncher/launch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containmentactions/applauncher/launch.cpp b/containmentactions/applauncher/launch.cpp index 7ea8ae8ae..373bac01e 100644 --- a/containmentactions/applauncher/launch.cpp +++ b/containmentactions/applauncher/launch.cpp @@ -49,7 +49,7 @@ QList AppLauncher::contextualActions() void AppLauncher::makeMenu(QMenu *menu, const KServiceGroup::Ptr group) { - foreach (KSycocaEntry::Ptr p, group->entries(true, false, true)) { + foreach (KSycocaEntry::Ptr p, group->entries(true, true, true)) { if (p->isType(KST_KService)) { const KService::Ptr service(static_cast(p.data()));