From f4069deb5cfb7d0d547b7a46457567e1b0483b5f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 13 Oct 2015 12:48:07 +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"
---
 backends/drm/drm.json               | 4 +++-
 backends/fbdev/fbdev.json           | 4 +++-
 backends/hwcomposer/hwcomposer.json | 4 +++-
 backends/virtual/virtual.json       | 4 +++-
 backends/wayland/wayland.json       | 4 +++-
 backends/x11/x11.json               | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/backends/drm/drm.json b/backends/drm/drm.json
index e315d70425..35f80c9840 100644
--- a/backends/drm/drm.json
+++ b/backends/drm/drm.json
@@ -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
 }
\ No newline at end of file
diff --git a/backends/fbdev/fbdev.json b/backends/fbdev/fbdev.json
index 11a04ec7b6..48de2b2429 100644
--- a/backends/fbdev/fbdev.json
+++ b/backends/fbdev/fbdev.json
@@ -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
 }
\ No newline at end of file
diff --git a/backends/hwcomposer/hwcomposer.json b/backends/hwcomposer/hwcomposer.json
index 493dfa19ed..c4d96bcafa 100644
--- a/backends/hwcomposer/hwcomposer.json
+++ b/backends/hwcomposer/hwcomposer.json
@@ -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
 }
\ No newline at end of file
diff --git a/backends/virtual/virtual.json b/backends/virtual/virtual.json
index e7089de362..d4a289fdaf 100644
--- a/backends/virtual/virtual.json
+++ b/backends/virtual/virtual.json
@@ -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
 }
\ No newline at end of file
diff --git a/backends/wayland/wayland.json b/backends/wayland/wayland.json
index bebcc28e66..0546db0c91 100644
--- a/backends/wayland/wayland.json
+++ b/backends/wayland/wayland.json
@@ -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
 }
\ No newline at end of file
diff --git a/backends/x11/x11.json b/backends/x11/x11.json
index f1d55d018d..ecc14228ae 100644
--- a/backends/x11/x11.json
+++ b/backends/x11/x11.json
@@ -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
 }
\ No newline at end of file