From a3139650a7aafe20f2f9f698feae863fcbc4d1b4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 31 May 2020 14:23:06 +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" --- effects/eyeonscreen/package/metadata.desktop | 1 + effects/fadingpopups/package/metadata.desktop | 4 ++-- effects/sessionquit/package/metadata.desktop | 2 ++ kcmkwin/kwincompositing/kwincompositing.desktop | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 66c5cf742c..60e1123ec8 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -30,6 +30,7 @@ Comment[en_GB]=Suck windows into the desktop Comment[es]=Aspirar las ventanas en el escritorio Comment[et]=Akende imemine töölauale Comment[eu]=Mahaigainak leihoak xurgatu +Comment[fr]=Faire disparaître les fenêtres dans le bureau Comment[ia]=Suger fenestras in le scriptorio Comment[id]=Sedot window ke desktop Comment[it]=Risucchia le finestre nel desktop diff --git a/effects/fadingpopups/package/metadata.desktop b/effects/fadingpopups/package/metadata.desktop index a42ae1df36..b7e54ff16f 100644 --- a/effects/fadingpopups/package/metadata.desktop +++ b/effects/fadingpopups/package/metadata.desktop @@ -10,7 +10,7 @@ Name[es]=Desvanecer ventanas emergentes Name[et]=Hääbuvad hüpikdialoogid Name[eu]=Itzaleztatzen diren gainerakorrak Name[fi]=Hiipuvat ponnahdusikkunat -Name[fr]=Fondu des boites de dialogue +Name[fr]=Fondu des boîtes de dialogue Name[gl]=Xanelas emerxentes que esvaen Name[hu]=Halványodó felugró ablakok Name[ia]=Popups dissolvente @@ -43,7 +43,7 @@ Comment[es]=Hace que las ventanas emergentes aparezcan o se desvanezcan suavemen Comment[et]=Paneb hüpikaknad sujuvalt hääbuma või tugevnema, kui need peidetakse või nähtavale tuuakse Comment[eu]=Gainerakorrak emeki agertzen eta desagertzen ditu haiek erakustean edo ezkutatzean Comment[fi]=Ponnahdusikkunat tulevat näkyviin tai poistuvat näkyvistä pehmeästi häivyttäen -Comment[fr]=Estompe ou fait apparaître en fondu les boites de dialogue lorsqu'elles sont affichées ou cachées +Comment[fr]=Estompe ou fait apparaître en fondu les boîtes de dialogue lorsqu'elles sont affichées ou cachées Comment[gl]=Esvae e fai opacas as xanelas emerxentes con suavidade ao mostralas ou agochadas Comment[hu]=A felugró folyamatosan áttűnő módon lesznek elrejtve és megjelenítve Comment[ia]=Face que fenestras pote dulcemente pallidir intra e foras quando illos es monstrate o celate diff --git a/effects/sessionquit/package/metadata.desktop b/effects/sessionquit/package/metadata.desktop index 5dc800e84d..e35edceb9f 100644 --- a/effects/sessionquit/package/metadata.desktop +++ b/effects/sessionquit/package/metadata.desktop @@ -8,6 +8,7 @@ Name[es]=Cierre de sesión Name[et]=Seansist väljumine Name[eu]=Saiotik irtetea Name[fi]=Istunnon lopetus +Name[fr]=Fin de session Name[gl]=Saída de sesión Name[ia]=Abandona session Name[id]=Sesi Berhenti @@ -36,6 +37,7 @@ Comment[es]=Mantener el fondo del escritorio activo durante el cierre de sesión Comment[et]=Töölaua taust hoitakse väljalogimisel alles kuni lõpuni Comment[eu]=Eutsi mahaigaineko atzeko-planoa bizirik saio-ixtean bukaera arte Comment[fi]=Pidä työpöydän tausta käynnissä aina uloskirjautumisen loppuun +Comment[fr]=Conservez l'arriére plan du bureau visible jusqu'à la fin de la déconnexion Comment[gl]=Manter vivo o fondo de escritorio durante a saída ata o final Comment[id]=Jaga latarbelakang desktop tetap nyala selama logout sampai akhir Comment[it]=Mantieni attivo lo sfondo del desktop durante la chiusura della sessione fino alla fine diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index d5c8a97b0a..b81cf4afbe 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -111,7 +111,7 @@ X-KDE-Keywords[es]=kwin,ventana,gestor,composición,efecto,efectos 3D,efectos 2D X-KDE-Keywords[et]=kwin,aken,haldur,komposiit,komposiitor,efekt,3D efektid,ruumilised efektid,2D efektid,OpenGL,XRender,videoseadistused,graafilised efektid,töölauaefektid X-KDE-Keywords[eu]=kwin,leihoa,kudeatzailea,konposatzailea,efektua,3Dtako efektuak,2Dtako efektuak,OpenGL,XRender,bideo ezarpenak,efektu grafikoak,mahaigaineko efektuak X-KDE-Keywords[fi]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,ikkunointiohjelma,ikkunaohjelma,ikkunanhallinta,tehoste,3D-tehosteet,2D-tehosteet,videoasetukset,graafiset tehosteet,työpöytätehosteet -X-KDE-Keywords[fr]=Gestionnaire de fenêtres KWin, kwin,window,manager,compositeur, effet, effets 3D,effets 2D,OpenGL,XRender,paramétrage video,effets graphiques ,effects du bureau +X-KDE-Keywords[fr]=Gestionnaire de fenêtres KWin, kwin, window, manager, compositeur, effet, effets 3D, effets 2D, OpenGL, XRender, paramétrage video, effets graphiques, effects du bureau X-KDE-Keywords[ia]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects X-KDE-Keywords[id]=kwin,window,pengelola,kompositing,efek,efek 3D,efek 2D,OpenGL,XRender,pengaturan video,efek grafis,efek desktop X-KDE-Keywords[it]=kwin,finestra,gestore,composizione,effetto,effetti 3D,effetti 2D,OpenGL,XRender,impostazioni video,effetti grafici,effetti del desktop From 0a06ee12c6582a426efb43b638d651eefb703861 Mon Sep 17 00:00:00 2001 From: Ismael Asensio Date: Mon, 1 Jun 2020 19:06:42 +0200 Subject: [PATCH 2/2] [kcm/kwinrules] Fix "window role" combo not showing up Correctly set the policy of `windowrole` property to `StringMatch`. BUG: 422302 FIXED-IN: 5.19 --- kcmkwin/kwinrules/rulesmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmkwin/kwinrules/rulesmodel.cpp b/kcmkwin/kwinrules/rulesmodel.cpp index daa17a0c03..e4ba5087aa 100644 --- a/kcmkwin/kwinrules/rulesmodel.cpp +++ b/kcmkwin/kwinrules/rulesmodel.cpp @@ -382,7 +382,7 @@ void RulesModel::populateRuleList() types->setFlag(RuleItem::AffectsWarning); addRule(new RuleItem(QLatin1String("windowrole"), - RulePolicy::NoPolicy, RuleItem::String, + RulePolicy::StringMatch, RuleItem::String, i18n("Window role"), i18n("Window matching"), QIcon::fromTheme("dialog-object-properties")));