From 8e17059be76d05cc2c883746827a234bc6c27a58 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 9 Oct 2015 11:48:28 +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               | 1 +
 backends/fbdev/fbdev.json           | 1 +
 backends/hwcomposer/hwcomposer.json | 1 +
 backends/wayland/wayland.json       | 1 +
 backends/x11/x11.json               | 1 +
 5 files changed, 5 insertions(+)

diff --git a/backends/drm/drm.json b/backends/drm/drm.json
index 2ef01388a6..e315d70425 100644
--- a/backends/drm/drm.json
+++ b/backends/drm/drm.json
@@ -16,6 +16,7 @@
         "Id": "KWinWaylandDrmBackend", 
         "Name": "drm", 
         "Name[ca]": "DRM", 
+        "Name[cs]": "drm", 
         "Name[en_GB]": "drm", 
         "Name[es]": "drm", 
         "Name[nl]": "drm", 
diff --git a/backends/fbdev/fbdev.json b/backends/fbdev/fbdev.json
index 670c36511b..11a04ec7b6 100644
--- a/backends/fbdev/fbdev.json
+++ b/backends/fbdev/fbdev.json
@@ -16,6 +16,7 @@
         "Id": "KWinWaylandFbdevBackend", 
         "Name": "framebuffer", 
         "Name[ca]": "Framebuffer", 
+        "Name[cs]": "framebuffer", 
         "Name[en_GB]": "framebuffer", 
         "Name[es]": "framebuffer", 
         "Name[nl]": "framebuffer", 
diff --git a/backends/hwcomposer/hwcomposer.json b/backends/hwcomposer/hwcomposer.json
index ef9a42783e..493dfa19ed 100644
--- a/backends/hwcomposer/hwcomposer.json
+++ b/backends/hwcomposer/hwcomposer.json
@@ -16,6 +16,7 @@
         "Id": "KWinWaylandHwcomposerBackend", 
         "Name": "hwcomposer", 
         "Name[ca]": "hwcomposer", 
+        "Name[cs]": "hwcomposer", 
         "Name[en_GB]": "hwcomposer", 
         "Name[es]": "hwcomposer", 
         "Name[nl]": "hwcomposer", 
diff --git a/backends/wayland/wayland.json b/backends/wayland/wayland.json
index a2daef3a39..bebcc28e66 100644
--- a/backends/wayland/wayland.json
+++ b/backends/wayland/wayland.json
@@ -16,6 +16,7 @@
         "Id": "KWinWaylandWaylandBackend", 
         "Name": "wayland", 
         "Name[ca]": "Wayland", 
+        "Name[cs]": "wayland", 
         "Name[en_GB]": "wayland", 
         "Name[es]": "wayland", 
         "Name[nl]": "wayland", 
diff --git a/backends/x11/x11.json b/backends/x11/x11.json
index acb3d44e44..f1d55d018d 100644
--- a/backends/x11/x11.json
+++ b/backends/x11/x11.json
@@ -16,6 +16,7 @@
         "Id": "KWinWaylandX11Backend", 
         "Name": "x11", 
         "Name[ca]": "X11", 
+        "Name[cs]": "x11", 
         "Name[en_GB]": "x11", 
         "Name[es]": "x11", 
         "Name[nl]": "x11",