From 26a8892d9d90c9b7bdf4971d284afd640c986662 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 24 Oct 2018 08:15:36 +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" --- plugins/platforms/drm/drm.json | 27 +++++++++++++++++- plugins/platforms/fbdev/fbdev.json | 23 ++++++++++++++- plugins/platforms/hwcomposer/hwcomposer.json | 30 +++++++++++++++++++- plugins/platforms/virtual/virtual.json | 17 +++++++++++ plugins/platforms/wayland/wayland.json | 28 +++++++++++++++++- plugins/platforms/x11/standalone/x11.json | 17 ++++++++++- plugins/platforms/x11/windowed/x11.json | 28 +++++++++++++++++- plugins/scenes/opengl/opengl.json | 28 +++++++++++++++++- plugins/scenes/qpainter/qpainter.json | 29 ++++++++++++++++++- plugins/scenes/xrender/xrender.json | 29 ++++++++++++++++++- 10 files changed, 247 insertions(+), 9 deletions(-) diff --git a/plugins/platforms/drm/drm.json b/plugins/platforms/drm/drm.json index 6096eb4e79..66ce6204c8 100644 --- a/plugins/platforms/drm/drm.json +++ b/plugins/platforms/drm/drm.json @@ -6,6 +6,7 @@ "Description[da]": "Render igennem drm-knude.", "Description[de]": "In DRM-Knoten rendern.", "Description[el]": "Αποτύπωση μέσω λειτουργίας drm.", + "Description[en_GB]": "Render through drm node.", "Description[es]": "Renderizar a través del nodo DRM.", "Description[et]": "Renderdamine drm režiimis.", "Description[eu]": "Errendatu DRM-korapilunea erabiliz.", @@ -38,15 +39,39 @@ "Name": "drm", "Name[ca@valencia]": "DRM", "Name[ca]": "DRM", + "Name[cs]": "drm", + "Name[da]": "drm", "Name[de]": "DRM", + "Name[el]": "drm", + "Name[en_GB]": "drm", + "Name[es]": "drm", + "Name[et]": "drm", "Name[eu]": "DRM", + "Name[fi]": "drm", + "Name[fr]": "drm", + "Name[gl]": "drm", + "Name[hu]": "drm", + "Name[id]": "drm", + "Name[it]": "drm", + "Name[ko]": "drm", + "Name[nl]": "drm", + "Name[nn]": "drm", + "Name[pl]": "drm", "Name[pt]": "DRM", + "Name[pt_BR]": "drm", + "Name[ru]": "drm", + "Name[sk]": "drm", + "Name[sl]": "drm", "Name[sr@ijekavian]": "ДРМ", "Name[sr@ijekavianlatin]": "DRM", "Name[sr@latin]": "DRM", "Name[sr]": "ДРМ", "Name[sv]": "DRM", - "Name[x-test]": "xxdrmxx" + "Name[tr]": "drm", + "Name[uk]": "drm", + "Name[x-test]": "xxdrmxx", + "Name[zh_CN]": "drm", + "Name[zh_TW]": "drm" }, "input": false } diff --git a/plugins/platforms/fbdev/fbdev.json b/plugins/platforms/fbdev/fbdev.json index 9ce327aa2e..762cd02312 100644 --- a/plugins/platforms/fbdev/fbdev.json +++ b/plugins/platforms/fbdev/fbdev.json @@ -6,6 +6,7 @@ "Description[da]": "Render til framebuffer.", "Description[de]": "In Framebuffer rendern.", "Description[el]": "Αποτύπωση σε ενδιάμεση μνήμη πλαισίων.", + "Description[en_GB]": "Render to framebuffer.", "Description[es]": "Renderizar en el «framebuffer».", "Description[et]": "Renderdamine kaadripuhvris.", "Description[eu]": "Errendatu framebuffer batera.", @@ -38,11 +39,28 @@ "Name": "framebuffer", "Name[ca@valencia]": "Framebuffer", "Name[ca]": "Framebuffer", + "Name[cs]": "framebuffer", + "Name[da]": "framebuffer", "Name[de]": "Framebuffer", "Name[el]": "ενδιάμεση μνήμη πλαισίων", + "Name[en_GB]": "framebuffer", + "Name[es]": "framebuffer", + "Name[et]": "framebuffer", + "Name[eu]": "framebuffer", + "Name[fi]": "framebuffer", + "Name[fr]": "framebuffer", + "Name[gl]": "framebuffer", + "Name[hu]": "framebuffer", + "Name[id]": "framebuffer", + "Name[it]": "framebuffer", + "Name[ko]": "framebuffer", + "Name[nl]": "framebuffer", "Name[nn]": "biletbuffer", "Name[pl]": "bufor klatek", "Name[pt]": "'Framebuffer'", + "Name[pt_BR]": "framebuffer", + "Name[ru]": "framebuffer", + "Name[sk]": "framebuffer", "Name[sl]": "medpomnilnik sličic", "Name[sr@ijekavian]": "Кадробафер", "Name[sr@ijekavianlatin]": "Kadrobafer", @@ -50,7 +68,10 @@ "Name[sr]": "Кадробафер", "Name[sv]": "rambuffer", "Name[tr]": "çerçeve tampon", - "Name[x-test]": "xxframebufferxx" + "Name[uk]": "framebuffer", + "Name[x-test]": "xxframebufferxx", + "Name[zh_CN]": "framebuffer", + "Name[zh_TW]": "framebuffer" }, "input": false } diff --git a/plugins/platforms/hwcomposer/hwcomposer.json b/plugins/platforms/hwcomposer/hwcomposer.json index 9a60035bae..dcfa95f5a6 100644 --- a/plugins/platforms/hwcomposer/hwcomposer.json +++ b/plugins/platforms/hwcomposer/hwcomposer.json @@ -6,6 +6,7 @@ "Description[da]": "Rendér igennem hwcomposer igennem libhybris.", "Description[de]": "In hwcomposer mit libhybris rendern.", "Description[el]": "Αποτύπωση μέσω hwcomposer μέσω libhybris.", + "Description[en_GB]": "Render through hwcomposer through libhybris.", "Description[es]": "Renderizar a través «hwcomposer» mediante «libhybris».", "Description[et]": "Renderdamine hwcomposeris libhybrise abil.", "Description[eu]": "Errendatu hwcomposer libhybris bidez erabiliz.", @@ -36,14 +37,41 @@ "Description[zh_TW]": "透過 libhybris 成像到 hwcomposer。", "Id": "KWinWaylandHwcomposerBackend", "Name": "hwcomposer", + "Name[ca@valencia]": "hwcomposer", + "Name[ca]": "hwcomposer", + "Name[cs]": "hwcomposer", + "Name[da]": "hwcomposer", + "Name[de]": "hwcomposer", + "Name[el]": "hwcomposer", + "Name[en_GB]": "hwcomposer", + "Name[es]": "hwcomposer", + "Name[et]": "hwcomposer", + "Name[eu]": "hwcomposer", + "Name[fi]": "hwcomposer", + "Name[fr]": "hwcomposer", + "Name[gl]": "hwcomposer", + "Name[hu]": "hwcomposer", + "Name[id]": "hwcomposer", + "Name[it]": "hwcomposer", + "Name[ko]": "hwcomposer", + "Name[nl]": "hwcomposer", + "Name[nn]": "hwcomposer", "Name[pl]": "sprzętowy kompozytor", "Name[pt]": "Hwcomposer", + "Name[pt_BR]": "hwcomposer", + "Name[ru]": "hwcomposer", + "Name[sk]": "hwcomposer", + "Name[sl]": "hwcomposer", "Name[sr@ijekavian]": "ХВ‑композер", "Name[sr@ijekavianlatin]": "HWcomposer", "Name[sr@latin]": "HWcomposer", "Name[sr]": "ХВ‑композер", "Name[sv]": "hårdvarusammansättare", - "Name[x-test]": "xxhwcomposerxx" + "Name[tr]": "hwcomposer", + "Name[uk]": "hwcomposer", + "Name[x-test]": "xxhwcomposerxx", + "Name[zh_CN]": "hwcomposer", + "Name[zh_TW]": "hwcomposer" }, "input": false } diff --git a/plugins/platforms/virtual/virtual.json b/plugins/platforms/virtual/virtual.json index 905e3a304b..ca6a8aebdc 100644 --- a/plugins/platforms/virtual/virtual.json +++ b/plugins/platforms/virtual/virtual.json @@ -6,6 +6,7 @@ "Description[da]": "Rendér til en virtuel framebuffer.", "Description[de]": "In virtuellen Framebuffer rendern.", "Description[el]": "Αποτύπωση σε εικονική ενδιάμεση μνήμη πλαισίων.", + "Description[en_GB]": "Render to a virtual framebuffer.", "Description[es]": "Renderizar en un «framebuffer» virtual.", "Description[et]": "Renderdamine virtuaalses kaadripuhvris.", "Description[eu]": "Errendatu alegiazko framebuffer batera.", @@ -36,17 +37,31 @@ "Description[zh_TW]": "成像到虛擬影格緩衝區。", "Id": "KWinWaylandVirtualBackend", "Name": "virtual", + "Name[ast]": "virtual", "Name[ca@valencia]": "Virtual", "Name[ca]": "Virtual", "Name[cs]": "virtuální", "Name[da]": "virtuel", "Name[de]": "Virtuell", "Name[el]": "εικονικό", + "Name[en_GB]": "virtual", + "Name[es]": "virtual", + "Name[et]": "virtual", "Name[eu]": "alegiazkoa", + "Name[fi]": "virtual", + "Name[fr]": "virtual", + "Name[gl]": "virtual", "Name[hu]": "virtuális", + "Name[id]": "virtual", + "Name[it]": "virtual", + "Name[ko]": "virtual", "Name[nl]": "virtueel", "Name[nn]": "virtuell", "Name[pl]": "wirtualne", + "Name[pt]": "virtual", + "Name[pt_BR]": "virtual", + "Name[ru]": "virtual", + "Name[sk]": "virtual", "Name[sl]": "navidezno", "Name[sr@ijekavian]": "Виртуелно", "Name[sr@ijekavianlatin]": "Virtuelno", @@ -54,7 +69,9 @@ "Name[sr]": "Виртуелно", "Name[sv]": "virtuell", "Name[tr]": "sanal", + "Name[uk]": "virtual", "Name[x-test]": "xxvirtualxx", + "Name[zh_CN]": "virtual", "Name[zh_TW]": "虛擬" }, "input": true diff --git a/plugins/platforms/wayland/wayland.json b/plugins/platforms/wayland/wayland.json index fe3afcc68f..8fb1b3ce25 100644 --- a/plugins/platforms/wayland/wayland.json +++ b/plugins/platforms/wayland/wayland.json @@ -6,6 +6,7 @@ "Description[da]": "Rendér til et indlejret vindue på kørende Wayland-compositor.", "Description[de]": "In ein eingebettetes Fenster auf dem laufenden Wayland-Kompositor rendern.", "Description[el]": "Αποτύπωση σε εμφωλευμένο παράθυρο κατά την εκτέλεση του συνθέτη Wayland.", + "Description[en_GB]": "Render to a nested window on running Wayland compositor.", "Description[es]": "Renderizar en una ventana anidada en el compositor Wayland en ejecución.", "Description[et]": "Renderdamine töötava Waylandi komposiitori pesastatud aknas.", "Description[eu]": "Errendatu Wayland konposatzailean habiaratutako leiho batera.", @@ -38,14 +39,39 @@ "Name": "wayland", "Name[ca@valencia]": "Wayland", "Name[ca]": "Wayland", + "Name[cs]": "wayland", + "Name[da]": "wayland", "Name[de]": "Wayland", + "Name[el]": "wayland", + "Name[en_GB]": "wayland", + "Name[es]": "wayland", + "Name[et]": "wayland", + "Name[eu]": "wayland", + "Name[fi]": "wayland", + "Name[fr]": "wayland", + "Name[gl]": "wayland", + "Name[hu]": "wayland", + "Name[id]": "wayland", + "Name[it]": "wayland", + "Name[ko]": "wayland", + "Name[nl]": "wayland", + "Name[nn]": "wayland", + "Name[pl]": "wayland", "Name[pt]": "Wayland", + "Name[pt_BR]": "wayland", + "Name[ru]": "wayland", + "Name[sk]": "wayland", + "Name[sl]": "wayland", "Name[sr@ijekavian]": "Вејланд", "Name[sr@ijekavianlatin]": "Wayland", "Name[sr@latin]": "Wayland", "Name[sr]": "Вејланд", "Name[sv]": "Wayland", - "Name[x-test]": "xxwaylandxx" + "Name[tr]": "wayland", + "Name[uk]": "wayland", + "Name[x-test]": "xxwaylandxx", + "Name[zh_CN]": "wayland", + "Name[zh_TW]": "wayland" }, "input": true } diff --git a/plugins/platforms/x11/standalone/x11.json b/plugins/platforms/x11/standalone/x11.json index af674cf375..26cbc436ec 100644 --- a/plugins/platforms/x11/standalone/x11.json +++ b/plugins/platforms/x11/standalone/x11.json @@ -6,6 +6,7 @@ "Description[da]": "Platform-plugin til standalone x11 i kwin_x11.", "Description[de]": "Plattform-Modul für ein selbstständiges X11 in kwin_x11.", "Description[el]": "Πρόσθετο πλατφόρμας για αυτόνομο x11 και kwin_x11.", + "Description[en_GB]": "Platform plugin for standalone x11 in kwin_x11.", "Description[es]": "Complemento de Platform para X11 autónomo en kwin_x11.", "Description[et]": "Autonoomse x11 platvormi plugin kwin_x11-s", "Description[eu]": "Plataformaren plugina x11 autonomoarentzako, kwin_x11 barruan.", @@ -38,24 +39,38 @@ "Name": "x11-standalone", "Name[ca@valencia]": "X11-autònoma", "Name[ca]": "X11-autònoma", + "Name[da]": "x11-standalone", "Name[de]": "Selbständiges-x11", "Name[el]": "x11-αυτόνομος", + "Name[en_GB]": "x11-standalone", "Name[es]": "x11-autónomo", + "Name[et]": "x11-standalone", "Name[eu]": "x11-autonomoa", + "Name[fi]": "x11-standalone", + "Name[fr]": "x11-standalone", "Name[gl]": "x11-independente", + "Name[hu]": "x11-standalone", + "Name[id]": "x11-standalone", "Name[it]": "X11-alone", + "Name[ko]": "x11-standalone", "Name[nl]": "x11-alleenstaand", "Name[nn]": "X11 frittståande", "Name[pl]": "x11-wolnostojący", "Name[pt]": "x11-autónomo", + "Name[pt_BR]": "x11-standalone", + "Name[ru]": "x11-standalone", + "Name[sk]": "x11-standalone", "Name[sl]": "x11-samostojno", "Name[sr@ijekavian]": "Икс11 самостални", "Name[sr@ijekavianlatin]": "X11 samostalni", "Name[sr@latin]": "X11 samostalni", "Name[sr]": "Икс11 самостални", "Name[sv]": "Fristående X11", + "Name[tr]": "x11-standalone", "Name[uk]": "x11-окремий", - "Name[x-test]": "xxx11-standalonexx" + "Name[x-test]": "xxx11-standalonexx", + "Name[zh_CN]": "x11-standalone", + "Name[zh_TW]": "x11-standalone" }, "input": true } diff --git a/plugins/platforms/x11/windowed/x11.json b/plugins/platforms/x11/windowed/x11.json index 82464788fd..611f0e7e18 100644 --- a/plugins/platforms/x11/windowed/x11.json +++ b/plugins/platforms/x11/windowed/x11.json @@ -6,6 +6,7 @@ "Description[da]": "Rendér til et indlejret vindue på X11-vinduessystemet.", "Description[de]": "In ein eingebettetes Fenster auf X11-Fenstersystemen rendern.", "Description[el]": "Αποτύπωση σε εμφωλευμένο παράθυρο σε παραθυρικό σύστημα X11.", + "Description[en_GB]": "Render to a nested window on X11 windowing system.", "Description[es]": "Renderizar en una ventana anidada en el sistema de ventanas X11.", "Description[et]": "Pesastatud akna renderdamine X11 aknasüsteemis.", "Description[eu]": "Errendatu X11 leiho sistemaren leiho habiaratu batera.", @@ -38,15 +39,40 @@ "Name": "x11", "Name[ca@valencia]": "X11", "Name[ca]": "X11", + "Name[cs]": "x11", + "Name[da]": "x11", "Name[de]": "X11", + "Name[el]": "x11", + "Name[en_GB]": "x11", + "Name[es]": "x11", + "Name[et]": "x11", + "Name[eu]": "x11", + "Name[fi]": "x11", + "Name[fr]": "x11", + "Name[gl]": "x11", + "Name[hu]": "x11", "Name[ia]": "x", + "Name[id]": "x11", + "Name[it]": "x11", + "Name[ko]": "x11", + "Name[nl]": "x11", + "Name[nn]": "x11", + "Name[pl]": "x11", "Name[pt]": "X11", + "Name[pt_BR]": "x11", + "Name[ru]": "x11", + "Name[sk]": "x11", + "Name[sl]": "x11", "Name[sr@ijekavian]": "Икс11", "Name[sr@ijekavianlatin]": "X11", "Name[sr@latin]": "X11", "Name[sr]": "Икс11", "Name[sv]": "X11", - "Name[x-test]": "xxx11xx" + "Name[tr]": "x11", + "Name[uk]": "x11", + "Name[x-test]": "xxx11xx", + "Name[zh_CN]": "x11", + "Name[zh_TW]": "x11" }, "input": true } diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index e673d3f820..eca72bd637 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -6,6 +6,7 @@ "Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'OpenGL", "Description[da]": "KWin-compositorplugin som renderer via OpenGL", "Description[de]": "KWin-Compositor-Modul zum Rendern mit OpenGL", + "Description[en_GB]": "KWin Compositor plugin rendering through OpenGL", "Description[es]": "Complemento compositor de KWin renderizando mediante OpenGL", "Description[eu]": "Kwin konposatzailearen plugina OpenGL bidez errendatzen", "Description[fi]": "OpenGL:llä hahmontava KWin-koostajaliitännäinen", @@ -34,12 +35,37 @@ "Description[zh_TW]": "透過 OpenGL 繪製 KWin 合成器附加元件", "Id": "KWinSceneOpenGL", "Name": "SceneOpenGL", + "Name[ca@valencia]": "SceneOpenGL", + "Name[ca]": "SceneOpenGL", + "Name[cs]": "SceneOpenGL", + "Name[da]": "SceneOpenGL", + "Name[de]": "SceneOpenGL", + "Name[en_GB]": "SceneOpenGL", + "Name[es]": "SceneOpenGL", + "Name[eu]": "SceneOpenGL", + "Name[fi]": "SceneOpenGL", + "Name[fr]": "SceneOpenGL", + "Name[gl]": "SceneOpenGL", + "Name[id]": "SceneOpenGL", + "Name[it]": "SceneOpenGL", + "Name[ko]": "SceneOpenGL", + "Name[nl]": "SceneOpenGL", + "Name[nn]": "SceneOpenGL", "Name[pl]": "OpenGL sceny", + "Name[pt]": "SceneOpenGL", + "Name[pt_BR]": "SceneOpenGL", + "Name[ru]": "SceneOpenGL", + "Name[sk]": "SceneOpenGL", + "Name[sl]": "SceneOpenGL", "Name[sr@ijekavian]": "ОпенГЛ-сцена", "Name[sr@ijekavianlatin]": "OpenGL-scena", "Name[sr@latin]": "OpenGL-scena", "Name[sr]": "ОпенГЛ-сцена", "Name[sv]": "Scen OpenGL", - "Name[x-test]": "xxSceneOpenGLxx" + "Name[tr]": "SceneOpenGL", + "Name[uk]": "SceneOpenGL", + "Name[x-test]": "xxSceneOpenGLxx", + "Name[zh_CN]": "SceneOpenGL", + "Name[zh_TW]": "SceneOpenGL" } } diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index 459ddb27e0..0d38a4372d 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -7,6 +7,7 @@ "Description[da]": "KWin-compositorplugin som renderer igennem QPainter", "Description[de]": "KWin-Compositor-Modul zum Rendern mit QPainter", "Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω QPainter", + "Description[en_GB]": "KWin Compositor plugin rendering through QPainter", "Description[es]": "Complemento compositor de KWin renderizando mediante QPainter", "Description[eu]": "Kwin konposatzailearen plugina QPainter bidez errendatzen", "Description[fi]": "QPainterillä hahmontava KWin-koostajaliitännäinen", @@ -35,12 +36,38 @@ "Description[zh_TW]": "透過 QPainter 繪製 KWin 合成器附加元件", "Id": "KWinSceneQPainter", "Name": "SceneQPainter", + "Name[ca@valencia]": "SceneQPainter", + "Name[ca]": "SceneQPainter", + "Name[cs]": "SceneQPainter", + "Name[da]": "SceneQPainter", + "Name[de]": "SceneQPainter", + "Name[el]": "SceneQPainter", + "Name[en_GB]": "SceneQPainter", + "Name[es]": "SceneQPainter", + "Name[eu]": "SceneQPainter", + "Name[fi]": "SceneQPainter", + "Name[fr]": "SceneQPainter", + "Name[gl]": "SceneQPainter", + "Name[id]": "SceneQPainter", + "Name[it]": "SceneQPainter", + "Name[ko]": "SceneQPainter", + "Name[nl]": "SceneQPainter", + "Name[nn]": "SceneQPainter", "Name[pl]": "QPainter sceny", + "Name[pt]": "SceneQPainter", + "Name[pt_BR]": "SceneQPainter", + "Name[ru]": "SceneQPainter", + "Name[sk]": "SceneQPainter", + "Name[sl]": "SceneQPainter", "Name[sr@ijekavian]": "QPainter-сцена", "Name[sr@ijekavianlatin]": "QPainter-scena", "Name[sr@latin]": "QPainter-scena", "Name[sr]": "QPainter-сцена", "Name[sv]": "Scen QPainter", - "Name[x-test]": "xxSceneQPainterxx" + "Name[tr]": "SceneQPainter", + "Name[uk]": "SceneQPainter", + "Name[x-test]": "xxSceneQPainterxx", + "Name[zh_CN]": "SceneQPainter", + "Name[zh_TW]": "SceneQPainter" } } diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index ada3b3bd70..d7f339d195 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -7,6 +7,7 @@ "Description[da]": "KWin-compositorplugin som renderer igennem XRender", "Description[de]": "KWin-Compositor-Modul zum Rendern mit XRender", "Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω XRender", + "Description[en_GB]": "KWin Compositor plugin rendering through XRender", "Description[es]": "Complemento compositor de KWin renderizando mediante XRender", "Description[eu]": "Kwin konposatzailearen plugina XRender bidez errendatzen", "Description[fi]": "XRenderillä hahmontava KWin-koostajaliitännäinen", @@ -35,12 +36,38 @@ "Description[zh_TW]": "透過 XRender 繪製 KWin 合成器附加元件", "Id": "KWinSceneXRender", "Name": "SceneXRender", + "Name[ca@valencia]": "SceneXRender", + "Name[ca]": "SceneXRender", + "Name[cs]": "SceneXRender", + "Name[da]": "SceneXRender", + "Name[de]": "SceneXRender", + "Name[el]": "SceneXRender", + "Name[en_GB]": "SceneXRender", + "Name[es]": "SceneXRender", + "Name[eu]": "SceneXRender", + "Name[fi]": "SceneXRender", + "Name[fr]": "SceneXRender", + "Name[gl]": "SceneXRender", + "Name[id]": "SceneXRender", + "Name[it]": "SceneXRender", + "Name[ko]": "SceneXRender", + "Name[nl]": "SceneXRender", + "Name[nn]": "SceneXRender", "Name[pl]": "XRender sceny", + "Name[pt]": "SceneXRender", + "Name[pt_BR]": "SceneXRender", + "Name[ru]": "SceneXRender", + "Name[sk]": "SceneXRender", + "Name[sl]": "SceneXRender", "Name[sr@ijekavian]": "Икс‑рендер-сцена", "Name[sr@ijekavianlatin]": "XRender-scena", "Name[sr@latin]": "XRender-scena", "Name[sr]": "Икс‑рендер-сцена", "Name[sv]": "Scen XRender", - "Name[x-test]": "xxSceneXRenderxx" + "Name[tr]": "SceneXRender", + "Name[uk]": "SceneXRender", + "Name[x-test]": "xxSceneXRenderxx", + "Name[zh_CN]": "SceneXRender", + "Name[zh_TW]": "SceneXRender" } } From 51b0dfbf17e7884dc5069c11f876aef2e3e452e6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 25 Oct 2018 07:53:41 +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/kwincompositing/kcmkwineffects.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop index ab379fd904..c42f2869b6 100644 --- a/kcmkwin/kwincompositing/kcmkwineffects.desktop +++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop @@ -107,6 +107,7 @@ Comment[zh_TW]=桌面效果 X-KDE-Keywords=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,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 effect,screenshot effect,sheet effect,slide effect,sliding popups 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,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,present windows effect,resize window effect,background contrast effect X-KDE-Keywords[ca]=kwin,finestra,gestor,efecte,efectes 3D,efectes 2D,efectes gràfics,efectes d'escriptori,animacions,animacions diverses,efectes en la gestió de les finestres,efecte en el canvi de finestra,efecte en el canvi d'escriptori,animacions,animacions en l'escriptori,controladors,configuració dels controladors,renderització,render,efecte d'inversió,efecte d'aparença de vidre,efecte de lupa,efecte ajudant del desplaçament,efecte de seguiment del ratolí,efecte de zoom,efecte de difuminat,efecte d'esvaïment,efecte d'esvaïment de l'escriptori,efecte de trencament,efecte de lliscament,efecte de ressaltat de la finestra,efecte en l'inici de la sessió,efecte en sortir de la sessió,efecte de làmpada màgica,efecte d'animació de la minimització,efecte de marca del ratolí,efecte d'apropament,efecte de captura de pantalla,efecte de full,efecte de diapositiva,efecte de missatges emergents lliscants,efecte de miniatures laterals,translucidesa,efecte de translucidesa,transparència,efecte de geometria de la finestra,efecte de finestres sacsejades,efecte de confirmació d'engegada,efecte de diàleg principal,efecte d'enfosquiment en estar inactiu,efecte d'enfosquiment de la pantalla,efecte de diapositiva prèvia,decoració,efecte per a mostrar els FPS,efecte de mostrar el pintat,efecte de canvi de coberta,efecte de cub de l'escriptori,efecte d'animació del cub de l'escriptori,efecte de quadrícula de l'escriptori,efecte de canvi en roda,efecte de presentació de les finestres,efecte de redimensionat de la finestra,efecte de contrast del fons X-KDE-Keywords[ca@valencia]=kwin,finestra,gestor,efecte,efectes 3D,efectes 2D,efectes gràfics,efectes d'escriptori,animacions,animacions diverses,efectes en la gestió de les finestres,efecte en el canvi de finestra,efecte en el canvi d'escriptori,animacions,animacions en l'escriptori,controladors,configuració dels controladors,renderització,render,efecte d'inversió,efecte d'aparença de vidre,efecte de lupa,efecte ajudant del desplaçament,efecte de seguiment del ratolí,efecte de zoom,efecte de difuminat,efecte d'esvaïment,efecte d'esvaïment de l'escriptori,efecte de trencament,efecte de lliscament,efecte de ressaltat de la finestra,efecte en l'inici de la sessió,efecte en eixir de la sessió,efecte de làmpada màgica,efecte d'animació de la minimització,efecte de marca del ratolí,efecte d'apropament,efecte de captura de pantalla,efecte de full,efecte de diapositiva,efecte de missatges emergents lliscants,efecte de miniatures laterals,translucidesa,efecte de translucidesa,transparència,efecte de geometria de la finestra,efecte de finestres sacsejades,efecte de confirmació d'engegada,efecte de diàleg principal,efecte d'enfosquiment en estar inactiu,efecte d'enfosquiment de la pantalla,efecte de diapositiva prèvia,decoració,efecte per a mostrar els FPS,efecte de mostrar el pintat,efecte de canvi de coberta,efecte de cub de l'escriptori,efecte d'animació del cub de l'escriptori,efecte de quadrícula de l'escriptori,efecte de canvi en roda,efecte de presentació de les finestres,efecte de redimensionat de la finestra,efecte de contrast del fons +X-KDE-Keywords[de]=KWin,Fenster,Verwaltung,Effekt,2D-Effekte,3D-Effekte,Grafische Effekte,Desktopeffekte,Arbeitsflächeneffekte,Animation,Fensterverwaltungs-Effekte,Fensterwechsel-Effekte,Desktop-Wechsel,Arbeitsflächenwechsel,Desktop-Animation,Arbeitsflächen-Animation,Treiber,Treibereinstellung,Rendering,Rendern,Invertierungseffekt,Bildschirmlupeneffekt,Vergrößerungseffekt,Einrasteffekt,Maus folgen,Zoomeffekt,Dashboard,Überblendungseffekt,Gleiteneffekt,Fensterhervorhebungs-Effekt,Anmeldungseffekt,Abmeldungseffekt,Animierter Minimierungseffekt,Mausmarkierungseffekt,Skalierungseffekt,Bildschirmeffekt,Blatteffekt,Folieneffekt,Vorschaueffekt,Durchsichtigkeit,Durchsichtigkeitseffekt,Fenstergeometrieffekt,Effekt Wabernde Fenster,Programmstartanzeigeneffekt,Inaktiveffekt,Bildschirmabdunkelungseffekt,FPS-Effekt,Zeichnungsbereicheffekt, 3D-Fenstergalerieeffekt,Desktopgittereffekt,3D-Fensterstapelumschalteffekt,Fensteranzeigeeffekt,Fenstergrößenänderungseffekt,Hintergrundkonstrasteffekt X-KDE-Keywords[es]=kwin,ventana,gestor,efecto,efectos 3D,efectos 2D,efectos gráficos,efectos del escritorio,animaciones,animaciones diversas,efectos de la gestión de ventanas,efecto de cambio de ventana,efecto de cambio de escritorio,animaciones,animaciones del escritorio,controladores,preferencias del controlador,renderización,renderizar,efecto de inversión,efecto de espejo,efecto de lupa,efecto auxiliar de instantánea,efecto de seguimiento del ratón,efecto de ampliación,efecto borroso,efecto de desvanecimiento,efecto de desvanecimiento del escritorio,efecto de romper en pedazos,efecto de planeo,efecto de resaltar ventanas,efecto de inicio de sesión,efecto de final de sesión,efecto de lámpara mágica,efecto de animación al minimizar,efecto de marcas del ratón,efecto de escalado,efecto de captura de pantalla,efecto de hoja,efecto de deslizamiento,efecto de ventanas emergentes deslizantes,efecto de miniaturas laterales,transparencia,efecto de transparencia,efecto de geometría de las ventanas, efecto de ventanas gelatinosas,efecto de notificación de inicio,efecto de padre de la ventana,efecto de oscurecer inactiva,efecto de oscurecer la pantalla,efecto atrás,efectos atractivos,efecto de mostrar FPS,efecto de mostrar pintura,efecto de selección de ventana en modo carátula,efecto de cubo del escritorio,efecto de animación del cubo del escritorio,efecto de rejilla del escritorio,efecto de selección de ventana en modo cascada,efecto de presentación de ventanas,efecto de cambiar tamaño de las ventanas,efecto de contraste del fondo X-KDE-Keywords[eu]=kwin,leihoa,kudeatzailea,efektua,3D efektuak,2D efektuak,efektu grafikoak,mahaigaineko efektuak,animazioak,hainbat animazio,leiho kudeaketaren efektuak,leiho-aldatze efektuak,mahaigaina aldatzeko efektua,animazioak,mahaigaineko animazioak,gidariak,gidarien ezarpenak,errendatze,errendatu,alderantzikatu efektua,pantaila-lupa efektua,lupa efektua,atxikitze laguntzaile efektua,jarraitu saguari efektua,zoom efektua,lausotze efektua,desagertze efektua,mahaigain-desagertze efektua,puskatze efektua,irristatze efektua,leiho-nabarmentze efektua,saio-haste efektua,saio-ixte efektua,lanpara magiko efektua,minimizatze-animazio efektua, sagu-marka efektua,eskalatze efektua,pantaila-argazki efektua,orrialde efektua,diapositiba efektua,diapositiba gainerakor efektua,koadro txikiak alboan efektua,zeharrargitasuna,zeharrargitasun efektua,gardentasuna,leiho-geometria efektua,leiho dardartsuak efektua,abio berrelikadura efektua,guraso elkarrizketa-koadro efektua,itzaldu ez-aktiboa efektua,itzaldu pantaila efektua,diapositibak atzera efektua,ikusteko atsegina,atsegina,FPS erakuste efektua,erakutsi pintura efektua,azal aldaketa efektua,kubo-mahaigain efektua,kubo-mahaigain animazio efektua,mahaigain-sareta efektua,perspektiban pilatutako aldatze efektua,aurkeztu leihoak efektua,leihoaren neurri-aldatze efektua,atzealdeko kontraste efektua X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, effet, effets 3D, effets 2D, effets graphiques, effets de bureau, animations, animations variés, effets de gestion des fenêtres, effets de changement de fenêtre, effets de changement de bureau, animations, animation du bureau, pilotes, paramètres du pilote, rendu, rendre, effet d'inversion, effet de verre, effet de loupe, effet d'aide au positionnement, effet de repérage de la souris, effet de zoom, effet de flou, effet de fondu, effet de fondu du bureau, effet d'effondrement, effet de glissement, effet de mise en valeur de la fenêtre, effet de connexion, effet de déconnexion, effet de lampe magique, effet de minimisation de l'application, effet de marque de la souris, effet de gradation, effet de capture d'écran, effet de feuille, effet de glisse, effet d'annotations glissantes, effet vignettes sur le coté, translucidité, effet de translucidité, transparence, effet de géométrie de la fenêtre, effet de fenêtre en gélatine, effet du témoin de démarrage, effet de dialogue parent, effet d'obscurcissement de fenêtre inactive, effet d'obscurcissement du bureau, effet de glissement en arrière, confort visuel, beauté, effet d'affichage du FPS, effet d'affichage des zones peintes, effet de défilement circulaire, effet de bureaux en cube, effet d'animation de cube de bureaux, effet de bureaux en grille, effet d'empilement en perspective, effet de présentation des fenêtres, effet de redimensionnement des fenêtres, effet de contraste du bureau From 91b538105ad312ed035fb7a0e3d798e88a2ae6f7 Mon Sep 17 00:00:00 2001 From: Erik Kurzinger Date: Fri, 26 Oct 2018 11:18:39 +0300 Subject: [PATCH 3/3] [effects/desktopgrid] Specify screen projection matrix when drawing moving window Summary: Currently, when the user is moving a window in the desktop grid it is drawn from the paintScreen function to ensure it appears above all other windows. However, when drawing the window, the screenProjectionMatrix for the WindowPaintData structure is never specified. Because of this, the window will not be visible if OpenGL compositing along with Lanczos scaling are in use since its coordinates will never be projected into screen-space (unless the window is maximized, in which case the scaling code is bypassed). BUG: 361371 BUG: 364509 FIXED-IN: 5.14.3 Test Plan: Ensure OpenGL compositing is enabled and the scaling method is set to "Accurate" on hardware supporting this option. Additionally, ensure the desktop grid effect is active and is configured to use Present Windows. Open a window and ensure is it not maximized. Click on the window and drag it around - its contents should remain visible the entire time and follow the mouse. Reviewers: #kwin, zzag, graesslin, davidedmundson Reviewed By: #kwin, zzag, davidedmundson Subscribers: broulik, davidedmundson, kwin, #kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D16430 --- effects/desktopgrid/desktopgrid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp index 41f7eb6da5..c735f793aa 100644 --- a/effects/desktopgrid/desktopgrid.cpp +++ b/effects/desktopgrid/desktopgrid.cpp @@ -202,7 +202,7 @@ void DesktopGridEffect::paintScreen(int mask, QRegion region, ScreenPaintData& d // the moving window has to be painted on top of all desktops QPoint diff = cursorPos() - m_windowMoveStartPoint; QRect geo = m_windowMoveGeometry.translated(diff); - WindowPaintData d(windowMove); + WindowPaintData d(windowMove, data.projectionMatrix()); d *= QVector2D((qreal)geo.width() / (qreal)windowMove->width(), (qreal)geo.height() / (qreal)windowMove->height()); d += QPoint(geo.left() - windowMove->x(), geo.top() - windowMove->y()); effects->drawWindow(windowMove, PAINT_WINDOW_TRANSFORMED | PAINT_WINDOW_LANCZOS, infiniteRegion(), d);