From 29915632dfda4e70b05048ac23cb68369021322d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 4 Jun 2020 05:12:36 +0200 Subject: [PATCH] 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 | 2 ++ plugins/platforms/fbdev/fbdev.json | 2 ++ plugins/platforms/hwcomposer/hwcomposer.json | 2 ++ plugins/platforms/virtual/virtual.json | 2 ++ plugins/platforms/wayland/wayland.json | 2 ++ plugins/platforms/x11/standalone/x11.json | 2 ++ plugins/platforms/x11/windowed/x11.json | 2 ++ plugins/scenes/opengl/opengl.json | 2 ++ plugins/scenes/qpainter/qpainter.json | 2 ++ plugins/scenes/xrender/xrender.json | 2 ++ 10 files changed, 20 insertions(+) diff --git a/plugins/platforms/drm/drm.json b/plugins/platforms/drm/drm.json index 9b4ea0c61e..d4eb0562c7 100644 --- a/plugins/platforms/drm/drm.json +++ b/plugins/platforms/drm/drm.json @@ -1,6 +1,7 @@ { "KPlugin": { "Description": "Render through drm node.", + "Description[az]": "DRM vasitəsi ilə formalaşdırmaq.", "Description[ca@valencia]": "Renderitza mitjançant el node DRM.", "Description[ca]": "Renderitza mitjançant el node del DRM.", "Description[da]": "Render igennem drm-knude.", @@ -38,6 +39,7 @@ "Description[zh_TW]": "透過 drm 節點成像。", "Id": "KWinWaylandDrmBackend", "Name": "drm", + "Name[az]": "drm", "Name[ca@valencia]": "DRM", "Name[ca]": "DRM", "Name[cs]": "drm", diff --git a/plugins/platforms/fbdev/fbdev.json b/plugins/platforms/fbdev/fbdev.json index d022f4b44a..972d19c0ca 100644 --- a/plugins/platforms/fbdev/fbdev.json +++ b/plugins/platforms/fbdev/fbdev.json @@ -1,6 +1,7 @@ { "KPlugin": { "Description": "Render to framebuffer.", + "Description[az]": "Çərçivə tamponunun formalaşdırılması.", "Description[ca@valencia]": "Renderitza en el «framebuffer».", "Description[ca]": "Renderitza al «framebuffer».", "Description[da]": "Render til framebuffer.", @@ -38,6 +39,7 @@ "Description[zh_TW]": "成像至 framebuffer。", "Id": "KWinWaylandFbdevBackend", "Name": "framebuffer", + "Name[az]": "çərçivə tamponu", "Name[ca@valencia]": "Framebuffer", "Name[ca]": "Framebuffer", "Name[cs]": "framebuffer", diff --git a/plugins/platforms/hwcomposer/hwcomposer.json b/plugins/platforms/hwcomposer/hwcomposer.json index 6dbeba1975..f0cba01d58 100644 --- a/plugins/platforms/hwcomposer/hwcomposer.json +++ b/plugins/platforms/hwcomposer/hwcomposer.json @@ -1,6 +1,7 @@ { "KPlugin": { "Description": "Render through hwcomposer through libhybris.", + "Description[az]": "Libhybris vasitəsi ilə hwcomposer içindən formalaşdırmaq.", "Description[ca@valencia]": "Renderitza mitjançant «hwcomposer» mitjançant «libhybris».", "Description[ca]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».", "Description[da]": "Rendér igennem hwcomposer igennem libhybris.", @@ -38,6 +39,7 @@ "Description[zh_TW]": "透過 libhybris 成像到 hwcomposer。", "Id": "KWinWaylandHwcomposerBackend", "Name": "hwcomposer", + "Name[az]": "hwcomposer", "Name[ca@valencia]": "hwcomposer", "Name[ca]": "hwcomposer", "Name[cs]": "hwcomposer", diff --git a/plugins/platforms/virtual/virtual.json b/plugins/platforms/virtual/virtual.json index e1f9e301ed..c790b46068 100644 --- a/plugins/platforms/virtual/virtual.json +++ b/plugins/platforms/virtual/virtual.json @@ -1,6 +1,7 @@ { "KPlugin": { "Description": "Render to a virtual framebuffer.", + "Description[az]": "Virtual çərçivə tamponunun formalaşdırılması.", "Description[ca@valencia]": "Renderitza en un «framebuffer» virtual.", "Description[ca]": "Renderitza a un «framebuffer» virtual.", "Description[da]": "Rendér til en virtuel framebuffer.", @@ -38,6 +39,7 @@ "Description[zh_TW]": "成像到虛擬影格緩衝區。", "Id": "KWinWaylandVirtualBackend", "Name": "virtual", + "Name[az]": "virtual", "Name[ca@valencia]": "Virtual", "Name[ca]": "Virtual", "Name[cs]": "virtuální", diff --git a/plugins/platforms/wayland/wayland.json b/plugins/platforms/wayland/wayland.json index d7c3b51f9e..25e3dfed0f 100644 --- a/plugins/platforms/wayland/wayland.json +++ b/plugins/platforms/wayland/wayland.json @@ -1,6 +1,7 @@ { "KPlugin": { "Description": "Render to a nested window on running Wayland compositor.", + "Description[az]": "Wayland birləşdiricisində iç-içə keçmiş pəncərələri formalaşdırmaq.", "Description[ca@valencia]": "Renderitza en una finestra imbricada en un compositor Wayland en execució.", "Description[ca]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.", "Description[da]": "Rendér til et indlejret vindue på kørende Wayland-compositor.", @@ -38,6 +39,7 @@ "Description[zh_TW]": "成像到執行中的 Wayland 的巢狀視窗。", "Id": "KWinWaylandWaylandBackend", "Name": "wayland", + "Name[az]": "wayland", "Name[ca@valencia]": "Wayland", "Name[ca]": "Wayland", "Name[cs]": "wayland", diff --git a/plugins/platforms/x11/standalone/x11.json b/plugins/platforms/x11/standalone/x11.json index bfbdf63353..122ea2a673 100644 --- a/plugins/platforms/x11/standalone/x11.json +++ b/plugins/platforms/x11/standalone/x11.json @@ -1,6 +1,7 @@ { "KPlugin": { "Description": "Platform plugin for standalone x11 in kwin_x11.", + "Description[az]": "Kwin_x11 -də müstəqil X11 üçün platforma əlavəsi.", "Description[ca@valencia]": "Connector de plataforma per a una X11 autònoma en kwin_x11.", "Description[ca]": "Connector de plataforma per una X11 autònoma en el kwin_x11.", "Description[da]": "Platform-plugin til standalone x11 i kwin_x11.", @@ -38,6 +39,7 @@ "Description[zh_TW]": "在 kwin_x11 中供 standalone 的 x11 使用的平臺外掛程式。", "Id": "KWinX11Platform", "Name": "x11-standalone", + "Name[az]": "x11-standalone", "Name[ca@valencia]": "X11-autònoma", "Name[ca]": "X11-autònoma", "Name[da]": "x11-standalone", diff --git a/plugins/platforms/x11/windowed/x11.json b/plugins/platforms/x11/windowed/x11.json index b66dce6681..15b9039601 100644 --- a/plugins/platforms/x11/windowed/x11.json +++ b/plugins/platforms/x11/windowed/x11.json @@ -1,6 +1,7 @@ { "KPlugin": { "Description": "Render to a nested window on X11 windowing system.", + "Description[az]": "X11 pəncərə sistemində iç-içə keçmiş pəncərənin formalaşdırılması.", "Description[ca@valencia]": "Renderitza a una finestra imbricada en el sistema de finestres X11.", "Description[ca]": "Renderitza a una finestra imbricada en el sistema de finestres X11.", "Description[da]": "Rendér til et indlejret vindue på X11-vinduessystemet.", @@ -38,6 +39,7 @@ "Description[zh_TW]": "成像到 X11 視窗系統的巢狀視窗。", "Id": "KWinWaylandX11Backend", "Name": "x11", + "Name[az]": "x11", "Name[ca@valencia]": "X11", "Name[ca]": "X11", "Name[cs]": "x11", diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index fa9c3eee0c..6d490d1cdd 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -2,6 +2,7 @@ "CompositingType": 1, "KPlugin": { "Description": "KWin Compositor plugin rendering through OpenGL", + "Description[az]": "OpenGL vasitəsi ilə qoşulmuş KWin birləşdirici modulunu formalaşdırmaq", "Description[ca@valencia]": "Connector del Compositor de KWin que renderitza a través d'OpenGL", "Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'OpenGL", "Description[da]": "KWin-compositorplugin som renderer via OpenGL", @@ -38,6 +39,7 @@ "Description[zh_TW]": "透過 OpenGL 繪製 KWin 合成器附加元件", "Id": "KWinSceneOpenGL", "Name": "SceneOpenGL", + "Name[az]": "SceneOpenGL", "Name[ca@valencia]": "SceneOpenGL", "Name[ca]": "SceneOpenGL", "Name[cs]": "SceneOpenGL", diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index 1d733cc67e..5f8607b043 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -2,6 +2,7 @@ "CompositingType": 4, "KPlugin": { "Description": "KWin Compositor plugin rendering through QPainter", + "Description[az]": "QPainter vasitəsi ilə KWin birləşdirici əlavəsini formalaşdırmaq", "Description[ca@valencia]": "Connector del Compositor de KWin que renderitza a través de QPainter", "Description[ca]": "Connector del Compositor del KWin que renderitza a través del QPainter", "Description[da]": "KWin-compositorplugin som renderer igennem QPainter", @@ -39,6 +40,7 @@ "Description[zh_TW]": "透過 QPainter 繪製 KWin 合成器附加元件", "Id": "KWinSceneQPainter", "Name": "SceneQPainter", + "Name[az]": "SceneQPainter", "Name[ca@valencia]": "SceneQPainter", "Name[ca]": "SceneQPainter", "Name[cs]": "SceneQPainter", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 7d25b7a5b7..3d94a9b6d6 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -2,6 +2,7 @@ "CompositingType": 2, "KPlugin": { "Description": "KWin Compositor plugin rendering through XRender", + "Description[az]": "XRender avsitəsi ilə KWin birləşdirici əlavəsini formalaşdırmaq", "Description[ca@valencia]": "Connector del Compositor de KWin que renderitza a través de XRender", "Description[ca]": "Connector del Compositor del KWin que renderitza a través del XRender", "Description[da]": "KWin-compositorplugin som renderer igennem XRender", @@ -39,6 +40,7 @@ "Description[zh_TW]": "透過 XRender 繪製 KWin 合成器附加元件", "Id": "KWinSceneXRender", "Name": "SceneXRender", + "Name[az]": "SceneXRender", "Name[ca@valencia]": "SceneXRender", "Name[ca]": "SceneXRender", "Name[cs]": "SceneXRender",