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"
This commit is contained in:
l10n daemon script 2015-10-05 10:23:58 +00:00
parent 43c35c1c6c
commit 83cc5f5842
6 changed files with 52 additions and 0 deletions

View file

@ -2,21 +2,29 @@
"KPlugin": {
"Description": "Render through drm node.",
"Description[ca]": "Renderitza mitjançant el node del DRM.",
"Description[en_GB]": "Render through drm node.",
"Description[es]": "Renderizar a través del nodo DRM.",
"Description[nl]": "Via drm-node renderen.",
"Description[nn]": "Teikn opp gjennom drm-node.",
"Description[pl]": "Wyświetlaj przez węzeł drm.",
"Description[pt]": "Desenhar através de um nó DRM.",
"Description[pt_BR]": "Renderizar pelo nó de DRM.",
"Description[sk]": "Renderovať cez režim drm.",
"Description[sv]": "Återge via DRM-nod.",
"Description[uk]": "Обробляти через вузол DRM.",
"Description[x-test]": "xxRender through drm node.xx",
"Id": "KWinWaylandDrmBackend",
"Name": "drm",
"Name[ca]": "DRM",
"Name[en_GB]": "drm",
"Name[es]": "drm",
"Name[nl]": "drm",
"Name[nn]": "drm",
"Name[pl]": "drm",
"Name[pt]": "DRM",
"Name[pt_BR]": "drm",
"Name[sk]": "drm",
"Name[sv]": "DRM",
"Name[uk]": "drm",
"Name[x-test]": "xxdrmxx"
},

View file

@ -2,21 +2,29 @@
"KPlugin": {
"Description": "Render to framebuffer.",
"Description[ca]": "Renderitza al «framebuffer».",
"Description[en_GB]": "Render to framebuffer.",
"Description[es]": "Renderizar en el «framebuffer».",
"Description[nl]": "Naar framebuffer renderen.",
"Description[nn]": "Teikn opp til biletbuffer.",
"Description[pl]": "Wyświetlaj w buforze klatek.",
"Description[pt]": "Desenhar no 'framebuffer'.",
"Description[pt_BR]": "Renderizar no framebuffer.",
"Description[sk]": "Renderovať do framebuffera.",
"Description[sv]": "Återge i rambuffer.",
"Description[uk]": "Обробляти до буфера кадрів.",
"Description[x-test]": "xxRender to framebuffer.xx",
"Id": "KWinWaylandFbdevBackend",
"Name": "framebuffer",
"Name[ca]": "Framebuffer",
"Name[en_GB]": "framebuffer",
"Name[es]": "framebuffer",
"Name[nl]": "framebuffer",
"Name[nn]": "biletbuffer",
"Name[pl]": "bufor klatek",
"Name[pt]": "'Framebuffer'",
"Name[pt_BR]": "framebuffer",
"Name[sk]": "framebuffer",
"Name[sv]": "rambuffer",
"Name[uk]": "framebuffer",
"Name[x-test]": "xxframebufferxx"
},

View file

@ -2,21 +2,29 @@
"KPlugin": {
"Description": "Render through hwcomposer through libhybris.",
"Description[ca]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».",
"Description[en_GB]": "Render through hwcomposer through libhybris.",
"Description[es]": "Renderizar a través «hwcomposer» mediante «libhybris».",
"Description[nl]": "Render via hwcomposer via libhybris.",
"Description[nn]": "Teikn opp via hwcomposer gjennom libhybris.",
"Description[pl]": "Wyświetlaj przez sprzętowy kompozytor przez libhybris.",
"Description[pt]": "Desenhar através do Hwcomposer, usando a libhybris.",
"Description[pt_BR]": "Renderizar através do hwcomposer e libhybris.",
"Description[sk]": "Renderovať cez hwcomposer cez libhybris.",
"Description[sv]": "Återge via på hårdvarusammansättare via libhybris.",
"Description[uk]": "Обробляти за допомогою апаратного засобу композиції через libhybris.",
"Description[x-test]": "xxRender through hwcomposer through libhybris.xx",
"Id": "KWinWaylandHwcomposerBackend",
"Name": "hwcomposer",
"Name[ca]": "hwcomposer",
"Name[en_GB]": "hwcomposer",
"Name[es]": "hwcomposer",
"Name[nl]": "hwcomposer",
"Name[nn]": "hwcomposer",
"Name[pl]": "sprzętowy kompozytor",
"Name[pt]": "Hwcomposer",
"Name[pt_BR]": "hwcomposer",
"Name[sk]": "hwcomposer",
"Name[sv]": "hårdvarusammansättare",
"Name[uk]": "hwcomposer",
"Name[x-test]": "xxhwcomposerxx"
},

View file

@ -2,18 +2,30 @@
"KPlugin": {
"Description": "Render to a virtual framebuffer.",
"Description[ca]": "Renderitza a un «framebuffer» virtual.",
"Description[en_GB]": "Render to a virtual framebuffer.",
"Description[es]": "Renderizar en un «framebuffer» virtual.",
"Description[nl]": "Naar een virtuele framebuffer renderen.",
"Description[nn]": "Teikn opp til virtuell biletbuffer.",
"Description[pl]": "Wyświetlaj w wirtualnym buforze klatek.",
"Description[pt]": "Desenhar num 'framebuffer' virtual.",
"Description[pt_BR]": "Renderizar no framebuffer virtual.",
"Description[sk]": "Renderovať na virtuálny framebuffer.",
"Description[sv]": "Återge i en virtuell rambuffer.",
"Description[uk]": "Обробляти до віртуального буфера кадрів.",
"Description[x-test]": "xxRender to a virtual framebuffer.xx",
"Id": "KWinWaylandVirtualBackend",
"Name": "virtual",
"Name[ca]": "Virtual",
"Name[en_GB]": "virtual",
"Name[es]": "virtual",
"Name[nl]": "virtueel",
"Name[nn]": "virtuell",
"Name[pl]": "wirtualne",
"Name[pt]": "virtual",
"Name[pt_BR]": "virtual",
"Name[sk]": "virtual",
"Name[sv]": "virtuell",
"Name[uk]": "virtual",
"Name[x-test]": "xxvirtualxx"
},
"input": true

View file

@ -2,21 +2,29 @@
"KPlugin": {
"Description": "Render to a nested window on running Wayland compositor.",
"Description[ca]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.",
"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[nl]": "Render naar een genest venster in een werkende Wayland-compositor.",
"Description[nn]": "Teikn opp til innebygd vindauge på køyrande Wayland-samansetjar.",
"Description[pl]": "Wyświetlaj w zagnieżdżonym oknie w kompozytorze Wayland.",
"Description[pt]": "Desenhar numa janela encadeada no compositor de Wayland em execução.",
"Description[pt_BR]": "Renderizar uma janela encadeada no compositor Wayland em execução.",
"Description[sk]": "Renderovať na vnorené okno na bežiaci kompozítor Wayland.",
"Description[sv]": "Återge till ett nästlat fönster på Wayland-sammansättare som kör.",
"Description[uk]": "Обробляти у вкладене вікно запущеного засобу композиції Wayland.",
"Description[x-test]": "xxRender to a nested window on running Wayland compositor.xx",
"Id": "KWinWaylandWaylandBackend",
"Name": "wayland",
"Name[ca]": "Wayland",
"Name[en_GB]": "wayland",
"Name[es]": "wayland",
"Name[nl]": "wayland",
"Name[nn]": "wayland",
"Name[pl]": "wayland",
"Name[pt]": "Wayland",
"Name[pt_BR]": "wayland",
"Name[sk]": "wayland",
"Name[sv]": "Wayland",
"Name[uk]": "wayland",
"Name[x-test]": "xxwaylandxx"
},

View file

@ -2,21 +2,29 @@
"KPlugin": {
"Description": "Render to a nested window on X11 windowing system.",
"Description[ca]": "Renderitza a una finestra imbricada en el sistema de finestres 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[nl]": "Render naar een genest venster in het X11 windowingsysteem.",
"Description[nn]": "Teikn opp til innebygd vindauge på køyrande X11-system.",
"Description[pl]": "Wyświetlaj w zagnieżdżonym oknie w systemie okien X11.",
"Description[pt]": "Desenhar numa janela encadeada no sistema de janelas X11.",
"Description[pt_BR]": "Renderizar uma janela encadeada no sistema de janelas X11.",
"Description[sk]": "Renderovať na vnorené okno na systém okien X11.",
"Description[sv]": "Återge till ett nästlat fönster på X11-fönstersystem.",
"Description[uk]": "Обробляти у вкладене вікно системи керування вікнами X11.",
"Description[x-test]": "xxRender to a nested window on X11 windowing system.xx",
"Id": "KWinWaylandX11Backend",
"Name": "x11",
"Name[ca]": "X11",
"Name[en_GB]": "x11",
"Name[es]": "x11",
"Name[nl]": "x11",
"Name[nn]": "x11",
"Name[pl]": "x11",
"Name[pt]": "X11",
"Name[pt_BR]": "x11",
"Name[sk]": "x11",
"Name[sv]": "X11",
"Name[uk]": "x11",
"Name[x-test]": "xxx11xx"
},