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"icc-effect-5.14.5
parent
bcc36b87fb
commit
a10ed44aa0
|
@ -4,7 +4,6 @@
|
|||
"Description[ca@valencia]": "Renderitza mitjançant el node del DRM.",
|
||||
"Description[ca]": "Renderitza mitjançant el node del DRM.",
|
||||
"Description[de]": "In DRM-Knoten rendern.",
|
||||
"Description[en_GB]": "Render through drm node.",
|
||||
"Description[es]": "Renderizar a través del nodo DRM.",
|
||||
"Description[fi]": "Renderöi DRM-noden läpi.",
|
||||
"Description[fr]": "Rendre par le biais d'un nœud de rendu « DRM ».",
|
||||
|
@ -30,30 +29,14 @@
|
|||
"Name": "drm",
|
||||
"Name[ca@valencia]": "DRM",
|
||||
"Name[ca]": "DRM",
|
||||
"Name[cs]": "drm",
|
||||
"Name[de]": "DRM",
|
||||
"Name[en_GB]": "drm",
|
||||
"Name[es]": "drm",
|
||||
"Name[fi]": "drm",
|
||||
"Name[fr]": "drm",
|
||||
"Name[gl]": "drm",
|
||||
"Name[it]": "drm",
|
||||
"Name[ko]": "drm",
|
||||
"Name[nl]": "drm",
|
||||
"Name[nn]": "drm",
|
||||
"Name[pl]": "drm",
|
||||
"Name[pt]": "DRM",
|
||||
"Name[pt_BR]": "drm",
|
||||
"Name[sk]": "drm",
|
||||
"Name[sl]": "drm",
|
||||
"Name[sr@ijekavian]": "ДРМ",
|
||||
"Name[sr@ijekavianlatin]": "DRM",
|
||||
"Name[sr@latin]": "DRM",
|
||||
"Name[sr]": "ДРМ",
|
||||
"Name[sv]": "DRM",
|
||||
"Name[uk]": "drm",
|
||||
"Name[x-test]": "xxdrmxx",
|
||||
"Name[zh_CN]": "drm"
|
||||
"Name[x-test]": "xxdrmxx"
|
||||
},
|
||||
"input": false
|
||||
}
|
|
@ -4,7 +4,6 @@
|
|||
"Description[ca@valencia]": "Renderitza al «framebuffer».",
|
||||
"Description[ca]": "Renderitza al «framebuffer».",
|
||||
"Description[de]": "In Framebuffer rendern.",
|
||||
"Description[en_GB]": "Render to framebuffer.",
|
||||
"Description[es]": "Renderizar en el «framebuffer».",
|
||||
"Description[fi]": "Renderöi framebufferiin.",
|
||||
"Description[fr]": "Rendre sur le « framebuffer ».",
|
||||
|
@ -30,30 +29,17 @@
|
|||
"Name": "framebuffer",
|
||||
"Name[ca@valencia]": "Framebuffer",
|
||||
"Name[ca]": "Framebuffer",
|
||||
"Name[cs]": "framebuffer",
|
||||
"Name[de]": "Framebuffer",
|
||||
"Name[en_GB]": "framebuffer",
|
||||
"Name[es]": "framebuffer",
|
||||
"Name[fi]": "framebuffer",
|
||||
"Name[fr]": "framebuffer",
|
||||
"Name[gl]": "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[sk]": "framebuffer",
|
||||
"Name[sl]": "medpomnilnik sličic",
|
||||
"Name[sr@ijekavian]": "Кадробафер",
|
||||
"Name[sr@ijekavianlatin]": "Kadrobafer",
|
||||
"Name[sr@latin]": "Kadrobafer",
|
||||
"Name[sr]": "Кадробафер",
|
||||
"Name[sv]": "rambuffer",
|
||||
"Name[uk]": "framebuffer",
|
||||
"Name[x-test]": "xxframebufferxx",
|
||||
"Name[zh_CN]": "framebuffer"
|
||||
"Name[x-test]": "xxframebufferxx"
|
||||
},
|
||||
"input": false
|
||||
}
|
|
@ -3,7 +3,6 @@
|
|||
"Description": "Render through hwcomposer through libhybris.",
|
||||
"Description[ca@valencia]": "Renderitza mitjançant el «hwcomposer» mitjançant «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[fi]": "Renderöi hwcomposerin läpi käyttäen libhybristä.",
|
||||
"Description[fr]": "Rendre par le biais de « hwcomposer » via « libhybris ».",
|
||||
|
@ -27,31 +26,14 @@
|
|||
"Description[zh_CN]": "使用 libhybris 通过 hwcomposer 渲染。",
|
||||
"Id": "KWinWaylandHwcomposerBackend",
|
||||
"Name": "hwcomposer",
|
||||
"Name[ca@valencia]": "hwcomposer",
|
||||
"Name[ca]": "hwcomposer",
|
||||
"Name[cs]": "hwcomposer",
|
||||
"Name[en_GB]": "hwcomposer",
|
||||
"Name[es]": "hwcomposer",
|
||||
"Name[fi]": "hwcomposer",
|
||||
"Name[fr]": "hwcomposer",
|
||||
"Name[gl]": "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[sk]": "hwcomposer",
|
||||
"Name[sl]": "hwcomposer",
|
||||
"Name[sr@ijekavian]": "ХВ‑композер",
|
||||
"Name[sr@ijekavianlatin]": "HWcomposer",
|
||||
"Name[sr@latin]": "HWcomposer",
|
||||
"Name[sr]": "ХВ‑композер",
|
||||
"Name[sv]": "hårdvarusammansättare",
|
||||
"Name[uk]": "hwcomposer",
|
||||
"Name[x-test]": "xxhwcomposerxx",
|
||||
"Name[zh_CN]": "hwcomposer"
|
||||
"Name[x-test]": "xxhwcomposerxx"
|
||||
},
|
||||
"input": false
|
||||
}
|
|
@ -3,7 +3,6 @@
|
|||
"Description": "Render to a virtual framebuffer.",
|
||||
"Description[ca@valencia]": "Renderitza a un «framebuffer» virtual.",
|
||||
"Description[ca]": "Renderitza a un «framebuffer» virtual.",
|
||||
"Description[en_GB]": "Render to a virtual framebuffer.",
|
||||
"Description[es]": "Renderizar en un «framebuffer» virtual.",
|
||||
"Description[fi]": "Renderöi virtuaaliseen framebufferiin.",
|
||||
"Description[fr]": "Rendre sur un « framebuffer » factice.",
|
||||
|
@ -30,28 +29,16 @@
|
|||
"Name[ca@valencia]": "Virtual",
|
||||
"Name[ca]": "Virtual",
|
||||
"Name[de]": "Virtuell",
|
||||
"Name[en_GB]": "virtual",
|
||||
"Name[es]": "virtual",
|
||||
"Name[fi]": "virtual",
|
||||
"Name[fr]": "virtual",
|
||||
"Name[gl]": "virtual",
|
||||
"Name[it]": "virtual",
|
||||
"Name[ko]": "virtual",
|
||||
"Name[nl]": "virtueel",
|
||||
"Name[nn]": "virtuell",
|
||||
"Name[pl]": "wirtualne",
|
||||
"Name[pt]": "virtual",
|
||||
"Name[pt_BR]": "virtual",
|
||||
"Name[sk]": "virtual",
|
||||
"Name[sl]": "navidezno",
|
||||
"Name[sr@ijekavian]": "Виртуелно",
|
||||
"Name[sr@ijekavianlatin]": "Virtuelno",
|
||||
"Name[sr@latin]": "Virtuelno",
|
||||
"Name[sr]": "Виртуелно",
|
||||
"Name[sv]": "virtuell",
|
||||
"Name[uk]": "virtual",
|
||||
"Name[x-test]": "xxvirtualxx",
|
||||
"Name[zh_CN]": "virtual"
|
||||
"Name[x-test]": "xxvirtualxx"
|
||||
},
|
||||
"input": true
|
||||
}
|
|
@ -3,7 +3,6 @@
|
|||
"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]": "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[fi]": "Renderöi sisäkkäiseen ikkunaan, jota hallitsee Wayland-koostin.",
|
||||
"Description[fr]": "Rendre sur une fenêtre imbriquée sur un compositeur Wayland en cours de fonctionnement.",
|
||||
|
@ -29,30 +28,14 @@
|
|||
"Name": "wayland",
|
||||
"Name[ca@valencia]": "Wayland",
|
||||
"Name[ca]": "Wayland",
|
||||
"Name[cs]": "wayland",
|
||||
"Name[de]": "Wayland",
|
||||
"Name[en_GB]": "wayland",
|
||||
"Name[es]": "wayland",
|
||||
"Name[fi]": "wayland",
|
||||
"Name[fr]": "wayland",
|
||||
"Name[gl]": "wayland",
|
||||
"Name[it]": "wayland",
|
||||
"Name[ko]": "wayland",
|
||||
"Name[nl]": "wayland",
|
||||
"Name[nn]": "wayland",
|
||||
"Name[pl]": "wayland",
|
||||
"Name[pt]": "Wayland",
|
||||
"Name[pt_BR]": "wayland",
|
||||
"Name[sk]": "wayland",
|
||||
"Name[sl]": "wayland",
|
||||
"Name[sr@ijekavian]": "Вејланд",
|
||||
"Name[sr@ijekavianlatin]": "Wayland",
|
||||
"Name[sr@latin]": "Wayland",
|
||||
"Name[sr]": "Вејланд",
|
||||
"Name[sv]": "Wayland",
|
||||
"Name[uk]": "wayland",
|
||||
"Name[x-test]": "xxwaylandxx",
|
||||
"Name[zh_CN]": "wayland"
|
||||
"Name[x-test]": "xxwaylandxx"
|
||||
},
|
||||
"input": true
|
||||
}
|
|
@ -3,7 +3,6 @@
|
|||
"Description": "Render to a nested window on X11 windowing system.",
|
||||
"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[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[fi]": "Renderöi sisäkkäiseen ikkunaan, joka on X11-ikkunointijärjestelmässä.",
|
||||
"Description[fr]": "Rendre sur une fenêtre imbriquée sur le système de fenêtrage X11.",
|
||||
|
@ -27,34 +26,15 @@
|
|||
"Description[zh_CN]": "渲染到 X11 窗口系统上的嵌套窗口中",
|
||||
"Id": "KWinWaylandX11Backend",
|
||||
"Name": "x11",
|
||||
"Name[ast]": "x11",
|
||||
"Name[ca@valencia]": "X11",
|
||||
"Name[ca]": "X11",
|
||||
"Name[cs]": "x11",
|
||||
"Name[da]": "x11",
|
||||
"Name[de]": "x11",
|
||||
"Name[en_GB]": "x11",
|
||||
"Name[es]": "x11",
|
||||
"Name[fi]": "x11",
|
||||
"Name[fr]": "x11",
|
||||
"Name[gl]": "x11",
|
||||
"Name[it]": "x11",
|
||||
"Name[ko]": "x11",
|
||||
"Name[nl]": "x11",
|
||||
"Name[nn]": "x11",
|
||||
"Name[pl]": "x11",
|
||||
"Name[pt]": "X11",
|
||||
"Name[pt_BR]": "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[uk]": "x11",
|
||||
"Name[x-test]": "xxx11xx",
|
||||
"Name[zh_CN]": "x11"
|
||||
"Name[x-test]": "xxx11xx"
|
||||
},
|
||||
"input": true
|
||||
}
|
Loading…
Reference in New Issue