From cba442b0791f4ab9d01fd9848f632b95ad4f613d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 30 May 2020 16:31:27 +0200 Subject: [PATCH 1/3] 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/fadingpopups/package/metadata.desktop | 4 ++-- effects/sessionquit/package/metadata.desktop | 2 ++ kcmkwin/kwincompositing/kwincompositing.desktop | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/effects/fadingpopups/package/metadata.desktop b/effects/fadingpopups/package/metadata.desktop index 05bbbe6890..063df4bea3 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 @@ -42,7 +42,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 70a4eca6cc..0d31df8eb5 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 @@ -35,6 +36,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 613ae8e2e4..52e9859fed 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -110,7 +110,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 ccd0677bb1641a45770c32d7ede700a1d48fd11a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 2 Jun 2020 09:47:47 +0200 Subject: [PATCH 2/3] 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/kwinoptions/kwinadvanced.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index a9d4d730ad..b611137b22 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -76,6 +76,7 @@ X-KDE-Keywords[es]=desplegar,extender,recoger,plegar,borde,pasada,bordes activos X-KDE-Keywords[et]=varjamine,piire,kohalviibimine,aktiivsed piirded,paanimine,kaardid,aknad kaartidena,akende rühmitamine,akende paanimine,akende paigutus,akende täpne käitumine,aken,paigutus X-KDE-Keywords[eu]=zabaldu,zabaltzea,bildu,biltzea,gainetik pasatzea,ertz aktiboak,lauzatze,fitxak,leihoa,leihoen fitxak,leihoak lauza moduan,leihoen kokapena,leihoen jokabide aurreratua X-KDE-Keywords[fi]=rullauksen avaus,rullauksen avaaminen,rullaus,rullaaminen,kehys,leijunta,aktiiviset reunat,asettelu,välilehdet,ikkunavälilehdet,ikkunoiden ryhmittely,ikkunoiden asettelu,sijoittaminen,sijoittelu,ikkunoiden sijoittaminen,ikkunoiden sijoittelu,ikkunoiden lisäasetukset +X-KDE-Keywords[fr]=non ombré, dé-nuancé, nuancé, ombré, bordure, survol, bords actifs, mosaïque, onglets, changement d'onglet, fenêtre, changement de fenêtres, regroupement de fenêtres, mosaïque de fenêtres, placement de fenêtres, positionnement de fenêtre, comportement avancé des fenêtres X-KDE-Keywords[gl]=dessombrar,dessombramento,sombra,bordo,beira,pasar,bordos activos,beiras activas,xanela,separadores,agrupar xanelas, situación das xanelas,colocación,colocación das xanelas,comportamento avanzado das xanelas X-KDE-Keywords[id]=tak berbayang,tak bayang,berbayang,batas,melayang,bingkai aktif,pengubinan,tab,pengetaban,window,pengetaban window,pengelompokan window,pengubinan window,penempatan,penempatan window,penempatan si window,perilaku tingkat-lanjut window X-KDE-Keywords[it]=arrotola,srotola,ombra,ombreggiatura,bordo,sovrapponi,bordi attivi,affiancamento,schede,navigazione a schede,finestre,finestre a schede,raggruppamento finestre,affiancamento finestre,posizionamento,posizionamento finestre,posizionamento delle finestre,comportamento avanzato delle finestre From ec602e0c2a676aed0707c7fb7edfe964516dbc77 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 7 Jun 2020 18:05:21 +0200 Subject: [PATCH 3/3] Fix the Plastik decoration with Qt 5.15 The trick in qmldir no longer works with Qt 5.15, so use a more reliable approach. This way works with Qt 5.15 and also on previous versions of Qt. --- .../kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp | 3 ++- plugins/kdecorations/aurorae/themes/plastik/code/qmldir | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp index 25d11251f1..4304dcdc1f 100644 --- a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp +++ b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp @@ -20,7 +20,8 @@ along with this program. If not, see . void PlastikPlugin::registerTypes(const char *uri) { - Q_UNUSED(uri) + // Need to register something to tell Qt that it loaded (QTBUG-84571) + qmlRegisterModule(uri, 1, 0); } void PlastikPlugin::initializeEngine(QQmlEngine *engine, const char *uri) diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir index 49a4b402df..aa7bf16b36 100644 --- a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir +++ b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir @@ -1,5 +1,2 @@ module org.kde.kwin.decorations.plastik plugin plastikplugin - -# we need to have at least one element of Qt is not able to find the plugin *shrug* -Foo 1.0 Foo.qml