From e30a761422e96ff8208413e14a853908d6a7dc6c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 19 Oct 2019 09:45:53 +0200 Subject: [PATCH 1/4] 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/thumbnailaside/thumbnailaside_config.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/thumbnailaside/thumbnailaside_config.desktop b/effects/thumbnailaside/thumbnailaside_config.desktop index 6de6b9a290..7422a66d60 100644 --- a/effects/thumbnailaside/thumbnailaside_config.desktop +++ b/effects/thumbnailaside/thumbnailaside_config.desktop @@ -35,7 +35,7 @@ Name[hne]=चिनहा बाजू में Name[hr]=Pokrajnja sličica Name[hu]=Ablakbetekintő oldalt Name[ia]=Miniatura a parte -Name[id]=Gambar-mini Aside +Name[id]=Thumbnail Aside Name[is]=Smámynd til hliðar Name[it]=Miniature a fianco Name[ja]=サムネイルをわきに表示 From b81c8991947d7a849940156cede8189c6ebac398 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 20 Oct 2019 09:24:18 +0200 Subject: [PATCH 2/4] 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/frozenapp/package/metadata.desktop | 4 ++-- kwin.notifyrc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/effects/frozenapp/package/metadata.desktop b/effects/frozenapp/package/metadata.desktop index 1a480fd305..ab2446de4d 100644 --- a/effects/frozenapp/package/metadata.desktop +++ b/effects/frozenapp/package/metadata.desktop @@ -10,7 +10,7 @@ Name[es]=Desaturar las aplicaciones que no responden Name[eu]=Desasetu erantzuten ez duten aplikazioak Name[fi]=Vähennä värikylläisyyttä sovelluksilta, jotka eivät vastaa Name[fr]=Désature les applications qui ne répondent pas -Name[gl]=Reducir a saturación dos aplicativos que non responden +Name[gl]=Reducir a saturación das aplicacións que non responden Name[he]=מחשיך יישומים שאינם מגיבים Name[hu]=Nem válaszoló alkalmazások színtelenítése Name[id]=Desaturate Unresponsive Applications @@ -46,7 +46,7 @@ Comment[es]=Desaturar las ventanas de las aplicaciones que no responden (congela Comment[eu]=Desasetu erantzuten ez duten aplikazioen leihoak (izoztuak) Comment[fi]=Vähennä värikylläisyyttä sovelluksilta, jotka eivät vastaa (ovat jumittuneet) Comment[fr]=Désature les fenêtres des applications qui ne répondent pas (gelées) -Comment[gl]=Reducir a saturación das xanelas de aplicativos que non responden (que queradon conxelados). +Comment[gl]=Reducir a saturación das xanelas de aplicacións que non responden (conxeladas) Comment[he]=מחשיך חלונות של יישומים שאינם מגיבים (תקועים) Comment[hu]=Színteleníti a nem válaszoló, lefagyott alkalmazások ablakait Comment[id]=Window desaturasi dari aplikasi yang tidak responsif (beku) diff --git a/kwin.notifyrc b/kwin.notifyrc index 222109c0cf..4e3f8a2c41 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -147,7 +147,7 @@ Comment[fi]=Toinen sovellus vaati keskeyttämään koostamisen. Comment[fr]=Une autre application a demandé la suspension de la composition. Comment[fy]=In oare applikaasje hat frege om compositing út te stellen. Comment[ga]=Tá feidhmchlár eile ag iarraidh comhshuí a chur ar fionraí. -Comment[gl]=Outro aplicativo pediu que a suspensión da composición. +Comment[gl]=Outra aplicación pediu que a suspensión da composición. Comment[he]=יישום אחר ביקש להשהות את השזירה. Comment[hr]=Neka aplikacija je dala zahtjev za paziranjem miješanja. Comment[hu]=Egy másik alkalmazás a kompozit mód felfüggesztését kérte. From c85a2227b7302fbd038c328e22f5983ebd5b17d7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 23 Oct 2019 09:29:41 +0200 Subject: [PATCH 3/4] 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/blur/blur_config.desktop | 2 +- effects/coverswitch/coverswitch_config.desktop | 2 +- effects/cube/cube_config.desktop | 2 +- effects/cube/cubeslide_config.desktop | 2 +- effects/desktopgrid/desktopgrid_config.desktop | 2 +- effects/dialogparent/package/metadata.desktop | 2 +- effects/diminactive/diminactive_config.desktop | 2 +- effects/eyeonscreen/package/metadata.desktop | 2 +- effects/fade/package/metadata.desktop | 2 +- effects/fadedesktop/package/metadata.desktop | 2 +- effects/flipswitch/flipswitch_config.desktop | 2 +- effects/frozenapp/package/metadata.desktop | 4 ++-- effects/glide/glide_config.desktop | 2 +- effects/invert/invert_config.desktop | 2 +- effects/login/package/metadata.desktop | 2 +- effects/logout/package/metadata.desktop | 2 +- effects/lookingglass/lookingglass_config.desktop | 2 +- effects/magiclamp/magiclamp_config.desktop | 2 +- effects/magnifier/magnifier_config.desktop | 2 +- effects/maximize/package/metadata.desktop | 2 +- effects/morphingpopups/package/metadata.desktop | 2 +- effects/mouseclick/mouseclick_config.desktop | 2 +- effects/mousemark/mousemark_config.desktop | 2 +- effects/presentwindows/presentwindows_config.desktop | 2 +- effects/resize/resize_config.desktop | 2 +- effects/scalein/package/metadata.desktop | 2 +- effects/showfps/showfps_config.desktop | 2 +- effects/slide/slide_config.desktop | 2 +- effects/thumbnailaside/thumbnailaside_config.desktop | 2 +- effects/trackmouse/trackmouse_config.desktop | 2 +- effects/translucency/package/metadata.desktop | 2 +- effects/windowaperture/package/metadata.desktop | 4 ++-- effects/windowgeometry/windowgeometry_config.desktop | 2 +- effects/wobblywindows/wobblywindows_config.desktop | 2 +- effects/zoom/zoom_config.desktop | 2 +- kcmkwin/kwincompositing/kwincompositing.desktop | 2 +- kcmkwin/kwincompositing/kwineffect.knsrc | 2 +- kcmkwin/kwindecoration/kwindecoration.desktop | 2 +- kcmkwin/kwinoptions/kwinactions.desktop | 2 +- kcmkwin/kwinoptions/kwinadvanced.desktop | 2 +- kcmkwin/kwinoptions/kwinfocus.desktop | 2 +- kcmkwin/kwinoptions/kwinmoving.desktop | 2 +- kcmkwin/kwinscripts/kwinscripts.knsrc | 2 +- kcmkwin/kwintabbox/kwinswitcher.knsrc | 2 +- kwin.notifyrc | 2 +- packageplugins/aurorae/kwin-packagestructure-aurorae.desktop | 2 +- .../decoration/kwin-packagestructure-decoration.desktop | 2 +- packageplugins/scripts/kwin-packagestructure-scripts.desktop | 2 +- .../kwin-packagestructure-windowswitcher.desktop | 2 +- plugins/kdecorations/aurorae/src/aurorae.knsrc | 2 +- scripts/desktopchangeosd/metadata.desktop | 2 +- scripts/enforcedeco/metadata.desktop | 2 +- scripts/minimizeall/metadata.desktop | 2 +- scripts/synchronizeskipswitcher/metadata.desktop | 4 ++-- scripts/videowall/metadata.desktop | 4 ++-- 55 files changed, 59 insertions(+), 59 deletions(-) diff --git a/effects/blur/blur_config.desktop b/effects/blur/blur_config.desktop index 05db7b1596..ba93d5cd6b 100644 --- a/effects/blur/blur_config.desktop +++ b/effects/blur/blur_config.desktop @@ -39,7 +39,7 @@ Name[hr]=Mrlja Name[hsb]=Młowojty Name[hu]=Elmosódás Name[ia]=Obscura (Blur) -Name[id]=Blur +Name[id]=Buram Name[is]=Móða Name[it]=Sfocatura Name[ja]=ぼかし diff --git a/effects/coverswitch/coverswitch_config.desktop b/effects/coverswitch/coverswitch_config.desktop index 40bf992c2e..5ed0dfbe9f 100644 --- a/effects/coverswitch/coverswitch_config.desktop +++ b/effects/coverswitch/coverswitch_config.desktop @@ -33,7 +33,7 @@ Name[hne]=कवर स्विच Name[hr]=Pokrivač – promjena Name[hu]=Fedett váltódoboz Name[ia]=Commutator de copertura -Name[id]=Cover Switch +Name[id]=Beralih Sampul Name[is]=Síðuskiptir Name[it]=Scambiafinestre circolare Name[ja]=カバースイッチ diff --git a/effects/cube/cube_config.desktop b/effects/cube/cube_config.desktop index 0be142b5ab..706103f672 100644 --- a/effects/cube/cube_config.desktop +++ b/effects/cube/cube_config.desktop @@ -36,7 +36,7 @@ Name[hr]=Radna površina na kocki Name[hsb]=Kóstka Name[hu]=Asztalkocka Name[ia]=Cubo de scriptorio -Name[id]=Desktop Cube +Name[id]=Kubus Desktop Name[is]=Skjáborðskubbur Name[it]=Cubo dei desktop Name[ja]=デスクトップキューブ diff --git a/effects/cube/cubeslide_config.desktop b/effects/cube/cubeslide_config.desktop index ee73fee3ad..f70e322f29 100644 --- a/effects/cube/cubeslide_config.desktop +++ b/effects/cube/cubeslide_config.desktop @@ -31,7 +31,7 @@ Name[hi]=डेस्कटॉप घन एनिमेशन Name[hr]=Animacija kocke s radnom površinom Name[hu]=Asztalváltó kocka Name[ia]=Animation de cubo de scriptorio -Name[id]=Desktop Cube Animation +Name[id]=Animasi Kubus Desktop Name[is]=Hreyfingar á skjáborðskubbi Name[it]=Animazione del cubo dei desktop Name[ja]=デスクトップキューブのアニメーション diff --git a/effects/desktopgrid/desktopgrid_config.desktop b/effects/desktopgrid/desktopgrid_config.desktop index d9d1644172..1ccdf20965 100644 --- a/effects/desktopgrid/desktopgrid_config.desktop +++ b/effects/desktopgrid/desktopgrid_config.desktop @@ -37,7 +37,7 @@ Name[hne]=डेस्कटाप ग्रिड Name[hr]=Mreža radne površine Name[hu]=Asztalrács Name[ia]=Grillia de scriptorio -Name[id]=Desktop Grid +Name[id]=Kisi Desktop Name[is]=Skjáborðsmöskvi Name[it]=Griglia dei Desktop Name[ja]=デスクトップグリッド diff --git a/effects/dialogparent/package/metadata.desktop b/effects/dialogparent/package/metadata.desktop index afd55867e2..a82463af45 100644 --- a/effects/dialogparent/package/metadata.desktop +++ b/effects/dialogparent/package/metadata.desktop @@ -29,7 +29,7 @@ Name[hne]=मूल गोठ Name[hr]=Dialog Roditelj Name[hu]=Párbeszédablak-tartó Name[ia]=Dialogo genitor -Name[id]=Dialog Parent +Name[id]=Induk Dialog Name[is]=Dekking undir valglugga Name[it]=Finestra madre Name[ja]=ダイアログの親 diff --git a/effects/diminactive/diminactive_config.desktop b/effects/diminactive/diminactive_config.desktop index dbaf575d63..d45f194f95 100644 --- a/effects/diminactive/diminactive_config.desktop +++ b/effects/diminactive/diminactive_config.desktop @@ -33,7 +33,7 @@ Name[hne]=असक्रिय मंद करव Name[hr]=Priguši neaktivno Name[hu]=Inaktív ablakok kiszürkítése Name[ia]=Dim Inactive -Name[id]=Dim Inactive +Name[id]=Pergelap yang Tak Aktif Name[is]=Dimma óvirka Name[it]=Scurisci le inattive Name[ja]=非アクティブを暗く diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 669daaf304..c2627cd782 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -15,7 +15,7 @@ Name[fr]=Jeter un oeil sur le bureau Name[gl]=Ollo na pantalla Name[he]=עין על המסך Name[hu]=Ide figyelj! -Name[id]=eye On Screen +Name[id]=mata Di Layar Name[it]=eye On Screen Name[ja]=eye On Screen Name[ko]=화면 위의 눈 diff --git a/effects/fade/package/metadata.desktop b/effects/fade/package/metadata.desktop index 7228ac6501..a77049f766 100644 --- a/effects/fade/package/metadata.desktop +++ b/effects/fade/package/metadata.desktop @@ -30,7 +30,7 @@ Name[hne]=फीका Name[hr]=Lagano pojavljivanje Name[hu]=Fokozatos átmenet Name[ia]=Pallidi -Name[id]=Fade +Name[id]=Lesap Name[is]=Þynna út Name[it]=Dissolvi Name[ja]=フェード diff --git a/effects/fadedesktop/package/metadata.desktop b/effects/fadedesktop/package/metadata.desktop index 2233fe17ea..6329eed1d2 100644 --- a/effects/fadedesktop/package/metadata.desktop +++ b/effects/fadedesktop/package/metadata.desktop @@ -25,7 +25,7 @@ Name[he]=חשיפה והיעלמות בין שולחנות עבודה Name[hr]=Preklapanje radnih površina Name[hu]=Elhalványuló váltás Name[ia]=Pallidi scriptorio -Name[id]=Fade Desktop +Name[id]=Lesapkan Desktop Name[is]=Þynna út skjáborð Name[it]=Dissolvenza dei desktop Name[ja]=デスクトップのフェード diff --git a/effects/flipswitch/flipswitch_config.desktop b/effects/flipswitch/flipswitch_config.desktop index f597a3538c..f39f404fe2 100644 --- a/effects/flipswitch/flipswitch_config.desktop +++ b/effects/flipswitch/flipswitch_config.desktop @@ -32,7 +32,7 @@ Name[hne]=फ्लिप स्विच Name[hr]=Naslagani prozori – promjena Name[hu]=Billenős váltódoboz Name[ia]=Commutator de colpetto (Flip) -Name[id]=Flip Switch +Name[id]=Beralih Jungkir Name[is]=Flettirofi Name[it]=Scambiafinestre a pila Name[ja]=フリップスイッチ diff --git a/effects/frozenapp/package/metadata.desktop b/effects/frozenapp/package/metadata.desktop index ab2446de4d..76f7aa1e25 100644 --- a/effects/frozenapp/package/metadata.desktop +++ b/effects/frozenapp/package/metadata.desktop @@ -13,7 +13,7 @@ Name[fr]=Désature les applications qui ne répondent pas Name[gl]=Reducir a saturación das aplicacións que non responden Name[he]=מחשיך יישומים שאינם מגיבים Name[hu]=Nem válaszoló alkalmazások színtelenítése -Name[id]=Desaturate Unresponsive Applications +Name[id]=Desaturate-kan Aplikasi Tidak Responsif Name[it]=Desatura le applicazioni che non rispondono Name[ko]=응답 없는 프로그램을 무채색으로 전환 Name[nl]=Verzadiging van niet responsieve toepassingen verminderen @@ -49,7 +49,7 @@ Comment[fr]=Désature les fenêtres des applications qui ne répondent pas (gel Comment[gl]=Reducir a saturación das xanelas de aplicacións que non responden (conxeladas) Comment[he]=מחשיך חלונות של יישומים שאינם מגיבים (תקועים) Comment[hu]=Színteleníti a nem válaszoló, lefagyott alkalmazások ablakait -Comment[id]=Window desaturasi dari aplikasi yang tidak responsif (beku) +Comment[id]=Desaturate-kan window pada aplikasi yang tidak responsif (beku) Comment[it]=Desatura le finestre delle applicazione che non rispondono (bloccate) Comment[ko]=응답 없는 프로그램 창을 무채색으로 전환 Comment[nl]=Verzadiging van vensters van niet responsieve (bevroren) toepassingen verminderen diff --git a/effects/glide/glide_config.desktop b/effects/glide/glide_config.desktop index e801c06205..f61ce241ba 100644 --- a/effects/glide/glide_config.desktop +++ b/effects/glide/glide_config.desktop @@ -28,7 +28,7 @@ Name[hi]=ग्लाइड Name[hr]=Klizanje Name[hu]=Siklás Name[ia]=Glissa -Name[id]=Glide +Name[id]=Luncuran Name[is]=Svífa Name[it]=Plana Name[ja]=グライド diff --git a/effects/invert/invert_config.desktop b/effects/invert/invert_config.desktop index d6a33cf993..f8401ad848 100644 --- a/effects/invert/invert_config.desktop +++ b/effects/invert/invert_config.desktop @@ -37,7 +37,7 @@ Name[hne]=उलटव Name[hr]=Izokretanje Name[hu]=Invertálás Name[ia]=Inverte -Name[id]=Invert +Name[id]=Kebalikan Name[is]=Umhverfa Name[it]=Inverti Name[ja]=色調反転 diff --git a/effects/login/package/metadata.desktop b/effects/login/package/metadata.desktop index cbb7eb38cd..fcc4828265 100644 --- a/effects/login/package/metadata.desktop +++ b/effects/login/package/metadata.desktop @@ -110,7 +110,7 @@ Comment[hne]=जब लागइन होथे तब डेस्कटाप Comment[hr]=Lagano pojavljivanje radne površine prilikom prijave na sustav Comment[hu]=Folyamatos átmenet az asztalra bejelentkezéskor Comment[ia]=Dulcemente pallidi le scriptorio quando tu accede in identification -Comment[id]=Melesap dengan halus ke desktop ketika log masuk +Comment[id]=Melesap dengan halus ke desktop ketika memasuki log Comment[is]=Láta skjáborð koma mjúklega í ljós við innstimplun Comment[it]=Dissolvenza graduale del desktop all'accesso Comment[ja]=ログイン時に滑らかにデスクトップを表示します diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index 14cd486bbf..ff456040b6 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -62,7 +62,7 @@ Comment[hne]=जब लागइन होथे तब डेस्कटाप Comment[hr]=Lagano pojavljivanje radne površine prilikom prijave na sustav Comment[hu]=Folyamatos átmenet az asztalra bejelentkezéskor Comment[ia]=Dulcemente pallidi le scriptorio quando tu accede in identification -Comment[id]=Melesap dengan halus ke desktop ketika log masuk +Comment[id]=Melesap dengan halus ke desktop ketika memasuki log Comment[is]=Láta skjáborð koma mjúklega í ljós við innstimplun Comment[it]=Dissolvenza graduale del desktop all'accesso Comment[ja]=ログイン時に滑らかにデスクトップを表示します diff --git a/effects/lookingglass/lookingglass_config.desktop b/effects/lookingglass/lookingglass_config.desktop index 77dfd0f1c4..6de1826578 100644 --- a/effects/lookingglass/lookingglass_config.desktop +++ b/effects/lookingglass/lookingglass_config.desktop @@ -35,7 +35,7 @@ Name[hne]=लुकिंग ग्लास Name[hr]=Povećalo Name[hu]=Nagyító Name[ia]=Looking Glass -Name[id]=Looking Glass +Name[id]=Kaca Pembesar Name[is]=Spegilgler Name[it]=Specchio Name[ja]=拡大鏡 diff --git a/effects/magiclamp/magiclamp_config.desktop b/effects/magiclamp/magiclamp_config.desktop index 07b48587d9..c946c3c8d8 100644 --- a/effects/magiclamp/magiclamp_config.desktop +++ b/effects/magiclamp/magiclamp_config.desktop @@ -33,7 +33,7 @@ Name[hne]=मैजिक लेम्प Name[hr]=Čarobna svjetiljka Name[hu]=Varázslámpa Name[ia]=Lampa Magic -Name[id]=Magic Lamp +Name[id]=Lampu Ajaib Name[is]=Töfralampi Name[it]=Lampada magica Name[ja]=魔法のランプ diff --git a/effects/magnifier/magnifier_config.desktop b/effects/magnifier/magnifier_config.desktop index a7c4e7786f..28b6df16fc 100644 --- a/effects/magnifier/magnifier_config.desktop +++ b/effects/magnifier/magnifier_config.desktop @@ -38,7 +38,7 @@ Name[hne]=आतिसी सीसा Name[hr]=Povećalo Name[hu]=Nagyító Name[ia]=Aggranditor -Name[id]=Magnifier +Name[id]=Suryakanta Name[is]=Stækkunargler Name[it]=Lente d'ingrandimento Name[ja]=虫めがね diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop index 288d156cab..621b5760ec 100644 --- a/effects/maximize/package/metadata.desktop +++ b/effects/maximize/package/metadata.desktop @@ -66,7 +66,7 @@ Name[gl]=Maximizar Name[he]=שינוי גודל חלק Name[hu]=Maximalizálás Name[ia]=Maximiza -Name[id]=Maximize +Name[id]=Maksimalkan Name[is]=Hámarka Name[it]=Massimizzazione Name[ja]=最大化 diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop index f91eeb0ccb..788ef1f71d 100644 --- a/effects/morphingpopups/package/metadata.desktop +++ b/effects/morphingpopups/package/metadata.desktop @@ -53,7 +53,7 @@ Name[gl]=Xanelas emerxentes cambiantes Name[he]=החלקת חלונות קופצים Name[hu]=Átalakuló felugró ablakok Name[ia]=Popups de Morphing -Name[id]=Morphing popups +Name[id]=Sembulan perubahan Name[it]=Finestre a comparsa che si trasformano Name[ko]=변형되는 팝업 Name[nl]=Morphing popups diff --git a/effects/mouseclick/mouseclick_config.desktop b/effects/mouseclick/mouseclick_config.desktop index e282007834..a8756fa0ae 100644 --- a/effects/mouseclick/mouseclick_config.desktop +++ b/effects/mouseclick/mouseclick_config.desktop @@ -23,7 +23,7 @@ Name[gl]=Animación ao premer o rato Name[he]=הנפשה של לחיצה עם העכבר Name[hu]=Egérkattintás animáció Name[ia]=Animation de click de mus -Name[id]=Mouse Click Animation +Name[id]=Animasi Klik Mouse Name[is]=Hreyfingar við músarsmell Name[it]=Animazione del clic del mouse Name[ja]=マウスクリックアニメーション diff --git a/effects/mousemark/mousemark_config.desktop b/effects/mousemark/mousemark_config.desktop index 22ce8287ea..e85f28189f 100644 --- a/effects/mousemark/mousemark_config.desktop +++ b/effects/mousemark/mousemark_config.desktop @@ -37,7 +37,7 @@ Name[hne]=मुसुवा चिनहा Name[hr]=Oznaka miša Name[hu]=Egérnyom Name[ia]=Marca de mus -Name[id]=Mouse Mark +Name[id]=Tandai Mouse Name[is]=Músarspor Name[it]=Pennarello Name[ja]=マウスマーク diff --git a/effects/presentwindows/presentwindows_config.desktop b/effects/presentwindows/presentwindows_config.desktop index 2f93930212..5edbc22648 100644 --- a/effects/presentwindows/presentwindows_config.desktop +++ b/effects/presentwindows/presentwindows_config.desktop @@ -37,7 +37,7 @@ Name[hne]=मौजूद विंडो Name[hr]=Prikaz prozora Name[hu]=Ablakáttekintő Name[ia]=Fenestras actual -Name[id]=Present Windows +Name[id]=Window Hadir Name[is]=Núverandi gluggar Name[it]=Presenta le finestre Name[ja]=ウィンドウを並べて表示 diff --git a/effects/resize/resize_config.desktop b/effects/resize/resize_config.desktop index 8a3ae41926..a0e6f125fc 100644 --- a/effects/resize/resize_config.desktop +++ b/effects/resize/resize_config.desktop @@ -33,7 +33,7 @@ Name[hi]=विंडो आकार बदलें Name[hr]=Promjena veličine prozora Name[hu]=Ablak átméretezése Name[ia]=Redimensiona fenestra -Name[id]=Resize Window +Name[id]=Ubah-ukuran Window Name[is]=Breyta stærð glugga Name[it]=Ridimensiona la finestra Name[ja]=ウィンドウのリサイズ diff --git a/effects/scalein/package/metadata.desktop b/effects/scalein/package/metadata.desktop index 61d1863ecd..9d05761b84 100644 --- a/effects/scalein/package/metadata.desktop +++ b/effects/scalein/package/metadata.desktop @@ -29,7 +29,7 @@ Name[hne]=स्केल इन Name[hr]=Skaliranje Name[hu]=Felbukkanás Name[ia]=Scala intra -Name[id]=Scale In +Name[id]=Skala Masuk Name[is]=Kvarða niður Name[it]=Espandi Name[ja]=スケールイン diff --git a/effects/showfps/showfps_config.desktop b/effects/showfps/showfps_config.desktop index 7ac4d2be81..1708c1af6c 100644 --- a/effects/showfps/showfps_config.desktop +++ b/effects/showfps/showfps_config.desktop @@ -37,7 +37,7 @@ Name[hne]=एफपीएस देखाव Name[hr]=Prikaz FPS-a (broj okvira po sekundi) Name[hu]=Képkockaszámláló Name[ia]=Monstra FPS -Name[id]=Show FPS +Name[id]=Tampilkan FPS Name[is]=Sýna FPS (rammar á sekúndu) Name[it]=Mostra fotogrammi al secondo Name[ja]=フレームレート (FPS) 表示 diff --git a/effects/slide/slide_config.desktop b/effects/slide/slide_config.desktop index 1774f68436..4e544454a7 100644 --- a/effects/slide/slide_config.desktop +++ b/effects/slide/slide_config.desktop @@ -31,7 +31,7 @@ Name[hne]=स्लाइड Name[hr]=Pomak Name[hu]=Csúsztatott váltás Name[ia]=Glissa -Name[id]=Slide +Name[id]=Geser Name[is]=Renna til Name[it]=Scivola Name[ja]=スライド diff --git a/effects/thumbnailaside/thumbnailaside_config.desktop b/effects/thumbnailaside/thumbnailaside_config.desktop index 7422a66d60..48fcc61689 100644 --- a/effects/thumbnailaside/thumbnailaside_config.desktop +++ b/effects/thumbnailaside/thumbnailaside_config.desktop @@ -35,7 +35,7 @@ Name[hne]=चिनहा बाजू में Name[hr]=Pokrajnja sličica Name[hu]=Ablakbetekintő oldalt Name[ia]=Miniatura a parte -Name[id]=Thumbnail Aside +Name[id]=Gambar-mini ke Samping Name[is]=Smámynd til hliðar Name[it]=Miniature a fianco Name[ja]=サムネイルをわきに表示 diff --git a/effects/trackmouse/trackmouse_config.desktop b/effects/trackmouse/trackmouse_config.desktop index c287bf92c8..9c12df3db3 100644 --- a/effects/trackmouse/trackmouse_config.desktop +++ b/effects/trackmouse/trackmouse_config.desktop @@ -38,7 +38,7 @@ Name[hne]=मुसुवा ट्रैक करव Name[hr]=Praćenje miša Name[hu]=Egérkövetés Name[ia]=Tracia mus -Name[id]=Track Mouse +Name[id]=Lacak Mouse Name[is]=Elta mús Name[it]=Trova il mouse Name[ja]=マウス追跡 diff --git a/effects/translucency/package/metadata.desktop b/effects/translucency/package/metadata.desktop index 0978ea4f0b..9d3421f5e6 100644 --- a/effects/translucency/package/metadata.desktop +++ b/effects/translucency/package/metadata.desktop @@ -32,7 +32,7 @@ Name[hne]=पारभासी Name[hr]=Prozirnost Name[hu]=Áttetszőség Name[ia]=Translucentia -Name[id]=Translucency +Name[id]=Bening Name[is]=Hálfgegnsæi Name[it]=Translucenza Name[ja]=半透明 diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index ef9f54e2bb..37bf2c2e57 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -15,7 +15,7 @@ Name[fr]=Ouverture de la fenêtre Name[gl]=Apertura das xanelas Name[hu]=Ablakrekeszek Name[ia]=Aperturas de fenestra -Name[id]=Window Aperture +Name[id]=Window Melubang Name[it]=Apertura delle finestre Name[ko]=조리개 모양 배치 Name[lt]=Lango anga @@ -55,7 +55,7 @@ Comment[fr]=Déplace les fenêtres dans les coins en affichant le bureau Comment[gl]=Mover a xanela ás esquinas mentres se mostra o escritorio. Comment[hu]=A sarkokba mozgatja az ablakokat az asztal megjelenítése közben Comment[ia]=Move fenestra a le angulos quando monstra scriptorio -Comment[id]=Pindah window ke pojok ketika menampilkan desktop +Comment[id]=Window pindah ke sudut ketika menampilkan desktop Comment[it]=Sposta la finestra negli angoli quando mostri il desktop Comment[ja]=デスクトップを表示している間に、ウインドウを角に移動させます Comment[ko]=데스크톱을 보일 때 창을 모서리로 이동 diff --git a/effects/windowgeometry/windowgeometry_config.desktop b/effects/windowgeometry/windowgeometry_config.desktop index f17d3102ec..9ef9dec261 100644 --- a/effects/windowgeometry/windowgeometry_config.desktop +++ b/effects/windowgeometry/windowgeometry_config.desktop @@ -26,7 +26,7 @@ Name[hi]=विंडोज्यामिति Name[hr]=GeometrijaProzora Name[hu]=Ablakgeometria Name[ia]=WindowGeometry -Name[id]=WindowGeometry +Name[id]=Geometri Window Name[is]=GluggaLögun Name[it]=Geometria delle finestre Name[ja]=WindowGeometry diff --git a/effects/wobblywindows/wobblywindows_config.desktop b/effects/wobblywindows/wobblywindows_config.desktop index 350c3f8fab..5e1794ca12 100644 --- a/effects/wobblywindows/wobblywindows_config.desktop +++ b/effects/wobblywindows/wobblywindows_config.desktop @@ -35,7 +35,7 @@ Name[hne]=कांपत विंडो Name[hr]=Klimavi prozori Name[hu]=Tekergő ablakok Name[ia]=Fenestras Tremulante -Name[id]=Wobbly Windows +Name[id]=Window Bergoyang Name[is]=Linir gluggar Name[it]=Finestre tremolanti Name[ja]=揺れるウィンドウ diff --git a/effects/zoom/zoom_config.desktop b/effects/zoom/zoom_config.desktop index 557db0134a..87f5fc42d5 100644 --- a/effects/zoom/zoom_config.desktop +++ b/effects/zoom/zoom_config.desktop @@ -40,7 +40,7 @@ Name[hne]=जूम Name[hr]=Povećanje Name[hu]=Kinagyítás Name[ia]=Zoom -Name[id]=Zoom +Name[id]=Zoom Name[is]=Aðdráttur Name[it]=Ingrandimento Name[ja]=ズーム diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index b9d26a7077..689a590345 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -29,7 +29,7 @@ Name[fr]=Compositeur Name[gl]=Compositor Name[hu]=Összeállító Name[ia]=Compositor -Name[id]=Compositor +Name[id]=Kompositor Name[it]=Compositore Name[ko]=컴포지터 Name[lt]=Kompozitorius diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc index 43284c5589..02325c3377 100644 --- a/kcmkwin/kwincompositing/kwineffect.knsrc +++ b/kcmkwin/kwincompositing/kwineffect.knsrc @@ -15,7 +15,7 @@ Name[gl]=Efectos do xestor de xanelas Name[he]=אפקטי מנהל חלונות Name[hu]=Ablakkezelő-effektusok Name[ia]=Gerente de effectos de fenestra -Name[id]=Window Manager Effects +Name[id]=Efek Pengelola Window Name[it]=Effetti del gestore delle finestre Name[ko]=창 관리자 효과 Name[lt]=Langų tvarkyklės efektai diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index 7992bb4cbc..c806229085 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -90,7 +90,7 @@ Comment[gl]=Aparencia e o comportamento dos títulos das xanelas Comment[he]=הגדרת המראה והתחושה של מסגרות החלונות Comment[hu]=Az ablakok címsorának megjelenése Comment[ia]=Semblantia de titulos de fenestra -Comment[id]=Look and Feel pada Judul Window +Comment[id]=Nuansa dan Suasana Judul Window Comment[it]=Aspetto dei titoli delle finestre Comment[ja]=ウィンドウタイトルの外観を設定 Comment[ko]=창 제목 표시줄의 모습과 느낌 설정 diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index b86c87bc8b..ae14c9d6ff 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -45,7 +45,7 @@ Name[hne]=काम Name[hr]=Aktivnosti Name[hu]=Műveletek Name[ia]=Actiones -Name[id]=Actions +Name[id]=Aksi Name[is]=Aðgerðir Name[it]=Azioni Name[ja]=動作 diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index bbb98462f0..c78a8ea951 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -44,7 +44,7 @@ Name[hne]=विस्तृत Name[hr]=Napredno Name[hu]=Speciális Name[ia]=Avantiate -Name[id]=Advanced +Name[id]=Tingkat-lanjut Name[is]=Ítarlegt Name[it]=Avanzate Name[ja]=詳細 diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index 306cbf4672..cf1da59056 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -43,7 +43,7 @@ Name[hne]=फोकस Name[hr]=Fokus Name[hu]=Fókuszálás Name[ia]=Foco -Name[id]=Focus +Name[id]=Fokus Name[is]=Virkni Name[it]=Attivazione Name[ja]=フォーカス diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop index edbb35c81f..7a0796ac9e 100644 --- a/kcmkwin/kwinoptions/kwinmoving.desktop +++ b/kcmkwin/kwinoptions/kwinmoving.desktop @@ -44,7 +44,7 @@ Name[hne]=खिसकावत हे Name[hr]=Pomicanje Name[hu]=Mozgatás Name[ia]=Movente -Name[id]=Moving +Name[id]=Memindah Name[is]=Færa Name[it]=Spostamento Name[ja]=移動 diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc index 5530ab5133..00a8ab4037 100644 --- a/kcmkwin/kwinscripts/kwinscripts.knsrc +++ b/kcmkwin/kwinscripts/kwinscripts.knsrc @@ -14,7 +14,7 @@ Name[fr]=Scripts du gestionnaire de fenêtres Name[gl]=Scripts do xestor de xanelas Name[hu]=Ablakkezelő szkriptek Name[ia]=Gerente de scripts de fenestra -Name[id]=Window Manager Scripts +Name[id]=Skrip Pengelola Window Name[it]=Script del gestore delle finestre Name[ko]=창 관리자 스크립트 Name[lt]=Langų tvarkyklės scenarijai diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc index 8226e68876..03b0317aee 100644 --- a/kcmkwin/kwintabbox/kwinswitcher.knsrc +++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc @@ -15,7 +15,7 @@ Name[gl]=Disposicións de cambio do xestor de xanelas Name[he]=מחליף פריסות של מנהל החלונות Name[hu]=Ablakkezelő-váltó elrendezések Name[ia]=Disposition de commutator de gerente de fenestra -Name[id]=Window Manager Switching Layouts +Name[id]=Tataletak Pengalihan Pengelola Window Name[it]=Disposizione scambiafinestre del gestore delle finestre Name[ko]=창 관리자 전환기 레이아웃 Name[lt]=Langų perjungimo išdėstymai diff --git a/kwin.notifyrc b/kwin.notifyrc index 4e3f8a2c41..97bba1f660 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -211,7 +211,7 @@ Name[gl]=Reinicio dos gráficos Name[he]=איפוס גרפיקה Name[hu]=Grafikai visszaállítás Name[ia]=Reinitia Graphic -Name[id]=Graphics Reset +Name[id]=Set-ulang Grafik Name[it]=Azzeramento grafica Name[kk]=Графиканы ысыру Name[ko]=그래픽 초기화 diff --git a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop index 4b7a57d5b9..de222835c9 100644 --- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop +++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop @@ -13,7 +13,7 @@ Name[fi]=KWin Aurorae Name[fr]=Module Aurorae de KWin Name[gl]=Aurorae de KWin Name[hu]=KWin Aurorae -Name[id]=KWin Aurorae +Name[id]=Aurorae KWin Name[it]=Aurorae di Kwin Name[ko]=KWin Aurorae Name[nl]=KWin Aurorae diff --git a/packageplugins/decoration/kwin-packagestructure-decoration.desktop b/packageplugins/decoration/kwin-packagestructure-decoration.desktop index 519611cb6d..b2b80ebccc 100644 --- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop +++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop @@ -14,7 +14,7 @@ Name[fr]=Décorations KWin Name[gl]=Decoración de KWin Name[hu]=KWin dekoráció Name[ia]=Decorationes de KWin -Name[id]=KWin Decoration +Name[id]=Dekorasi KWin Name[it]=Decorazioni di KWin Name[ko]=KWin 장식 Name[lt]=Kwin dekoracijos diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop index 08b9927451..2f868da3a3 100644 --- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop +++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop @@ -14,7 +14,7 @@ Name[fr]=Script KWin Name[gl]=Script de KWin Name[hu]=KWin szkript Name[ia]=Script de KWin -Name[id]=KWin Script +Name[id]=Skrip KWin Name[it]=Script di KWin Name[ko]=KWin 스크립트 Name[lt]=KWin scenarijus diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index c2206978c4..71fa471096 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -14,7 +14,7 @@ Name[fr]=Sélecteur de fenêtres de KWin Name[gl]=Selector de xanela de KWin Name[hu]=KWin ablakváltó Name[ia]=Commutator de fenestra de KWin -Name[id]=KWin Window Switcher +Name[id]=Pengalih Window KWin Name[it]=Scambiafinestre di KWin Name[ko]=KWin 창 전환기 Name[lt]=KWin langų perjungiklis diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc index 73a3061edb..b9f580e9bc 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.knsrc +++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc @@ -14,7 +14,7 @@ Name[fr]=Décorations de fenêtres Aurorae Name[gl]=Decoracións de xanela de Aurorae Name[hu]=Aurorae ablakdekorációk Name[ia]=Decorationes de fenestra Aurorae -Name[id]=Aurorae Window Decorations +Name[id]=Dekorasi Window Aurorae Name[it]=Decorazioni delle finestre Aurorae Name[ko]=Aurorae 창 장식 Name[nl]=Aurorea-vensterdecoraties diff --git a/scripts/desktopchangeosd/metadata.desktop b/scripts/desktopchangeosd/metadata.desktop index 4f02021ddc..8a8c772ccb 100644 --- a/scripts/desktopchangeosd/metadata.desktop +++ b/scripts/desktopchangeosd/metadata.desktop @@ -17,7 +17,7 @@ Name[gl]=OSD de cambio de escritorio Name[he]=תצוגה על המסך של החלפת מסך Name[hu]=Asztal változtatás OSD Name[ia]=Modifica OSD de scriptorio -Name[id]=Desktop Change OSD +Name[id]=OSD Perubahan Desktop Name[it]=Mostra lo scambia desktop Name[ja]=Desktop Change OSD Name[kk]=Үстел ауыстыру панелі diff --git a/scripts/enforcedeco/metadata.desktop b/scripts/enforcedeco/metadata.desktop index e6e51e8c34..d6ad8f78a9 100644 --- a/scripts/enforcedeco/metadata.desktop +++ b/scripts/enforcedeco/metadata.desktop @@ -17,7 +17,7 @@ Name[gl]=Aplica a decoración ás xanelas de GTK+ Name[he]=אכוף עיצוב מסגרת חלון לחלונות GTK Name[hu]=Ablakdekorációk kényszerítése GTK+ ablakokra Name[ia]=Applica Decorationes de fenestra sur fenestra GTK+ -Name[id]=Enforces Window Decorations on GTK+ window +Name[id]=Paksakan Dekorasi Window pada window GTK+ Name[it]=Forza le decorazioni delle finestre GTK+ Name[ja]=GTK+ ウインドウのウィンドウの飾りを強制する Name[ko]=GTK+ 창 장식 강제 사용 diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index c864d4b034..0f9e971bd3 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -16,7 +16,7 @@ Name[gl]=Minimizalo todo Name[he]=מזער הכל Name[hu]=Összes minimalizálása Name[ia]=MaximizaOmne -Name[id]=MinimizeAll +Name[id]=Minimalkan Semua Name[it]=Minimizza tutto Name[ja]=すべて最小化 Name[ko]=모두최소화 diff --git a/scripts/synchronizeskipswitcher/metadata.desktop b/scripts/synchronizeskipswitcher/metadata.desktop index 9180e554eb..09ba169788 100644 --- a/scripts/synchronizeskipswitcher/metadata.desktop +++ b/scripts/synchronizeskipswitcher/metadata.desktop @@ -16,7 +16,7 @@ Name[fr]=Synchroniser le sélecteur de fenêtres à ignorer avec la barre de tâ Name[gl]=Sincronizar o ignorar o alternador coa barra de tarefas Name[hu]=Skip-váltó szinkronizálása a feladatsávval Name[ia]=Synchronisa Commutator de salto con Barra de carga -Name[id]=Synchronize Skip Switcher with Taskbar +Name[id]=Sinkronisasikan Lewati Pengalih dengan BilahTugas Name[it]=Sincronizza Salta barra delle applicazioni con la barra delle applicazioni Name[kk]=Терезе көрсету күйін ауыстырғышты тапсырма панелімен қадамдастыру Name[km]=ធ្វើ​សមកាលម្ម​​ដោយ​រំលង​ឧបករណ៍​ប្ដូរ​​ជា​មួយ​របារ​ភារកិច្ច @@ -61,7 +61,7 @@ Comment[gl]=Agocha todas as xanelas que deban ser ignoradas pola barra de tarefa Comment[he]=מסתיר את כל החלונות המסומנים לדילוג על שורת המשימות לא להיות גם במחליף חלונות (כגון Alt+Tab) Comment[hu]=A Skip feladatsávként megjelölt összes ablak elrejtése, kivéve az ablakváltókat (például Alt+Tab) Comment[ia]=Cela omne fenestras marcate como barra de cargas de salto pro anque esser excludite ex commutatores de fenestra (p.ex.Alt+Tab) -Comment[id]=Sembunyikan semua window bertanda Lewati Taskbar untuk dikecualikan dari pengganti window (misalnya Alt+Tab) +Comment[id]=Sembunyikan semua window bertanda Lewati Taskbar untuk dikecualikan dari pengalih window (misalnya Alt+Tab) Comment[it]=Nascondi tutte le finestre marcate come Salta barra delle applicazioni che sono escluse anche dallo scambiafinestre (es. Alt+Tab) Comment[kk]=Көрсетілмейтін деп белгіленген бүкіл терезелерін терезе ауыстырғышында да (мысалы, Alt-Tab дегенде) көрсетпеу Comment[km]=លាក់​បង្អួច​ទាំងអស់​ដែល​បាន​សម្គាល់​ថា​រំលង​របារ​ភារកិច្ច ក៏​ត្រូវ​បាន​ដក​ចេញ​ពី​​ឧបករណ៍​ប្ដូរ​បង្អួច (ឧ. Alt+Tab) diff --git a/scripts/videowall/metadata.desktop b/scripts/videowall/metadata.desktop index 7f93abc109..c0764024cc 100644 --- a/scripts/videowall/metadata.desktop +++ b/scripts/videowall/metadata.desktop @@ -18,7 +18,7 @@ Name[gl]=Parede de vídeo Name[he]=חלון וידאו Name[hu]=Videófal Name[ia]=Muro de Video -Name[id]=Video Wall +Name[id]=Dinding Video Name[it]=Parete video Name[kk]=Бейне қабырға Name[km]=ផ្ទាំង​វីដេអូ @@ -64,7 +64,7 @@ Comment[gl]=Estende un reprodutor de vídeo a pantalla completa por todas as pan Comment[he]=מפעיל נגן וידאו במסך מלא על כל המסכים המחוברים ליצירה של קיר וידאו Comment[hu]=Kiterjeszti a teljes képernyős videólejátszót az összes csatolt kijelzőre, hogy videófalat hozzon létre Comment[ia]=Extende jocator de video de schermo plen super omne schermos attachate pro crea un Muro de Video -Comment[id]=Rentangkan layar-penuh pemutar video ke semua layar yang terhubung untuk menciptakan Video Wall +Comment[id]=Rentangkan layar-penuh pemutar video ke semua layar yang terhubung untuk menciptakan Dinding Video Comment[it]=Distribuisci il lettore video a schermo pieno su tutti gli schermi per creare una parete video Comment[kk]=Видеоплейердің суретін бейне қабырғаны құратын экрандарға жайып көрсету Comment[km]=រំលង​កម្មវិធី​ចាក់​វីដេអូ​លើ​អេក្រង់​ដែល​បានភ្ជាប់ ដើម្បី​បង្កើត​ផ្ទាំង​វីដេអូ From 1d362d38fd3eb1186bc849b33b6e27d13bfae7ac Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Tue, 12 Nov 2019 22:46:29 +0200 Subject: [PATCH 4/4] [libkwineffects] Restore GL_DRAW_FRAMEBUFFER binding in GLTexture::clear Summary: If an effect renders a window into an offscreen texture, it's very important that the window ends up in the offscreen render target rather than the default framebuffer object. However, that might be not the case if the OpenGL decoration renderer needs to create a texture atlas since the renderer calls GLTexture::clear() method, which might clobber the current GL_DRAW_FRAMEBUFFER binding. Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D25365 --- libkwineffects/kwingltexture.cpp | 8 ++++++-- libkwineffects/kwingltexture.h | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libkwineffects/kwingltexture.cpp b/libkwineffects/kwingltexture.cpp index 0ecce612b6..177b10542a 100644 --- a/libkwineffects/kwingltexture.cpp +++ b/libkwineffects/kwingltexture.cpp @@ -514,11 +514,15 @@ void GLTexture::clear() if (GLTexturePrivate::s_fbo) { // Clear the texture - glBindFramebuffer(GL_FRAMEBUFFER, GLTexturePrivate::s_fbo); + GLuint previousFramebuffer = 0; + glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, reinterpret_cast(&previousFramebuffer)); + if (GLTexturePrivate::s_fbo != previousFramebuffer) + glBindFramebuffer(GL_FRAMEBUFFER, GLTexturePrivate::s_fbo); glClearColor(0, 0, 0, 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, d->m_texture, 0); glClear(GL_COLOR_BUFFER_BIT); - glBindFramebuffer(GL_FRAMEBUFFER, 0); + if (GLTexturePrivate::s_fbo != previousFramebuffer) + glBindFramebuffer(GL_FRAMEBUFFER, previousFramebuffer); } else { if (const int size = width()*height()) { uint32_t *buffer = new uint32_t[size]; diff --git a/libkwineffects/kwingltexture.h b/libkwineffects/kwingltexture.h index 965348332c..0aebab08f2 100644 --- a/libkwineffects/kwingltexture.h +++ b/libkwineffects/kwingltexture.h @@ -108,7 +108,6 @@ public: /** @short * Make the texture fully transparent - * Warning: this clobbers the current framebuffer binding except on fglrx */ void clear(); bool isDirty() const;