diff --git a/po/zh_CN.po b/po/zh_CN.po index 3696740d1..e7ddca995 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6950,10 +6950,9 @@ msgid "This feature is not supported by your web browser" msgstr "你所使用的浏览器不支持此功能" #: prefs_manage.php:263 -#, fuzzy #| msgid "Server configuration" msgid "Merge with current configuration" -msgstr "服务器设置" +msgstr "与当前设置合并" #: prefs_manage.php:277 #, php-format