From f1a3b7643e070a14f6adf51858c6cd9cf142af89 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 20 Jan 2018 04:54:01 +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 | 4 ++++
 src/lib/data/breeze-fallback/index.theme  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/linux/applications/org.kde.Falkon.desktop b/linux/applications/org.kde.Falkon.desktop
index ec9227aa4..c38efbe97 100644
--- a/linux/applications/org.kde.Falkon.desktop
+++ b/linux/applications/org.kde.Falkon.desktop
@@ -16,6 +16,7 @@ Name[sk]=Falkon
 Name[sv]=Falkon
 Name[uk]=Falkon
 Name[x-test]=xxFalkonxx
+Name[zh_CN]=Falkon
 Type=Application
 Icon=qupzilla
 Categories=Network;WebBrowser;
@@ -78,6 +79,7 @@ Name[sk]=Otvoriť novú záložku
 Name[sv]=Öppna ny flik
 Name[uk]=Відкрити нову вкладку
 Name[x-test]=xxOpen new tabxx
+Name[zh_CN]=打开新标签
 Exec=falkon --new-tab
 
 [Desktop Action NewWindow]
@@ -97,6 +99,7 @@ Name[pt]=Abrir uma nova janela
 Name[sv]=Öppna nytt fönster
 Name[uk]=Відкрити нове вікно
 Name[x-test]=xxOpen new windowxx
+Name[zh_CN]=打开新窗口
 Exec=falkon --new-window
 
 [Desktop Action PrivateBrowsing]
@@ -116,4 +119,5 @@ Name[pt]=Iniciar a navegação privada
 Name[sv]=Starta privat webbläsning
 Name[uk]=Конфіденційний перегляд
 Name[x-test]=xxStart private browsingxx
+Name[zh_CN]=启动隐身浏览
 Exec=falkon --private-browsing
diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme
index a2ca914d1..f98cdf6e6 100644
--- a/src/lib/data/breeze-fallback/index.theme
+++ b/src/lib/data/breeze-fallback/index.theme
@@ -33,6 +33,7 @@ Comment[pt]=Equipa do Brisa
 Comment[sv]=Breeze-gruppen
 Comment[uk]=Команда Breeze
 Comment[x-test]=xxBreeze Teamxx
+Comment[zh_CN]=微风团队
 DisplayDepth=32
 Inherits=default
 Directories=16x16,22x22,32x32