From e7e49e5403805ad552ceb5f135f9e91b9650f6fc Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 25 Aug 2015 12:58:43 +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 | 36 +++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop
index 05150471..eb9eb6fe 100644
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@@ -2,6 +2,42 @@
 Comment=Breeze Dark Desktop Design Language by the KDE VDG
 Encoding=UTF-8
 Name=Breeze Dark
+Name[ar]=نسيم داكن
+Name[bs]=Breeze tamna
+Name[ca]=Brisa fosca
+Name[cs]=Breeze Tmavé
+Name[da]=Breeze Dark
+Name[de]=Breeze-Dunkel
+Name[el]=Σκοτεινό Breeze
+Name[en_GB]=Breeze Dark
+Name[es]=Brisa oscuro
+Name[fi]=Breeze Dark
+Name[fr]=Brise sombre
+Name[gl]=Breeze Dark
+Name[hu]=Breeze Dark
+Name[it]=Brezza scuro
+Name[ko]=어두운 Breeze
+Name[lt]=Breeze tamsi
+Name[nb]=Breeze mørk
+Name[nl]=Breeze Dark
+Name[nn]=Breeze mørk
+Name[pl]=Ciemna bryza
+Name[pt]=Brisa Escura
+Name[pt_BR]=Breeze Dark
+Name[ro]=Briză Întunecat
+Name[ru]=Breeze, тёмный вариант
+Name[sk]=Tmavý vánok
+Name[sl]=Sapica (temna)
+Name[sr]=Поветарац тамни
+Name[sr@ijekavian]=Поветарац тамни
+Name[sr@ijekavianlatin]=Povetarac tamni
+Name[sr@latin]=Povetarac tamni
+Name[sv]=Breeze mörk
+Name[tr]=Koyu Esinti
+Name[uk]=Breeze Dark
+Name[x-test]=xxBreeze Darkxx
+Name[zh_CN]=暗色微风
+Name[zh_TW]=Breeze Dark
 Type=Service
 
 X-KDE-ServiceTypes=Plasma/LookAndFeel