From 910e6a4ef72ca582b30344957e6078862d51456e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 30 Oct 2016 09:15:51 +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/metadata.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop
index 8d0338659..07ff9b4f8 100644
--- a/src/desktoptheme/breeze/metadata.desktop
+++ b/src/desktoptheme/breeze/metadata.desktop
@@ -38,7 +38,7 @@ Name[tr]=Esintili
 Name[uk]=Breeze
 Name[x-test]=xxBreezexx
 Name[zh_CN]=微风
-Name[zh_TW]=Breeze Dark
+Name[zh_TW]=Breeze
 
 
 X-KDE-PluginInfo-Author=KDE Visual Design Group