From abb8a9db1589d9239d2a3f244b37756b74faeb29 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 10 Nov 2017 04:54:04 +0100
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"
---
 linux/applications/org.kde.Falkon.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/linux/applications/org.kde.Falkon.desktop b/linux/applications/org.kde.Falkon.desktop
index e8437b745..1352b6bfc 100644
--- a/linux/applications/org.kde.Falkon.desktop
+++ b/linux/applications/org.kde.Falkon.desktop
@@ -29,6 +29,7 @@ Comment[pt]=Um navegador Web rápido e seguro
 Comment[sv]=En snabb och säker webbläsare
 Comment[uk]=Проста і безпечна програма для перегляду інтернету
 Comment[x-test]=xxA fast and secure web browserxx
+Comment[zh_CN]=快速、安全的网页浏览器
 GenericName=Web Browser
 GenericName[ar]=متصفّح وبّ
 GenericName[ast]=Restolador web