From 7e21998d1778bf7e0097cc059a260fdbd9cde043 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 25 Jul 2018 07:21:42 +0200
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/kteatime.notifyrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kteatime.notifyrc b/src/kteatime.notifyrc
index 1c2a1b7..f7355d5 100644
--- a/src/kteatime.notifyrc
+++ b/src/kteatime.notifyrc
@@ -250,7 +250,7 @@ Name[tr]=Çay yalnızlaşıyor
 Name[ug]=چاي سوۋۇپ قالدى
 Name[uk]=Час остигає
 Name[x-test]=xxTea is getting lonelyxx
-Name[zh_CN]=茶都凉了
+Name[zh_CN]=茶要凉了
 Name[zh_TW]=茶煮好了，怎麼沒人喝
 Comment=Tea is getting lonely.
 Comment[ar]=الشاي يشعر بالوحدة.
@@ -307,7 +307,7 @@ Comment[tr]=Çay yalnızlaşıyor.
 Comment[ug]=چاي سوۋۇپ قالدى.
 Comment[uk]=Час остигає.
 Comment[x-test]=xxTea is getting lonely.xx
-Comment[zh_CN]=茶都凉了
+Comment[zh_CN]=茶都凉了。
 Comment[zh_TW]=茶煮好了，怎麼沒人喝。
 Sound=Oxygen-Sys-App-Special.ogg
 Action=Sound
-- 
GitLab