From 82c351cb04767c567d5f410953c79a36f76cb4a2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 20 Feb 2016 09:50:14 +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"
---
 src/desktoptheme/breeze-light/metadata.desktop | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop
index 9ae9ad220..246ec2ffb 100644
--- a/src/desktoptheme/breeze-light/metadata.desktop
+++ b/src/desktoptheme/breeze-light/metadata.desktop
@@ -1,11 +1,16 @@
 [Desktop Entry]
 Name=Breeze Light
 Name[ca]=Brisa clara
+Name[ca@valencia]=Brisa clara
+Name[de]=Breeze Light
+Name[nl]=Breeze Light
+Name[pl]=Lekka Bryza
 Name[pt]=Brisa Clara
 Name[pt_BR]=Breeze Light
 Name[sv]=Breeze ljus
 Name[uk]=Світла Breeze
 Name[x-test]=xxBreeze Lightxx
+Name[zh_CN]=亮色微风
 
 
 X-KDE-PluginInfo-Author=KDE Visual Design Group