From f0362207ea24ee91f2ca4cc324b0d905a1235656 Mon Sep 17 00:00:00 2001
From: Monsta <monsta@inbox.ru>
Date: Wed, 8 Jul 2015 14:20:54 +0300
Subject: fixed almost all merge conflicts in help translations

---
 mateweather/docs/zh_CN/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mateweather')

diff --git a/mateweather/docs/zh_CN/zh_CN.po b/mateweather/docs/zh_CN/zh_CN.po
index 9cdd9053..5b3e2a15 100644
--- a/mateweather/docs/zh_CN/zh_CN.po
+++ b/mateweather/docs/zh_CN/zh_CN.po
@@ -506,7 +506,7 @@ msgid ""
 "A weather icon that represents the general weather conditions. See <xref "
 "linkend=\"mateweather-introduction-icons\"/>."
 msgstr ""
-"一个天气图标显示了天气的整体状况。详情请查看：<xref·linkend=\"mateweather-"
+"一个天气图标显示了天气的整体状况。详情请查看：<xref linkend=\"mateweather-"
 "introduction-icons\"/>。"
 
 #: C/mateweather.xml:272(para)
-- 
cgit v1.2.1