From 02eadb106e1d5c1c5923e113dffe5aada37731cb Mon Sep 17 00:00:00 2001
From: Monsta <monsta@inbox.ru>
Date: Thu, 9 Jul 2015 17:58:03 +0300
Subject: help: fix merge conflicts in translations

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

(limited to 'help/zh_CN/zh_CN.po')

diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index 0973ec2..0468d46 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -1235,7 +1235,7 @@ msgid ""
 "To change the background color of the <application>System Monitor</"
 "application> graphs, perform the following steps:"
 msgstr ""
-"要改变<application>系统监视器/application>图表的背景颜色，请执行以下步骤："
+"要改变<application>系统监视器</application>图表的背景颜色，请执行以下步骤："
 
 #: C/mate-system-monitor.xml:1060(para) C/mate-system-monitor.xml:1099(para)
 msgid ""
-- 
cgit v1.2.1