From b454b96ec6126962f4b86f532ee00434ee5b5c55 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 28 Aug 2015 10:22:19 +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"
---
 lookandfeel.dark/metadata.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop
index 3aec8cb9..91a0502f 100644
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@@ -4,6 +4,7 @@ Comment[ca]=Llenguatge de disseny d'escriptori Brisa fosca pel VDG del KDE
 Comment[de]=Breeze-Dunkel-Arbeitsflächendesign der KDE VDG
 Comment[es]=Lenguaje de diseño del escritorio Breeze Dark, por el VDG de KDE
 Comment[gl]=Linguaxe de deseño do escritorio para Breeze Dark do KDE VDG
+Comment[nb]=Breeze Dark-språk for skrivebordsutforming  fra KDE-gruppa for visuell design
 Comment[nl]=Breeze Dark ontwerptaal van het bureaublad door KDE VDG
 Comment[pt]=Linguagem de Desenho do Ecrã Brisa Escuro, da VDG do KDE
 Comment[pt_BR]=Linguagem de desenho da área de trabalho Breeze Dark por KDE VDG
@@ -11,6 +12,7 @@ Comment[sl]=Sapica (temna), oblikovalni jezik namizja avtorjev KDE VDG
 Comment[sv]=Breeze-konstruktionsspråk för mörkt skrivbord av KDE VDG
 Comment[uk]=Мова розробки стільниці Breeze Dark, створена KDE VDG
 Comment[x-test]=xxBreeze Dark Desktop Design Language by the KDE VDGxx
+Comment[zh_CN]=KDE 视觉设计组设计的暗色微风桌面设计语言
 Encoding=UTF-8
 Name=Breeze Dark
 Name[ar]=نسيم داكن