From 9472756205dc8c075ac36d4ffdcee6deab10ff82 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 1 Mar 2016 13:09:20 +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/virtual/virtual.json       | 2 ++
 backends/wayland/wayland.json       | 1 +
 backends/x11/x11.json               | 1 +
 6 files changed, 7 insertions(+)

diff --git a/backends/drm/drm.json b/backends/drm/drm.json
index 88d7f1e2ca..a69a6bcce9 100644
--- a/backends/drm/drm.json
+++ b/backends/drm/drm.json
@@ -3,6 +3,7 @@
         "Description": "Render through drm node.", 
         "Description[ca@valencia]": "Renderitza mitjançant el node del DRM.", 
         "Description[ca]": "Renderitza mitjançant el node del DRM.", 
+        "Description[da]": "Render igennem drm-knude.", 
         "Description[de]": "In DRM-Knoten rendern.", 
         "Description[es]": "Renderizar a través del nodo DRM.", 
         "Description[fi]": "Renderöi DRM-noden läpi.", 
diff --git a/backends/fbdev/fbdev.json b/backends/fbdev/fbdev.json
index d7b725dcca..a2d5b82ec0 100644
--- a/backends/fbdev/fbdev.json
+++ b/backends/fbdev/fbdev.json
@@ -3,6 +3,7 @@
         "Description": "Render to framebuffer.", 
         "Description[ca@valencia]": "Renderitza al «framebuffer».", 
         "Description[ca]": "Renderitza al «framebuffer».", 
+        "Description[da]": "Render til framebuffer.", 
         "Description[de]": "In Framebuffer rendern.", 
         "Description[es]": "Renderizar en el «framebuffer».", 
         "Description[fi]": "Renderöi framebufferiin.", 
diff --git a/backends/hwcomposer/hwcomposer.json b/backends/hwcomposer/hwcomposer.json
index 64efc7624a..8b48d76be4 100644
--- a/backends/hwcomposer/hwcomposer.json
+++ b/backends/hwcomposer/hwcomposer.json
@@ -3,6 +3,7 @@
         "Description": "Render through hwcomposer through libhybris.", 
         "Description[ca@valencia]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».", 
         "Description[ca]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».", 
+        "Description[da]": "Rendér igennem hwcomposer igennem libhybris.", 
         "Description[es]": "Renderizar a través «hwcomposer» mediante «libhybris».", 
         "Description[fi]": "Renderöi hwcomposerin läpi käyttäen libhybristä.", 
         "Description[fr]": "Rendre par le biais de « hwcomposer » via « libhybris ».", 
diff --git a/backends/virtual/virtual.json b/backends/virtual/virtual.json
index a2511ae092..f10c57fe3b 100644
--- a/backends/virtual/virtual.json
+++ b/backends/virtual/virtual.json
@@ -3,6 +3,7 @@
         "Description": "Render to a virtual framebuffer.", 
         "Description[ca@valencia]": "Renderitza a un «framebuffer» virtual.", 
         "Description[ca]": "Renderitza a un «framebuffer» virtual.", 
+        "Description[da]": "Rendér til en virtuel framebuffer.", 
         "Description[de]": "In virtuellen Framebuffer rendern.", 
         "Description[es]": "Renderizar en un «framebuffer» virtual.", 
         "Description[fi]": "Renderöi virtuaaliseen framebufferiin.", 
@@ -29,6 +30,7 @@
         "Name": "virtual", 
         "Name[ca@valencia]": "Virtual", 
         "Name[ca]": "Virtual", 
+        "Name[da]": "virtuel", 
         "Name[de]": "Virtuell", 
         "Name[nl]": "virtueel", 
         "Name[nn]": "virtuell", 
diff --git a/backends/wayland/wayland.json b/backends/wayland/wayland.json
index e415fee449..586e1828b9 100644
--- a/backends/wayland/wayland.json
+++ b/backends/wayland/wayland.json
@@ -3,6 +3,7 @@
         "Description": "Render to a nested window on running Wayland compositor.", 
         "Description[ca@valencia]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.", 
         "Description[ca]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.", 
+        "Description[da]": "Rendér til et indlejret vindue på kørende Wayland-compositor.", 
         "Description[es]": "Renderizar en una ventana anidada en el compositor Wayland en ejecución.", 
         "Description[fi]": "Renderöi sisäkkäiseen ikkunaan, jota hallitsee Wayland-koostin.", 
         "Description[fr]": "Rendre sur une fenêtre imbriquée sur un compositeur Wayland en cours de fonctionnement.", 
diff --git a/backends/x11/x11.json b/backends/x11/x11.json
index 3efef9d76b..9a172a9662 100644
--- a/backends/x11/x11.json
+++ b/backends/x11/x11.json
@@ -3,6 +3,7 @@
         "Description": "Render to a nested window on X11 windowing system.", 
         "Description[ca@valencia]": "Renderitza a una finestra imbricada en el sistema de finestres X11.", 
         "Description[ca]": "Renderitza a una finestra imbricada en el sistema de finestres X11.", 
+        "Description[da]": "Rendér til et indlejret vindue på X11-vinduessystemet.", 
         "Description[es]": "Renderizar en una ventana anidada en el sistema de ventanas X11.", 
         "Description[fi]": "Renderöi sisäkkäiseen ikkunaan, joka on X11-ikkunointijärjestelmässä.", 
         "Description[fr]": "Rendre sur une fenêtre imbriquée sur le système de fenêtrage X11.",