From 7f66609f70736e232afee4042dfd7b8a2b29ffd4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 17 Jun 2016 13:25: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" --- lookandfeel.dark/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index 910083e3..96d7c0c1 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -32,6 +32,7 @@ Comment[tr]=KDE VDG tarafından geliştirilen Breeze Koyu Masaüstü Tasarım Di Comment[uk]=Мова розробки стільниці Breeze Dark, створена KDE VDG Comment[x-test]=xxBreeze Dark Desktop Design Language by the KDE VDGxx Comment[zh_CN]=KDE 视觉设计组设计的暗色微风桌面设计语言 +Comment[zh_TW]=KDE VDG 團隊設計的 Breeze Dark 桌面設計語言 Encoding=UTF-8 Name=Breeze Dark Name[ar]=نسيم داكن