summaryrefslogtreecommitdiff
path: root/mateweather/docs
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-07-08 14:20:54 +0300
committerMonsta <[email protected]>2015-07-08 14:40:36 +0300
commitf0362207ea24ee91f2ca4cc324b0d905a1235656 (patch)
treeb7ecd070d0f56bede66ca79dc3b715e23e1ec107 /mateweather/docs
parent9a4c2f01d0824db2b5ee121eb52262ea554c6dc8 (diff)
downloadmate-applets-f0362207ea24ee91f2ca4cc324b0d905a1235656.tar.bz2
mate-applets-f0362207ea24ee91f2ca4cc324b0d905a1235656.tar.xz
fixed almost all merge conflicts in help translations
Diffstat (limited to 'mateweather/docs')
-rw-r--r--mateweather/docs/zh_CN/zh_CN.po2
1 files changed, 1 insertions, 1 deletions
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)