diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
tree | f1fdd326034e05177596851be6a7127615d81498 /extensions/ParserFunctions/i18n/zh-hans.json | |
parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'extensions/ParserFunctions/i18n/zh-hans.json')
-rw-r--r-- | extensions/ParserFunctions/i18n/zh-hans.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/extensions/ParserFunctions/i18n/zh-hans.json b/extensions/ParserFunctions/i18n/zh-hans.json index c7491d22..d2e0b54a 100644 --- a/extensions/ParserFunctions/i18n/zh-hans.json +++ b/extensions/ParserFunctions/i18n/zh-hans.json @@ -7,11 +7,12 @@ "PhiLiP", "Philip", "Shinjiman", - "阿pp" + "阿pp", + "Liuxinyu970226" ] }, "pfunc_desc": "用逻辑函数加强解析器", - "pfunc_time_error": "错误:无效时间", + "pfunc_time_error": "错误:无效时间。", "pfunc_time_too_long": "错误:#time调用次数过多", "pfunc_time_too_big": "错误:#time只支持到9999年", "pfunc_time_too_small": "错误:#time只支持最低0年。", |