diff options
Diffstat (limited to 'UserMerge/i18n/zh-hans.json')
| -rw-r--r-- | UserMerge/i18n/zh-hans.json | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/UserMerge/i18n/zh-hans.json b/UserMerge/i18n/zh-hans.json index d17b0646..def2296f 100644 --- a/UserMerge/i18n/zh-hans.json +++ b/UserMerge/i18n/zh-hans.json @@ -6,14 +6,13 @@ "Gzdavidwong", "Hzy980512", "Liangent", + "Liuxinyu970226", "Yfdyh000", - "乌拉跨氪", - "Liuxinyu970226" + "乌拉跨氪" ] }, "usermerge": "用户合并和删除", "usermerge-desc": "将在wiki数据库中[[Special:UserMerge|合并一个用户到另一个用户]] - 合并后删除旧用户。需要''usermerge''权限", - "usermerge-badolduser": "无效的旧用户名", "usermerge-badnewuser": "无效的新用户名", "usermerge-nonewuser": "新用户名为空，将假设合并到{{GENDER:$1|$1}}，<br />点击“{{int:usermerge-submit}}”以确定。", "usermerge-noolduser": "清除旧用户名", @@ -25,9 +24,7 @@ "usermerge-submit": "合并用户", "usermerge-badtoken": "无效的编辑令牌。", "usermerge-userdeleted": "$1（$2）已删除。", - "usermerge-userdeleted-log": "已删除用户账户“$2”（$3）", "usermerge-success": "由$1（$2）到$3（$4）的合并已经完成。", - "usermerge-success-log": "账户“$2”（$3）已合并到“[[User:$4|$4]]”（$5）", "usermerge-logpage": "用户合并日志", "usermerge-logpagetext": "这是一份用户合并动作的记录。", "usermerge-noselfdelete": "您不能将{{GENDER:$1|自己}}删除或者合并！", |