From bca3dcf9398b7014fcc077374caebffd3ff32039 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 Apr 2017 05:16:50 +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/eyeonscreen/package/metadata.desktop | 2 +- effects/fade/package/metadata.desktop | 2 +- effects/maximize/package/metadata.desktop | 4 ++-- effects/morphingpopups/package/metadata.desktop | 4 ++-- effects/scalein/package/metadata.desktop | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 12acb8fceb..6028441591 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -57,7 +57,7 @@ Comment[ko]=창을 데스크톱으로 흡수시켜 데스크톱을 표시합니 Comment[nb]=Sug vinduer inn i skrivebordet for å vise det. Dette minner deg kanskje om noe. Comment[nl]=Laat vensters wegzinken in het bureaublad om deze te tonen. Dit kan u aan iets herinneren. Comment[nn]=Sug vindauge inn i skrivebordet for å visa skrivebordet. Dette minner deg kanskje om noko. -Comment[pl]=Zasysa okna na pulpicie, aby go pokazać. Powinno nasuwać pewne skojarzenia. +Comment[pl]=Zasysa okna, aby pokazać pulpit. Skojarzenia powinny nasuwać się same. Comment[pt]=Suga as janelas para o ecrã mostrar a última. Isto podê-lo-á recordar de algo. Comment[pt_BR]=Suga as janelas na área de trabalho para mostrar a última. Isso pode lembrá-lo de algo. Comment[ru]=Для просмотра рабочего стола окна временно втягиваются в центр экрана diff --git a/effects/fade/package/metadata.desktop b/effects/fade/package/metadata.desktop index 8881946681..30bdf2511b 100644 --- a/effects/fade/package/metadata.desktop +++ b/effects/fade/package/metadata.desktop @@ -123,7 +123,7 @@ Comment[nds]=Finstern bi't Wiesen oder Versteken week in- oder utblennen Comment[nl]=Laat vensters vloeiend opkomen/vervagen als ze worden weergegeven of verborgen Comment[nn]=Ton vindauge inn og ut når dei vert viste eller gøymde Comment[pa]=ਜਦੋਂ ਵਿੰਡੋਜ਼ ਨੂੰ ਵੇਖਾਉਣਾ ਜਾਂ ਓਹਲੇ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਕੂਲੇ ਢੰਗ ਨਾਲ ਫੇਡ ਇਨ/ਆਉਟ ਕਰੋ -Comment[pl]=Gładkie zanikanie i wyłanianie się okien przy ich pokazywaniu lub ukrywaniu +Comment[pl]=Gładkie zanikanie i wyłanianie się okien przy ich otwieraniu i zamykaniu Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando aparecem ou ficam escondidas Comment[pt_BR]=Faz as janelas aparecerem/desaparecerem suavemente quando são exibidas ou ocultadas Comment[ro]=Face ferestrele să se (de)coloreze când sunt afișate sau ascunse diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop index 210e6449e4..4768ad12ae 100644 --- a/effects/maximize/package/metadata.desktop +++ b/effects/maximize/package/metadata.desktop @@ -27,7 +27,7 @@ Comment[nb]=Animering for et vindu som maksimeres/tilbakestilles fra maksimering Comment[nds]=Animeren för en Finster, dat maximeert/vun maximeert wedderherstellt warrt Comment[nl]=Animatie voor een venster dat gaat naar maximaliseren/herstellen vanuit maximaliseren Comment[nn]=Vindaugsanimasjon i samband med bruk av maksimering/gjenoppretting. -Comment[pl]=Animacja dla okna mającego zostać zmaksymalizowanym/przywróconym z maksymalizacji +Comment[pl]=Efekt skalowania okien przy ich maksymalizowaniu i powrocie z niego Comment[pt]=Animação para um janela que se vai maximizar/repor da maximização Comment[pt_BR]=Animação para uma janela a ser maximizada/restaurada Comment[ro]=Animație pentru o fereastră ce trece la maximizare/restabilire din maximizare @@ -79,7 +79,7 @@ Name[nds]=Maximeren Name[nl]=Maximaliseren Name[nn]=Maksimer Name[pa]=ਵੱਧੋ-ਵੱਧ -Name[pl]=Maksymalizowanie +Name[pl]=Animacja maksymalizacji Name[pt]=Maximização Name[pt_BR]=Maximizar Name[ro]=Maximizează diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop index 51c8f9cfbd..23cb331382 100644 --- a/effects/morphingpopups/package/metadata.desktop +++ b/effects/morphingpopups/package/metadata.desktop @@ -17,7 +17,7 @@ Comment[it]=Animazione in dissolvenza quando i suggerimenti e le notifiche cambi Comment[ko]=풍선 도움말이나 알림 크기가 변경될 때 크로스페이드 애니메이션 사용 Comment[nl]=Verwissel animatie van opkomen/vervagen wanneer tekstballonnen of meldingen hun geometrie wijzigen Comment[nn]=Krysstoningsanimasjon når hjelpebobler eller varslingar endrar form -Comment[pl]=Animacja zanikania przy zmianie geometrii wskazówek lub powiadomień +Comment[pl]=Efekt zmiany kształtu podpowiedzi i powiadomień przy zmianie ich geometrii Comment[pt]=Animar o desvanecimento quando as dicas ou notificações mudarem de tamanho Comment[pt_BR]=Animar a transição suave quando as dicas ou notificações mudarem de tamanho Comment[ru]=При изменении формы всплывающих подсказок или уведомлений они плавно растягиваются или сжимаются @@ -52,7 +52,7 @@ Name[it]=Finestre a comparsa che si trasformano Name[ko]=변형되는 팝업 Name[nl]=Morphing popups Name[nn]=Formendring for sprettoppvindauge -Name[pl]=Morfing elementów wysuwnych +Name[pl]=Zmiennokształtne elementy pomocnicze Name[pt]=Mensagens com mudança de forma Name[pt_BR]=Mensagens com mudança de forma Name[ru]=Анимация преобразования всплывающих окон diff --git a/effects/scalein/package/metadata.desktop b/effects/scalein/package/metadata.desktop index 64a59d0202..b94e42154e 100644 --- a/effects/scalein/package/metadata.desktop +++ b/effects/scalein/package/metadata.desktop @@ -123,7 +123,7 @@ Comment[nds]=Dat Opduken vun Finstern animeren Comment[nl]=Voorziet het verschijnen van vensters van een animatie Comment[nn]=Animer opning av vindauge Comment[pa]=ਵਿੰਡੋ ਵੇਖਾਉਣ ਨੂੰ ਐਨੀਮੇਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ -Comment[pl]=Animacja pojawiania się okna +Comment[pl]=Efekt skalowania okien przy ich otwieraniu i zamykaniu Comment[pt]=Animar a aparição das janelas Comment[pt_BR]=Anima o aparecimento de janelas Comment[ro]=Animează apariția ferestrelor From 5a0629c732bad9b8467a552987fc5484d3b35b1a Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 25 Apr 2017 12:52:56 +0100 Subject: [PATCH 2/4] Update version number for 5.9.5 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78e2e87f64..869db1f926 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(KWIN) -set(PROJECT_VERSION "5.9.4") +set(PROJECT_VERSION "5.9.5") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 7422c070e91ff3d1c8ee9e5cacc79fcb14097424 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 25 Apr 2017 14:15:59 +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/morphingpopups/package/metadata.desktop | 2 ++ kcmkwin/kwincompositing/kcmkwineffects.desktop | 1 + kcmkwin/kwincompositing/kwincompositing.desktop | 1 + kcmkwin/kwincompositing/kwineffect.knsrc | 1 + kcmkwin/kwinscripts/kwinscripts.knsrc | 1 + kcmkwin/kwintabbox/kwinswitcher.knsrc | 1 + packageplugins/scripts/kwin-packagestructure-scripts.desktop | 1 + .../windowswitcher/kwin-packagestructure-windowswitcher.desktop | 1 + plugins/kdecorations/aurorae/src/aurorae.knsrc | 1 + 9 files changed, 10 insertions(+) diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop index 23cb331382..a4f2e52964 100644 --- a/effects/morphingpopups/package/metadata.desktop +++ b/effects/morphingpopups/package/metadata.desktop @@ -28,6 +28,7 @@ Comment[sr@ijekavian]=Анимација претапања када облач Comment[sr@ijekavianlatin]=Animacija pretapanja kada oblačići ili obaveštenja menjaju geometriju Comment[sr@latin]=Animacija pretapanja kada oblačići ili obaveštenja menjaju geometriju Comment[sv]=Övertona animering när verktygstips eller underrättelser ändrar storlek +Comment[tr]=Araç İpuçları veya Bildirimler geometrilerini değiştirdiğinde çapraz solma animasyonu göster Comment[uk]=Анімація зі зміною освітленості під час зміни геометрії панелей підказок і сповіщень Comment[x-test]=xxCross fade animation when Tooltips or Notifications change their geometryxx Comment[zh_CN]=在工具提示或者通知大小变化时交叉淡入淡出的动画 @@ -63,6 +64,7 @@ Name[sr@ijekavian]=Претапајући искакачи Name[sr@ijekavianlatin]=Pretapajući iskakači Name[sr@latin]=Pretapajući iskakači Name[sv]=Föränderliga meddelanderutor +Name[tr]=Dönüşümlü pencereler Name[uk]=Аморфні контекстні панелі Name[x-test]=xxMorphing popupsxx Name[zh_CN]=变形气泡通知 diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop index f3dbb86f0a..9fadd8b2f3 100644 --- a/kcmkwin/kwincompositing/kcmkwineffects.desktop +++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop @@ -130,6 +130,7 @@ X-KDE-Keywords[sr@ijekavian]=kwin,window,manager,effect,3D effects,2D effects,gr X-KDE-Keywords[sr@ijekavianlatin]=kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,explosion effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale in effect,screenshot effect,sheet effect,slide effect,sliding popups effect,taskbar thumbnails effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,box switch effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,outline effect,present windows effect,resize window effect,KWin,prozor,menadžer,efekat,3D efekti,2D efekti,grafički efekti,efekti površi,animacije,razne animacije,efekti upravljanja prozorima,efekti menjanja prozora,efekti menjanja površi,animacije,animacije površi,drajveri,postavke drajvera,renderovanje,iscrtavanje,efekat izvrtanja,efekat lupe,efekat uklapanja,efekat praćenja miša,efekat uveličanja,efekat zamućenja,instrument-tabla,efekat eksplozije,efekat utapanja,efekata utapanja površi,efekat raspadanja,efekat rasparčavanja,efekat klizanja,efekat isticanja prozora,efekat prijavljivanja,efekat odjavljivanja,efekat magične lampe,efekat minimizovanja,efekat tragova miša,efekat skaliranja,efekat snimka ekrana,efekat lista,efekat klizanja,efekat klizajućih iskakača,efekat efekat sličica na traci zadataka,efekat prozirnosti,prozirnost,providnost,efekat geometrije prozora,efekat lelujajućih prozora,efekat odziva pokretanja,efekat roditeljskog dijalog,efekat potamnjenja neaktivnog,efekat potamnjenja ekrana,šminka,efekat prikazivanja,efekat kutijastog prebacivanja,efekat kocke površi,efekat animacije kocke površi,efekat mreže površi,efekat prevrtanja,efekat predstavljanja prozora,efekat promene veličine prozora X-KDE-Keywords[sr@latin]=kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,explosion effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale in effect,screenshot effect,sheet effect,slide effect,sliding popups effect,taskbar thumbnails effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,box switch effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,outline effect,present windows effect,resize window effect,KWin,prozor,menadžer,efekat,3D efekti,2D efekti,grafički efekti,efekti površi,animacije,razne animacije,efekti upravljanja prozorima,efekti menjanja prozora,efekti menjanja površi,animacije,animacije površi,drajveri,postavke drajvera,renderovanje,iscrtavanje,efekat izvrtanja,efekat lupe,efekat uklapanja,efekat praćenja miša,efekat uveličanja,efekat zamućenja,instrument-tabla,efekat eksplozije,efekat utapanja,efekata utapanja površi,efekat raspadanja,efekat rasparčavanja,efekat klizanja,efekat isticanja prozora,efekat prijavljivanja,efekat odjavljivanja,efekat magične lampe,efekat minimizovanja,efekat tragova miša,efekat skaliranja,efekat snimka ekrana,efekat lista,efekat klizanja,efekat klizajućih iskakača,efekat efekat sličica na traci zadataka,efekat prozirnosti,prozirnost,providnost,efekat geometrije prozora,efekat lelujajućih prozora,efekat odziva pokretanja,efekat roditeljskog dijalog,efekat potamnjenja neaktivnog,efekat potamnjenja ekrana,šminka,efekat prikazivanja,efekat kutijastog prebacivanja,efekat kocke površi,efekat animacije kocke površi,efekat mreže površi,efekat prevrtanja,efekat predstavljanja prozora,efekat promene veličine prozora X-KDE-Keywords[sv]=kwin,fönster,hanterare,effekt,3D-effekter,grafiska effekter,skrivbordseffekter,animeringar,diverse animeringar,fönsterhanteringseffekter,fönsterbyteseffekt,skrivbordsbyteseffekt,skrivbordsanimeringar,drivrutiner,drivrutininställningar,återgivning,återge,inverteringseffekt,förstoringsglaseffekt,förstoringseffekt,låshjälpeffekt,musföljningseffekt,zoomeffekt,suddighetseffekt,explosionseffekt,borttoningseffekt,skrivbordsborttoningseffekt,sönderfallseffekt,glidningseffekt,fönstermarkeringseffekt,inloggningseffekt,utloggningseffekt,magisk lampeffekt,minimeringsanimeringseffekt,musmarkeringseffekt,inskalningseffekt,skärmbildseffekt,bladeffekt,skjuteffekt,glidande ruteffekt,miniatyrbilder i aktivitetsfältet,miniatyrbild vid sidan om,genomskinlighet,genomskinlighetseffekt,fönstergeometrieffekt,ostadiga fönster,startgensvarseffekt,dialogrutors ägare,dämpa inaktiva,dämpa skärmen,glid tillbaka,ögongodis,visa ramar/s,visa uppritning,byte med ruta,omslagsbyte,skrivbordskub,animeringseffekt för skrivbordskub,skrivbordsrutnät,blädderbyteseffekt,kontureffekt,befintliga fönster,ändra fönsterstorlek +X-KDE-Keywords[tr]=kwin,pencere,yönetici,efekt,3D efektler,2D efektler,grafiksel efektler,masaüstü efektleri,animasyonlar,çeşitli animasyonlar,pencere yönetimi efektleri,pencere geçiş efekti,masaüstü geçiş efekti,canlandırmalar,canlandırma hızı,masaüstü animasyonları,sürücüler,sürücü ayarları,hazırlama,hazırla,ters efekt,gözlük efekti,büyüteç efekti,yakalama yardımcısı efekti,fareyi izleme efekti,yakınlaştırma efekti,buğu efekti,pano efekti,patlama efekti,kaybolma efekti,masasütü kaybolma efekti,düşme efekti,sürülme efekti,pencere vurgulama efekti,oturum açma efekti,oturum kapatma efekti,sihirli lamba efekti,küçültme animasyonu efekti,fare işaretleme efekti,boyutlandırma efekti,ekran yakalama efekti,kağıt efekti,kaydırma efekti,kayan pencereler efekti,görev çubuğu önizlemeleri efekti,önizleme gösterme efekti,saydamlık,sayfamlık efekti,saeoydamlık,pencere geometri efekti,sallanan pencereler efekti,başlatma geribildirim efekti,üst pencere efekti,etkin olmayanı soldurma efekti,ekranı soldurma efekti,geri kayma efekti,göz alıcı,şeker,FPS gösterme efekti,boyama gösterme efekti,kutu değiştirme efekti,kapak değiştirme efekti,masaüstü küp efekti,masaüstü küp animasyonu efekti,masaüstü ızgara efekti,döndürme geçişi efekti,dış kenarlık efekti,güncel pencereler efekti,pencereyi yeniden boyutlandırma efekti X-KDE-Keywords[uk]=kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,explosion effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale in effect,screenshot effect,sheet effect,slide effect,sliding popups effect,taskbar thumbnails effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,box switch effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,outline effect,present windows effect,resize window effect,вікно,керування вікнами,менеджер вікон,ефект,просторовий,плоский,параметри відео,графічні ефекти,анімації,анімація,перемикання вікон,драйвери,параметри драйверів,показ,відтворення,інвертування,інверсія,збільшувальне скло,збільшення,прилипання,шлейф за вказівником,шлейф,масштабування,масштаб,зміна розмірів,розмивання,панель,вибух,ефекти вибуху,згасання,поява,ковзання,підсвічування,підсвічування вікон,вихід,магічна лампа,чарівна лампа,джин,аркуші,стос,знімок екрана,мініатюри панелі задач,мініатюри,прозорість,ефект прозорості,желе,желейні вікна,супровід запуску,стрибунець,притлумлення,сірість,прикраси,показ частоти,малювання,обкладинки,стрибання,контур,поточні вікна,зміна розмірів X-KDE-Keywords[x-test]=xxkwinxx,xxwindowxx,xxmanagerxx,xxeffectxx,xx3D effectsxx,xx2D effectsxx,xxgraphical effectsxx,xxdesktop effectsxx,xxanimationsxx,xxvarious animationsxx,xxwindow management effectsxx,xxwindow switching effectxx,xxdesktop switching effectxx,xxanimationsxx,xxdesktop animationsxx,xxdriversxx,xxdriver settingsxx,xxrenderingxx,xxrenderxx,xxinvert effectxx,xxlooking glass effectxx,xxmagnifier effectxx,xxsnap helper effectxx,xxtrack mouse effectxx,xxzoom effectxx,xxblur effectxx,xxexplosion effectxx,xxfade effectxx,xxfade desktop effectxx,xxfall apart effectxx,xxglide effectxx,xxhighlight window effectxx,xxlogin effectxx,xxlogout effectxx,xxmagic lamp effectxx,xxminimize animation effectxx,xxmouse mark effectxx,xxscale in effectxx,xxscreenshot effectxx,xxsheet effectxx,xxslide effectxx,xxsliding popups effectxx,xxtaskbar thumbnails effectxx,xxthumbnail aside effectxx,xxtranslucencyxx,xxtranslucency effectxx,xxtransparencyxx,xxwindow geometry effectxx,xxwobbly windows effectxx,xxstartup feedback effectxx,xxdialog parent effectxx,xxdim inactive effectxx,xxdim screen effectxx,xxslide back effectxx,xxeye candyxx,xxcandyxx,xxshow FPS effectxx,xxshow paint effectxx,xxbox switch effectxx,xxcover switch effectxx,xxdesktop cube effectxx,xxdesktop cube animation effectxx,xxdesktop grid effectxx,xxflip switch effectxx,xxoutline effectxx,xxpresent windows effectxx,xxresize window effectxx X-KDE-Keywords[zh_CN]=kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,explosion effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale in effect,screenshot effect,sheet effect,slide effect,sliding popups effect,taskbar thumbnails effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,box switch effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,outline effect,present windows effect,resize window effect,窗口,管理,特效,3D 特效,2D 特效,图形特效,桌面特效,动画,窗口管理特效,窗口切换特效,桌面切换特效,桌面动画,驱动,去掉设置,渲染,反色,放大镜特效,鼠标跟踪,缩放特效,模糊特效,爆炸特效,渐变特效,破碎特效,滑动特效,高亮窗口,登录特效,注销特效,神灯特效,最小化动画,鼠标标记,截屏,飘落,滑动弹出窗口,任务栏缩略图,缩略图置边,透明特效,摇摆窗口,启动反馈特效,黯淡对话框特效,黯淡屏幕特效,视觉效果,显示 FPS 特效,显示绘制区域特效,盒状切换特效,封面切换特效,桌面立方体特效,桌面立方体动画特效,翻转切换特效,边框特效,展示窗口特效,调整窗口大小特效 diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index bdd1738116..704ca0fbd7 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -126,6 +126,7 @@ X-KDE-Keywords[sr@ijekavian]=kwin,window,manager,compositing,effect,3D effects,2 X-KDE-Keywords[sr@ijekavianlatin]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animation speed,KWin,prozor,menadžer,slaganje,efekti,3D efekti,2D efekti,OpenGL,XRender,video postavke,grafički efekti,efekti površi,brzina animacije X-KDE-Keywords[sr@latin]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animation speed,KWin,prozor,menadžer,slaganje,efekti,3D efekti,2D efekti,OpenGL,XRender,video postavke,grafički efekti,efekti površi,brzina animacije X-KDE-Keywords[sv]=kwin,fönster,hantering,sammansättning,effekt,3D effekter,2D effekter,OpenGL,XRender,videoinställningar,grafiska effekter,skrivbordseffekter,animeringshastighet +X-KDE-Keywords[tr]=kwin,pencere,yönetici,birleştirme,efekt,3D efektler,2D efektler,OpenGL,XRender,görüntü ayarları,grafiksel efektler,masaüstü efektleri,animasyon hızı X-KDE-Keywords[uk]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animation speed,вікно,керування,композитне,композиція,ефект,просторовий,ефекти,плоскі,параметри відео,графічні ефекти,ефекти стільниці,швидкість анімації X-KDE-Keywords[x-test]=xxkwinxx,xxwindowxx,xxmanagerxx,xxcompositingxx,xxeffectxx,xx3D effectsxx,xx2D effectsxx,xxOpenGLxx,xxXRenderxx,xxvideo settingsxx,xxgraphical effectsxx,xxdesktop effectsxx,xxanimation speedxx X-KDE-Keywords[zh_CN]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animation speed,窗口,管理器,混成,特效,3D 特效,2D 特效,视频设置,图形特效,桌面特效,动画速度 diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc index 0b098fe20e..95412f1724 100644 --- a/kcmkwin/kwincompositing/kwineffect.knsrc +++ b/kcmkwin/kwincompositing/kwineffect.knsrc @@ -23,6 +23,7 @@ Name[sr@ijekavian]=Ефекти менаџера прозора Name[sr@ijekavianlatin]=Efekti menadžera prozora Name[sr@latin]=Efekti menadžera prozora Name[sv]=Fönsterhanteringseffekter +Name[tr]=Pencere Yöneticisi Efektleri Name[uk]=Ефекти засобу керування вікнами Name[x-test]=xxWindow Manager Effectsxx Name[zh_CN]=窗口管理器效果 diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc index b4da7071ec..664f8ef5c3 100644 --- a/kcmkwin/kwinscripts/kwinscripts.knsrc +++ b/kcmkwin/kwinscripts/kwinscripts.knsrc @@ -24,6 +24,7 @@ Name[sr@ijekavian]=Скрипте менаџера прозора Name[sr@ijekavianlatin]=Skripte menadžera prozora Name[sr@latin]=Skripte menadžera prozora Name[sv]=Fönsterhanteringsskript +Name[tr]=Pencere Yöneticisi Betikleri Name[uk]=Скрипти засобу керування вікнами Name[x-test]=xxWindow Manager Scriptsxx Name[zh_CN]=窗口管理器脚本 diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc index 65b4c84c43..737584b822 100644 --- a/kcmkwin/kwintabbox/kwinswitcher.knsrc +++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc @@ -22,6 +22,7 @@ Name[sr@ijekavian]=Распореди пребацивања менаџера п Name[sr@ijekavianlatin]=Rasporedi prebacivanja menadžera prozora Name[sr@latin]=Rasporedi prebacivanja menadžera prozora Name[sv]=Fönsterbyteslayouter +Name[tr]=Pencere Yöneticisi Geçiş Düzenleri Name[uk]=Компонування засобу перемикання вікон Name[x-test]=xxWindow Manager Switching Layoutsxx Name[zh_CN]=窗口切换器布局 diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop index 31b063c33d..8fcd74c905 100644 --- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop +++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop @@ -22,6 +22,7 @@ Name[sr@ijekavian]=К‑винова скрипта Name[sr@ijekavianlatin]=KWinova skripta Name[sr@latin]=KWinova skripta Name[sv]=Kwin-skript +Name[tr]=KWin Betiği Name[uk]=Скрипт KWin Name[x-test]=xxKWin Scriptxx Name[zh_CN]=KWin 脚本 diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index 1d00c920e2..350bc52271 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -22,6 +22,7 @@ Name[sr@ijekavian]=К‑винов мењач прозора Name[sr@ijekavianlatin]=KWinov menjač prozora Name[sr@latin]=KWinov menjač prozora Name[sv]=Kwin-fönsterbyte +Name[tr]=KWin Pencere Değiştirici Name[uk]=Перемикач вікон KWin Name[x-test]=xxKWin Window Switcherxx Name[zh_CN]=KWin 窗口切换器 diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc index ac04def4ae..d071a77cfd 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.knsrc +++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc @@ -22,6 +22,7 @@ Name[sr@ijekavian]=Декорације прозора за Ауроре Name[sr@ijekavianlatin]=Dekoracije prozora za Aurore Name[sr@latin]=Dekoracije prozora za Aurore Name[sv]=Aurorae-fönsterdekorationer +Name[tr]=Aurorae Pencere Dekorasyonları Name[uk]=Обрамлення вікон Aurorae Name[x-test]=xxAurorae Window Decorationsxx Name[zh_CN]=Aurorae 窗口装饰 From 0bec9ad7337536e319c17c5684d97e1156399fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 3 May 2017 21:17:25 +0200 Subject: [PATCH 4/4] Improve the x11 timestamp handling Summary: So far KWin only updated the x11 timestamp if the new timestamp is larger than the existing one. While this is a useful thing it creates problems when the 32 bit msec based time stamp wraps around which happens after running an X server for 49 days. After the timestamp wrapped around KWin would not update the timestamp any more and thus some calls might fail. Most prominent victims are keyboard and pointer grab which fails as the timestamp is either larger than the server timestamp or smaller than the last grab timestamp. Another problem related to timestamp handling is KWin getting broken by wrong timestamps sent by applications. A prominent example is clusterssh which used to send a timestamp as unix time which is larger than the x timestamp and thus our timestamp gets too large. This change addresses these problems by allowing to reset the timestamp. This is only used from updateXTime (which is normally invoked before we do things like grabKeyboard). Thus we make QX11Info::getTimestamp the ultimate trusted source for timestamps. BUG: 377901 BUG: 348569 FIXED-IN: 5.8.7 Test Plan: As I cannot wait 50 days: unit tests for the two conditions added. Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D5704 --- autotests/CMakeLists.txt | 11 +++ autotests/test_x11_timestamp_update.cpp | 123 ++++++++++++++++++++++++ main.h | 8 +- utils.cpp | 2 +- utils.h | 6 +- 5 files changed, 144 insertions(+), 6 deletions(-) create mode 100644 autotests/test_x11_timestamp_update.cpp diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index 2974d96648..d4fdc79ffd 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -310,3 +310,14 @@ target_link_libraries(testScreenEdges add_test(kwin_testScreenEdges testScreenEdges) ecm_mark_as_test(testScreenEdges) + +######################################################## +# Test X11 TimestampUpdate +######################################################## +add_executable(testX11TimestampUpdate test_x11_timestamp_update.cpp) +target_link_libraries(testX11TimestampUpdate + Qt5::Test + kwin +) +add_test(kwin-testX11TimestampUpdate testX11TimestampUpdate) +ecm_mark_as_test(testX11TimestampUpdate) diff --git a/autotests/test_x11_timestamp_update.cpp b/autotests/test_x11_timestamp_update.cpp new file mode 100644 index 0000000000..50ba151d38 --- /dev/null +++ b/autotests/test_x11_timestamp_update.cpp @@ -0,0 +1,123 @@ +/******************************************************************** +KWin - the KDE window manager +This file is part of the KDE project. + +Copyright (C) 2017 Martin Gräßlin + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*********************************************************************/ + +#include +#include + +#include "main.h" +#include "utils.h" + +namespace KWin +{ + +class X11TestApplication : public Application +{ + Q_OBJECT +public: + X11TestApplication(int &argc, char **argv); + virtual ~X11TestApplication(); + +protected: + void performStartup() override; + +}; + +X11TestApplication::X11TestApplication(int &argc, char **argv) + : Application(OperationModeX11, argc, argv) +{ + setX11Connection(QX11Info::connection()); + setX11RootWindow(QX11Info::appRootWindow()); +} + +X11TestApplication::~X11TestApplication() +{ +} + +void X11TestApplication::performStartup() +{ +} + +} + +class X11TimestampUpdateTest : public QObject +{ + Q_OBJECT +private Q_SLOTS: + void testGrabAfterServerTime(); + void testBeforeLastGrabTime(); +}; + +void X11TimestampUpdateTest::testGrabAfterServerTime() +{ + // this test tries to grab the X keyboard with a timestamp in future + // that should fail, but after updating the X11 timestamp, it should + // work again + KWin::updateXTime(); + QCOMPARE(KWin::grabXKeyboard(), true); + KWin::ungrabXKeyboard(); + + // now let's change the timestamp + KWin::kwinApp()->setX11Time(KWin::xTime() + 5 * 60 * 1000); + + // now grab keyboard should fail + QCOMPARE(KWin::grabXKeyboard(), false); + + // let's update timestamp, now it should work again + KWin::updateXTime(); + QCOMPARE(KWin::grabXKeyboard(), true); + KWin::ungrabXKeyboard(); +} + +void X11TimestampUpdateTest::testBeforeLastGrabTime() +{ + // this test tries to grab the X keyboard with a timestamp before the + // last grab time on the server. That should fail, but after updating the X11 + // timestamp it should work again + + // first set the grab timestamp + KWin::updateXTime(); + QCOMPARE(KWin::grabXKeyboard(), true); + KWin::ungrabXKeyboard(); + + // now go to past + const auto timestamp = KWin::xTime(); + KWin::kwinApp()->setX11Time(KWin::xTime() - 5 * 60 * 1000, KWin::Application::TimestampUpdate::Always); + QCOMPARE(KWin::xTime(), timestamp - 5 * 60 * 1000); + + // now grab keyboard should fail + QCOMPARE(KWin::grabXKeyboard(), false); + + // let's update timestamp, now it should work again + KWin::updateXTime(); + QVERIFY(KWin::xTime() >= timestamp); + QCOMPARE(KWin::grabXKeyboard(), true); + KWin::ungrabXKeyboard(); +} + +int main(int argc, char *argv[]) +{ + setenv("QT_QPA_PLATFORM", "xcb", true); + KWin::X11TestApplication app(argc, argv); + app.setAttribute(Qt::AA_Use96Dpi, true); + X11TimestampUpdateTest tc; + return QTest::qExec(&tc, argc, argv); +} + +#include "test_x11_timestamp_update.moc" diff --git a/main.h b/main.h index a7dd47dd60..6706c0faf5 100644 --- a/main.h +++ b/main.h @@ -104,8 +104,12 @@ public: xcb_timestamp_t x11Time() const { return m_x11Time; } - void setX11Time(xcb_timestamp_t timestamp) { - if (timestamp > m_x11Time) { + enum class TimestampUpdate { + OnlyIfLarger, + Always + }; + void setX11Time(xcb_timestamp_t timestamp, TimestampUpdate force = TimestampUpdate::OnlyIfLarger) { + if (timestamp > m_x11Time || force == TimestampUpdate::Always) { m_x11Time = timestamp; } } diff --git a/utils.cpp b/utils.cpp index ad45406e56..8d3f2ffbeb 100644 --- a/utils.cpp +++ b/utils.cpp @@ -84,7 +84,7 @@ void updateXTime() // NOTE: QX11Info::getTimestamp does not yet search the event queue as the old // solution did. This means there might be regressions currently. See the // documentation above on how it should be done properly. - kwinApp()->setX11Time(QX11Info::getTimestamp()); + kwinApp()->setX11Time(QX11Info::getTimestamp(), Application::TimestampUpdate::Always); } static int server_grab_count = 0; diff --git a/utils.h b/utils.h index e9fa912328..06980fd643 100644 --- a/utils.h +++ b/utils.h @@ -143,12 +143,12 @@ MaximizeMode operator^(MaximizeMode m1, MaximizeMode m2) template using ScopedCPointer = QScopedPointer; -void updateXTime(); +void KWIN_EXPORT updateXTime(); void grabXServer(); void ungrabXServer(); bool grabbedXServer(); -bool grabXKeyboard(xcb_window_t w = rootWindow()); -void ungrabXKeyboard(); +bool KWIN_EXPORT grabXKeyboard(xcb_window_t w = rootWindow()); +void KWIN_EXPORT ungrabXKeyboard(); /** * Small helper class which performs @link grabXServer in the ctor and