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

@@ -29,6 +29,7 @@
         "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", 

plugins/platforms/fbdev/fbdev.json

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

plugins/platforms/hwcomposer/hwcomposer.json

@@ -27,6 +27,7 @@
         "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", 

plugins/platforms/virtual/virtual.json

@@ -29,6 +29,7 @@
         "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", 
@@ -45,7 +46,8 @@
         "Name[sr@latin]": "Virtuelno", 
         "Name[sr]": "Виртуелно", 
         "Name[sv]": "virtuell", 
-        "Name[x-test]": "xxvirtualxx"
+        "Name[x-test]": "xxvirtualxx", 
+        "Name[zh_TW]": "虛擬"
     }, 
     "input": true
 }

plugins/platforms/wayland/wayland.json

@@ -27,6 +27,7 @@
         "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", 

plugins/platforms/x11/standalone/x11.json

@@ -25,6 +25,7 @@
         "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", 

plugins/platforms/x11/windowed/x11.json

@@ -17,6 +17,7 @@
         "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[ru]": "Отрисовка во вложенном окне оконной системы X11.", 
         "Description[sk]": "Renderovať na vnorené okno na systém okien X11.", 
         "Description[sl]": "Izriši v gnezdeno okno na okenskem sistemu X11.", 
         "Description[sr@ijekavian]": "Рендеровање у угнежђени прозор на прозорском систему Икс11.", 
@@ -27,6 +28,7 @@
         "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",