yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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-13 12:48:07 +00:00
parent 04ab8554aa
commit f4069deb5c
6 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backends/drm/drm.json
View file

@ -13,6 +13,7 @@
"Description[sv]": "Återge via DRM-nod.",
"Description[uk]": "Обробляти через вузол DRM.",
"Description[x-test]": "xxRender through drm node.xx",
"Description[zh_CN]": "通过 drm 结点渲染。",
"Id": "KWinWaylandDrmBackend",
"Name": "drm",
"Name[ca]": "DRM",
@ -27,7 +28,8 @@
"Name[sk]": "drm",
"Name[sv]": "DRM",
"Name[uk]": "drm",
"Name[x-test]": "xxdrmxx"
"Name[x-test]": "xxdrmxx",
"Name[zh_CN]": "drm"
},
"input": false
}

4
backends/fbdev/fbdev.json
View file

@ -13,6 +13,7 @@
"Description[sv]": "Återge i rambuffer.",
"Description[uk]": "Обробляти до буфера кадрів.",
"Description[x-test]": "xxRender to framebuffer.xx",
"Description[zh_CN]": "渲染到帧缓冲。",
"Id": "KWinWaylandFbdevBackend",
"Name": "framebuffer",
"Name[ca]": "Framebuffer",
@ -27,7 +28,8 @@
"Name[sk]": "framebuffer",
"Name[sv]": "rambuffer",
"Name[uk]": "framebuffer",
"Name[x-test]": "xxframebufferxx"
"Name[x-test]": "xxframebufferxx",
"Name[zh_CN]": "framebuffer"
},
"input": false
}

4
backends/hwcomposer/hwcomposer.json
View file

@ -13,6 +13,7 @@
"Description[sv]": "Återge via på hårdvarusammansättare via libhybris.",
"Description[uk]": "Обробляти за допомогою апаратного засобу композиції через libhybris.",
"Description[x-test]": "xxRender through hwcomposer through libhybris.xx",
"Description[zh_CN]": "使用 libhybris 通过 hwcomposer 渲染。",
"Id": "KWinWaylandHwcomposerBackend",
"Name": "hwcomposer",
"Name[ca]": "hwcomposer",
@ -27,7 +28,8 @@
"Name[sk]": "hwcomposer",
"Name[sv]": "hårdvarusammansättare",
"Name[uk]": "hwcomposer",
"Name[x-test]": "xxhwcomposerxx"
"Name[x-test]": "xxhwcomposerxx",
"Name[zh_CN]": "hwcomposer"
},
"input": true
}

4
backends/virtual/virtual.json
View file

@ -13,6 +13,7 @@
"Description[sv]": "Återge i en virtuell rambuffer.",
"Description[uk]": "Обробляти до віртуального буфера кадрів.",
"Description[x-test]": "xxRender to a virtual framebuffer.xx",
"Description[zh_CN]": "渲染到虚拟帧缓冲。",
"Id": "KWinWaylandVirtualBackend",
"Name": "virtual",
"Name[ca]": "Virtual",
@ -26,7 +27,8 @@
"Name[sk]": "virtual",
"Name[sv]": "virtuell",
"Name[uk]": "virtual",
"Name[x-test]": "xxvirtualxx"
"Name[x-test]": "xxvirtualxx",
"Name[zh_CN]": "virtual"
},
"input": true
}

4
backends/wayland/wayland.json
View file

@ -13,6 +13,7 @@
"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",
"Description[zh_CN]": "渲染到 Wayland 混成器上的嵌套窗口中",
"Id": "KWinWaylandWaylandBackend",
"Name": "wayland",
"Name[ca]": "Wayland",
@ -27,7 +28,8 @@
"Name[sk]": "wayland",
"Name[sv]": "Wayland",
"Name[uk]": "wayland",
"Name[x-test]": "xxwaylandxx"
"Name[x-test]": "xxwaylandxx",
"Name[zh_CN]": "wayland"
},
"input": true
}

4
backends/x11/x11.json
View file

@ -13,6 +13,7 @@
"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",
"Description[zh_CN]": "渲染到 X11 窗口系统上的嵌套窗口中",
"Id": "KWinWaylandX11Backend",
"Name": "x11",
"Name[ca]": "X11",
@ -27,7 +28,8 @@
"Name[sk]": "x11",
"Name[sv]": "X11",
"Name[uk]": "x11",
"Name[x-test]": "xxx11xx"
"Name[x-test]": "xxx11xx",
"Name[zh_CN]": "x11"
},
"input": true
}