From 4d41e877c35d773e23016fbe0351587a188d8ae7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 Jul 2019 05:20:30 +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/scenes/opengl/opengl.json | 2 +- plugins/scenes/qpainter/qpainter.json | 2 +- plugins/scenes/xrender/xrender.json | 2 +- tabbox/kwinwindowswitcher.desktop | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/platforms/drm/drm.json b/plugins/platforms/drm/drm.json index 0ba133c143..e2c0ab022e 100644 --- a/plugins/platforms/drm/drm.json +++ b/plugins/platforms/drm/drm.json @@ -1,7 +1,7 @@ { "KPlugin": { "Description": "Render through drm node.", - "Description[ca@valencia]": "Renderitza mitjançant el node del DRM.", + "Description[ca@valencia]": "Renderitza mitjançant el node DRM.", "Description[ca]": "Renderitza mitjançant el node del DRM.", "Description[da]": "Render igennem drm-knude.", "Description[de]": "In DRM-Knoten rendern.", diff --git a/plugins/platforms/fbdev/fbdev.json b/plugins/platforms/fbdev/fbdev.json index cc74b36609..8dc156966e 100644 --- a/plugins/platforms/fbdev/fbdev.json +++ b/plugins/platforms/fbdev/fbdev.json @@ -1,7 +1,7 @@ { "KPlugin": { "Description": "Render to framebuffer.", - "Description[ca@valencia]": "Renderitza al «framebuffer».", + "Description[ca@valencia]": "Renderitza en el «framebuffer».", "Description[ca]": "Renderitza al «framebuffer».", "Description[da]": "Render til framebuffer.", "Description[de]": "In Framebuffer rendern.", diff --git a/plugins/platforms/hwcomposer/hwcomposer.json b/plugins/platforms/hwcomposer/hwcomposer.json index c5aa18f375..6dbeba1975 100644 --- a/plugins/platforms/hwcomposer/hwcomposer.json +++ b/plugins/platforms/hwcomposer/hwcomposer.json @@ -1,7 +1,7 @@ { "KPlugin": { "Description": "Render through hwcomposer through libhybris.", - "Description[ca@valencia]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».", + "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.", "Description[de]": "In hwcomposer mit libhybris rendern.", diff --git a/plugins/platforms/virtual/virtual.json b/plugins/platforms/virtual/virtual.json index 7a3898e4ac..83a8594e6d 100644 --- a/plugins/platforms/virtual/virtual.json +++ b/plugins/platforms/virtual/virtual.json @@ -1,7 +1,7 @@ { "KPlugin": { "Description": "Render to a virtual framebuffer.", - "Description[ca@valencia]": "Renderitza a un «framebuffer» virtual.", + "Description[ca@valencia]": "Renderitza en un «framebuffer» virtual.", "Description[ca]": "Renderitza a un «framebuffer» virtual.", "Description[da]": "Rendér til en virtuel framebuffer.", "Description[de]": "In virtuellen Framebuffer rendern.", diff --git a/plugins/platforms/wayland/wayland.json b/plugins/platforms/wayland/wayland.json index 19faafb355..e99b25dd8b 100644 --- a/plugins/platforms/wayland/wayland.json +++ b/plugins/platforms/wayland/wayland.json @@ -1,7 +1,7 @@ { "KPlugin": { "Description": "Render to a nested window on running Wayland compositor.", - "Description[ca@valencia]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.", + "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.", "Description[de]": "In ein eingebettetes Fenster auf dem laufenden Wayland-Kompositor rendern.", diff --git a/plugins/platforms/x11/standalone/x11.json b/plugins/platforms/x11/standalone/x11.json index 66158a713a..bfbdf63353 100644 --- a/plugins/platforms/x11/standalone/x11.json +++ b/plugins/platforms/x11/standalone/x11.json @@ -1,7 +1,7 @@ { "KPlugin": { "Description": "Platform plugin for standalone x11 in kwin_x11.", - "Description[ca@valencia]": "Connector de plataforma per una X11 autònoma en el kwin_x11.", + "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.", "Description[de]": "Plattform-Modul für ein selbstständiges X11 in kwin_x11.", diff --git a/plugins/scenes/opengl/opengl.json b/plugins/scenes/opengl/opengl.json index 6d4e472ac6..caf428df16 100644 --- a/plugins/scenes/opengl/opengl.json +++ b/plugins/scenes/opengl/opengl.json @@ -2,7 +2,7 @@ "CompositingType": 1, "KPlugin": { "Description": "KWin Compositor plugin rendering through OpenGL", - "Description[ca@valencia]": "Connector del Compositor del KWin que renderitza a través de l'OpenGL", + "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", "Description[de]": "KWin-Compositor-Modul zum Rendern mit OpenGL", diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index 8ab5f88ff3..1a8f0c45ea 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -2,7 +2,7 @@ "CompositingType": 4, "KPlugin": { "Description": "KWin Compositor plugin rendering through QPainter", - "Description[ca@valencia]": "Connector del Compositor del KWin que renderitza a través del QPainter", + "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", "Description[de]": "KWin-Compositor-Modul zum Rendern mit QPainter", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 59612d4f36..cf397a69b5 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -2,7 +2,7 @@ "CompositingType": 2, "KPlugin": { "Description": "KWin Compositor plugin rendering through XRender", - "Description[ca@valencia]": "Connector del Compositor del KWin que renderitza a través del XRender", + "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", "Description[de]": "KWin-Compositor-Modul zum Rendern mit XRender", diff --git a/tabbox/kwinwindowswitcher.desktop b/tabbox/kwinwindowswitcher.desktop index 4664d1ec2a..619ebf8a1d 100644 --- a/tabbox/kwinwindowswitcher.desktop +++ b/tabbox/kwinwindowswitcher.desktop @@ -5,7 +5,7 @@ X-KDE-ServiceType=KWin/WindowSwitcher Comment=KWin Window Switcher Layout Comment[bs]=KWin Prozor Switcher Izgled Comment[ca]=Disposició del commutador de finestres del KWin -Comment[ca@valencia]=Disposició del commutador de finestres del KWin +Comment[ca@valencia]=Disposició del commutador de finestres de KWin Comment[cs]=Rozvržení přepínače oken KWin Comment[da]=Layout til KWins vinduesskifter Comment[de]=Fensterwechsler-Layout