From c790c50292a647254dbc3ecb2031e5696c4508a6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 29 Sep 2019 08:51:18 +0200 Subject: [PATCH 1/2] 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" --- kcmkwin/kwineffects/kcm_kwin_effects.desktop | 1 + kcmkwin/kwinoptions/kwinactions.desktop | 1 + kcmkwin/kwinoptions/kwinfocus.desktop | 1 + 3 files changed, 3 insertions(+) diff --git a/kcmkwin/kwineffects/kcm_kwin_effects.desktop b/kcmkwin/kwineffects/kcm_kwin_effects.desktop index ade028a697..0f058f4a37 100644 --- a/kcmkwin/kwineffects/kcm_kwin_effects.desktop +++ b/kcmkwin/kwineffects/kcm_kwin_effects.desktop @@ -63,6 +63,7 @@ Name[zh_CN]=桌面特效 Name[zh_TW]=桌面效果 Comment=Configure compositor settings for desktop effects Comment[ca]=Configura l'arranjament del compositor per als efectes de l'escriptori +Comment[cs]=Nastavení kompozitoru pro efekty pracovní plochy Comment[en_GB]=Configure compositor settings for desktop effects Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio Comment[gl]=Configurar o compositor para os efectos de escritorio diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 5aa261bcfa..6992554d0f 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -31,6 +31,7 @@ Name[zh_TW]=視窗動作 Comment=Configure mouse actions for windows and titlebars Comment[ca]=Configura les accions de ratolí per a les finestres i les barres de títol +Comment[cs]=Nastavení činností myši na oknech a pruhu titulku Comment[en_GB]=Configure mouse actions for windows and titlebars Comment[es]=Configurar las acciones del ratón para las ventanas y las barras de títulos Comment[eu]=Konfiguratu saguaren ekintzak leihoekin eta titulu-barrekin diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index 8c35283ab9..761309516b 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -30,6 +30,7 @@ Name[zh_TW]=視窗焦點行為 Comment=Configure window activation policy Comment[ca]=Configura la política d'activació de les finestres +Comment[cs]=Nastavení pravidel aktivování oken Comment[en_GB]=Configure window activation policy Comment[es]=Configurar la política de activación de ventanas Comment[eu]=Konfiguratu leihoa aktibatzeko gidalerroak From 6ee6cc0293381098531ae5e117b1006f28d65346 Mon Sep 17 00:00:00 2001 From: Alexey Min Date: Tue, 1 Oct 2019 14:21:36 +0300 Subject: [PATCH 2/2] [platforms/hwcomposer] Fix build failure after D23495 In file included from /build/src/kwin-5.16.90/plugins/platforms/hwcomposer/hwcomposer_backend.cpp:21: /build/src/kwin-5.16.90/plugins/platforms/hwcomposer/hwcomposer_backend.h:58:11: error: 'QSize KWin::HwcomposerOutput::pixelSize() const' marked 'override', but does not override 58 | QSize pixelSize() const override; | ^~~~~~~~~ Fixes dbb2cede087a136e3bd2df7138ab3ceee2644fd5 Reviewed-by: Bhushan Shah --- plugins/platforms/hwcomposer/hwcomposer_backend.h | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/platforms/hwcomposer/hwcomposer_backend.h b/plugins/platforms/hwcomposer/hwcomposer_backend.h index fbc6381568..ce1bb5442f 100644 --- a/plugins/platforms/hwcomposer/hwcomposer_backend.h +++ b/plugins/platforms/hwcomposer/hwcomposer_backend.h @@ -55,7 +55,6 @@ public: ~HwcomposerOutput() override; bool isValid() const; - QSize pixelSize() const override; void updateDpms(KWayland::Server::OutputInterface::DpmsMode mode) override; Q_SIGNALS: void dpmsModeRequested(KWayland::Server::OutputInterface::DpmsMode mode);