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 2016-10-05 09:29:10 +00:00
parent dd3c6d6cc2
commit 6f99385140
7 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/platforms/drm/drm.json
View file

@ -29,7 +29,6 @@
"Description[uk]": "Обробляти через вузол DRM.",
"Description[x-test]": "xxRender through drm node.xx",
"Description[zh_CN]": "通过 drm 结点渲染。",
"Description[zh_TW]": "透過 drm 節點成像。",
"Id": "KWinWaylandDrmBackend",
"Name": "drm",
"Name[ca@valencia]": "DRM",

4
plugins/platforms/fbdev/fbdev.json
View file

@ -29,7 +29,6 @@
"Description[uk]": "Обробляти до буфера кадрів.",
"Description[x-test]": "xxRender to framebuffer.xx",
"Description[zh_CN]": "渲染到帧缓冲。",
"Description[zh_TW]": "成像至 framebuffer。",
"Id": "KWinWaylandFbdevBackend",
"Name": "framebuffer",
"Name[ca@valencia]": "Framebuffer",
@ -45,8 +44,7 @@
"Name[sr@latin]": "Kadrobafer",
"Name[sr]": "Кадробафер",
"Name[sv]": "rambuffer",
"Name[x-test]": "xxframebufferxx",
"Name[zh_TW]": "影格緩衝區（framebuffer）"
"Name[x-test]": "xxframebufferxx"
},
"input": false
}

1
plugins/platforms/hwcomposer/hwcomposer.json
View file

@ -27,7 +27,6 @@
"Description[uk]": "Обробляти за допомогою апаратного засобу композиції через libhybris.",
"Description[x-test]": "xxRender through hwcomposer through libhybris.xx",
"Description[zh_CN]": "使用 libhybris 通过 hwcomposer 渲染。",
"Description[zh_TW]": "透過 libhybris 成像到 hwcomposer。",
"Id": "KWinWaylandHwcomposerBackend",
"Name": "hwcomposer",
"Name[pl]": "sprzętowy kompozytor",

4
plugins/platforms/virtual/virtual.json
View file

@ -29,7 +29,6 @@
"Description[uk]": "Обробляти до віртуального буфера кадрів.",
"Description[x-test]": "xxRender to a virtual framebuffer.xx",
"Description[zh_CN]": "渲染到虚拟帧缓冲。",
"Description[zh_TW]": "成像到虛擬影格緩衝區。",
"Id": "KWinWaylandVirtualBackend",
"Name": "virtual",
"Name[ca@valencia]": "Virtual",
@ -46,8 +45,7 @@
"Name[sr@latin]": "Virtuelno",
"Name[sr]": "Виртуелно",
"Name[sv]": "virtuell",
"Name[x-test]": "xxvirtualxx",
"Name[zh_TW]": "虛擬"
"Name[x-test]": "xxvirtualxx"
},
"input": true
}

1
plugins/platforms/wayland/wayland.json
View file

@ -27,7 +27,6 @@
"Description[uk]": "Обробляти у вкладене вікно запущеного засобу композиції Wayland.",
"Description[x-test]": "xxRender to a nested window on running Wayland compositor.xx",
"Description[zh_CN]": "渲染到 Wayland 混成器上的嵌套窗口中",
"Description[zh_TW]": "成像到執行中的 Wayland 的巢狀視窗。",
"Id": "KWinWaylandWaylandBackend",
"Name": "wayland",
"Name[ca@valencia]": "Wayland",

1
plugins/platforms/x11/standalone/x11.json
View file

@ -25,7 +25,6 @@
"Description[uk]": "Додаток платформи для окремого x11 у kwin_x11.",
"Description[x-test]": "xxPlatform plugin for standalone x11 in kwin_x11.xx",
"Description[zh_CN]": "kwin_x11 中的独立 x11 的平台插件",
"Description[zh_TW]": "在 kwin_x11 中供 standalone 的 x11 使用的平臺外掛程式。",
"Id": "KWinX11Platform",
"Name": "x11-standalone",
"Name[ca@valencia]": "X11-autònoma",

1
plugins/platforms/x11/windowed/x11.json
View file

@ -28,7 +28,6 @@
"Description[uk]": "Обробляти у вкладене вікно системи керування вікнами X11.",
"Description[x-test]": "xxRender to a nested window on X11 windowing system.xx",
"Description[zh_CN]": "渲染到 X11 窗口系统上的嵌套窗口中",
"Description[zh_TW]": "成像到 X11 視窗系統的巢狀視窗。",
"Id": "KWinWaylandX11Backend",
"Name": "x11",
"Name[ca@valencia]": "X11",