A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
fix: conflict
shuai9d829ff64d29
diff --cc i18n/en_US.yamlindex 8391a1d6,b11ba3a6..e327e4ed--- a/i18n/en_US.yaml+++ b/i18n/en_US.yaml@@@ -2304,6 -2300,7 +2304,10 @@@ uiuser_deleted: This user has been deleted.badge_activated: This badge has been activated.badge_inactivated: This badge has been inactivated.+ users_deleted: These users have been deleted.+ posts_deleted: These questions have been deleted.+ answers_deleted: These answers have been deleted.+ copy: Copy to clipboard+ copied: Copied++diff --cc i18n/zh_CN.yamlindex 17ba2e47,9eb0254a..847cf395--- a/i18n/zh_CN.yaml+++ b/i18n/zh_CN.yaml@@@ -2266,6 -2262,6 +2266,9 @@@ uiuser_deleted: 此用户已被删除badge_activated: 此徽章已被激活。badge_inactivated: 此徽章已被禁用。+ users_deleted: 这些用户已被删除。+ posts_deleted: 这些帖子已被删除。+ answers_deleted: 这些回答已被删除。+ copy: 复制+ copied: 已复制+