From 6f9938514008631bf758140833f603c8da8e2643 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 5 Oct 2016 09:29:10 +0000 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 | 1 - plugins/platforms/fbdev/fbdev.json | 4 +--- plugins/platforms/hwcomposer/hwcomposer.json | 1 - plugins/platforms/virtual/virtual.json | 4 +--- plugins/platforms/wayland/wayland.json | 1 - plugins/platforms/x11/standalone/x11.json | 1 - plugins/platforms/x11/windowed/x11.json | 1 - 7 files changed, 2 insertions(+), 11 deletions(-) diff --git a/plugins/platforms/drm/drm.json b/plugins/platforms/drm/drm.json index cd75cb94da..ba19fc4650 100644 --- a/plugins/platforms/drm/drm.json +++ b/plugins/platforms/drm/drm.json @@ -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", diff --git a/plugins/platforms/fbdev/fbdev.json b/plugins/platforms/fbdev/fbdev.json index 103a7cc534..258cdb2bb6 100644 --- a/plugins/platforms/fbdev/fbdev.json +++ b/plugins/platforms/fbdev/fbdev.json @@ -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 } \ No newline at end of file diff --git a/plugins/platforms/hwcomposer/hwcomposer.json b/plugins/platforms/hwcomposer/hwcomposer.json index 445940533c..bed756cb42 100644 --- a/plugins/platforms/hwcomposer/hwcomposer.json +++ b/plugins/platforms/hwcomposer/hwcomposer.json @@ -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", diff --git a/plugins/platforms/virtual/virtual.json b/plugins/platforms/virtual/virtual.json index d55b5af49a..0e4f1e352f 100644 --- a/plugins/platforms/virtual/virtual.json +++ b/plugins/platforms/virtual/virtual.json @@ -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 } \ No newline at end of file diff --git a/plugins/platforms/wayland/wayland.json b/plugins/platforms/wayland/wayland.json index b927cceb60..f90449426c 100644 --- a/plugins/platforms/wayland/wayland.json +++ b/plugins/platforms/wayland/wayland.json @@ -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", diff --git a/plugins/platforms/x11/standalone/x11.json b/plugins/platforms/x11/standalone/x11.json index d1c848c856..7274b07e6a 100644 --- a/plugins/platforms/x11/standalone/x11.json +++ b/plugins/platforms/x11/standalone/x11.json @@ -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", diff --git a/plugins/platforms/x11/windowed/x11.json b/plugins/platforms/x11/windowed/x11.json index a26285f3cf..a6b4a4899c 100644 --- a/plugins/platforms/x11/windowed/x11.json +++ b/plugins/platforms/x11/windowed/x11.json @@ -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",