Fix i18n merge conflicts (#25126)

* Translated using Weblate (Dutch)

Currently translated at 100.0% (2490 of 2490 strings)

Translation: Mattermost/mattermost-server-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server-monorepo/nl/

* Translated using Weblate (Polish)

Currently translated at 100.0% (5705 of 5705 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/pl/

Translated using Weblate (Polish)

Currently translated at 100.0% (5702 of 5702 strings)

Translation: Mattermost/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/pl/

Translated using Weblate (Polish)

Currently translated at 100.0% (2490 of 2490 strings)

Translation: Mattermost/mattermost-server-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server-monorepo/pl/

* Translated using Weblate (Turkish)

Currently translated at 100.0% (5702 of 5702 strings)

Translation: Mattermost/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/tr/

Translated using Weblate (Turkish)

Currently translated at 100.0% (2490 of 2490 strings)

Translation: Mattermost/mattermost-server-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server-monorepo/tr/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (5705 of 5705 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/zh_Hans/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (5705 of 5705 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/zh_Hans/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (5702 of 5702 strings)

Translation: Mattermost/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/zh_Hans/

* Translated using Weblate (Kazakh)

Currently translated at 2.1% (125 of 5705 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/kk/

Translated using Weblate (Kazakh)

Currently translated at 1.4% (83 of 5702 strings)

Translation: Mattermost/mattermost-webapp-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp-monorepo/kk/

* Translated using Weblate (Vietnamese)

Currently translated at 83.5% (2081 of 2490 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/vi/

Translated using Weblate (Vietnamese)

Currently translated at 83.2% (2072 of 2490 strings)

Translation: Mattermost/mattermost-server-monorepo
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server-monorepo/vi/

* Translated using Weblate (German)

Currently translated at 100.0% (5702 of 5702 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/de/

Translated using Weblate (German)

Currently translated at 100.0% (2490 of 2490 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/de/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (5705 of 5705 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/sv/

Translated using Weblate (Swedish)

Currently translated at 100.0% (5702 of 5702 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/sv/

Translated using Weblate (Swedish)

Currently translated at 100.0% (2490 of 2490 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/sv/

* Translated using Weblate (Albanian)

Currently translated at 4.3% (247 of 5702 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/sq/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (5705 of 5705 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nl/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2490 of 2490 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/zh_Hans/

* Translated using Weblate (German)

Currently translated at 100.0% (5705 of 5705 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/de/

* Translated using Weblate (Kazakh)

Currently translated at 2.8% (161 of 5705 strings)

Translation: Mattermost/webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/kk/

* Translated using Weblate (Vietnamese)

Currently translated at 89.8% (2237 of 2490 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/vi/

* Translated using Weblate (Vietnamese)

Currently translated at 89.8% (2237 of 2490 strings)

Translation: Mattermost/server
Translate-URL: https://translate.mattermost.com/projects/mattermost/server/vi/

---------

Co-authored-by: ctlaltdieliet_TESTACCOUNTFORWEBINARS <github3@controlaltdieliet.be>
Co-authored-by: master7 <marcin.karkosz@rajska.info>
Co-authored-by: Kaya Zeren <kayazeren@gmail.com>
Co-authored-by: ThrRip He <thrrip@thrrip.space>
Co-authored-by: Akbar Abdrakhmanov <kz.akbar@gmail.com>
Co-authored-by: linkvn <nguyentunglinh87@gmail.com>
Co-authored-by: jprusch <rs@schaeferbarthold.de>
Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se>
Co-authored-by: rubinaga <rubinaga02@gmail.com>
Co-authored-by: Tom De Moor <tom@controlaltdieliet.be>
Co-authored-by: cescpmantidfly <cescpmantidfly@gmail.com>

server/i18n/zh-CN.json

@@ -987,7 +987,7 @@
   },
   {
     "id": "api.emoji.create.duplicate.app_error",
-    "translation": "无法创建表情符号。另一个具有相同名称的表情符号已存在。"
+    "translation": "无法创建表情符。另一个具有相同名称的表情符号已存在。"
   },
   {
     "id": "api.emoji.create.other_user.app_error",
@@ -1003,11 +1003,11 @@
   },
   {
     "id": "api.emoji.disabled.app_error",
-    "translation": "自定义表情符号已被系统管理员禁用。"
+    "translation": "自定义表情符已被系统管理员禁用。"
   },
   {
     "id": "api.emoji.get_image.decode.app_error",
-    "translation": "无法解码表情符号图像文件。"
+    "translation": "无法解码表情符图像文件。"
   },
   {
     "id": "api.emoji.get_image.read.app_error",
@@ -1019,7 +1019,7 @@
   },
   {
     "id": "api.emoji.upload.image.app_error",
-    "translation": "无法创建表情符号。文件类型必须是PNG，JPEG，或GIF。"
+    "translation": "无法创建表情符。文件类型必须是 PNG、JPEG 或 GIF。"
   },
   {
     "id": "api.emoji.upload.large_image.decode_error",
@@ -9964,5 +9964,9 @@
   {
     "id": "app.thread.mark_all_as_read_by_channels.app_error",
     "translation": "无法将频道中的所有主题标记为已读"
+  },
+  {
+    "id": "api.emoji.get_multiple_by_name_too_many.request_error",
+    "translation": "无法根据名称获取过多的表情符。每次最多只能请求 {{.MaxNames}} 个表情符。"
   }
 ]