From bdbb471851f7b962f5c63f254cd97ed05a350148 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 17 Apr 2019 08:50:30 +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/kwinrules/kwinrules.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop index 9c541e7d31..191e75970a 100644 --- a/kcmkwin/kwinrules/kwinrules.desktop +++ b/kcmkwin/kwinrules/kwinrules.desktop @@ -35,7 +35,7 @@ Name[hi]=विंडो निय Name[hr]=Pravila prozora Name[hu]=Ablakszabályok Name[ia]=Regulas de fenestra -Name[id]=Pengaturan Window +Name[id]=Peraturan Window Name[is]=Gluggahegðunarreglur Name[it]=Regole delle finestre Name[ja]=ウィンドウルール @@ -135,7 +135,7 @@ X-KDE-Keywords[ga]=méid,ionad,staid,oibriú na bhfuinneog,fuinneoga,sainiúil,r X-KDE-Keywords[gl]=tamaño,posición,estado,comportamento da xanela,xanelas,específico,regra X-KDE-Keywords[hu]=méret,elhelyezkedés,állapot,ablakműködés,ablakok,specifikus,kerülő megoldások,megjegyzés,szabályok X-KDE-Keywords[ia]=grandor,position,stato,comportamento de fenestra,fenestras,specific,workarounds,memora,regulas -X-KDE-Keywords[id]=ukuran,posisi,kondisi,perilaku window,window,spesifik,sekeliling,ingat,aturan +X-KDE-Keywords[id]=ukuran,posisi,kondisi,perilaku window,window,spesifik,sekeliling,ingat,peraturan X-KDE-Keywords[it]=dimensione,posizione,stato,comportamento della finestra,finestre,specifico,espedienti,ricorda,regole X-KDE-Keywords[kk]=size,position,state,window behavior,windows,specific,workarounds,remember,rules X-KDE-Keywords[km]=size,position,state,window behavior,windows,specific,workarounds,remember,rules From 97c3cb73ffdc89ffd50a3b5e166cf62f3c8eaf85 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Tue, 23 Apr 2019 10:54:42 +0200 Subject: [PATCH 2/2] [libkwineffects] Use fully qualified type name for signal Qt Script Engine isn't particularly smart at resolving namespaces. Differential Revision: https://phabricator.kde.org/D20733 --- libkwineffects/kwineffects.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libkwineffects/kwineffects.h b/libkwineffects/kwineffects.h index 1713c2bd0e..6fda62f83d 100644 --- a/libkwineffects/kwineffects.h +++ b/libkwineffects/kwineffects.h @@ -1750,7 +1750,7 @@ Q_SIGNALS: * @param w The window whose the keep above state was changed. * @since 5.15 **/ - void windowKeepAboveChanged(EffectWindow *w); + void windowKeepAboveChanged(KWin::EffectWindow *w); /** * This signal is emitted when the keep below state of @p was changed. @@ -1758,7 +1758,7 @@ Q_SIGNALS: * @param w The window whose the keep below state was changed. * @since 5.15 **/ - void windowKeepBelowChanged(EffectWindow *w); + void windowKeepBelowChanged(KWin::EffectWindow *w); /** * This signal is emitted when the full screen state of @p w was changed. @@ -1766,7 +1766,7 @@ Q_SIGNALS: * @param w The window whose the full screen state was changed. * @since 5.15 **/ - void windowFullScreenChanged(EffectWindow *w); + void windowFullScreenChanged(KWin::EffectWindow *w); protected: QVector< EffectPair > loaded_effects;