From 9ba74825f07512127411aac8afd8503f37cc2bfa Mon Sep 17 00:00:00 2001
From: "transifex-integration[bot]"
 <43880903+transifex-integration[bot]@users.noreply.github.com>
Date: Tue, 28 Apr 2020 14:03:22 -0400
Subject: [PATCH] Translate /config/locales/en.yml in zh_CN (#1429)

translation completed for the source file '/config/locales/en.yml'
on the 'zh_CN' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
---
 config/locales/zh_CN.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 8d15295d..efdd7637 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -147,6 +147,7 @@ zh_CN:
         delete: 删除
         edit: 编辑
         edit_roles: 编辑用户角色
+        merge: 合并
         perm_delete: 永久删除
         unban: 取消禁止用户
         undelete: 撤消删除