From 5f20671aed0f8bf140e8628e3fd20a5b61cb02ca Mon Sep 17 00:00:00 2001 From: Cactus_student <97865546+Cactusstudent@users.noreply.github.com> Date: Tue, 20 Aug 2024 20:16:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0=201.?= =?UTF-8?q?=20README=20=E6=9B=B4=E6=96=B0=EF=BC=8C=E6=89=AC=E6=8E=89?= =?UTF-8?q?=E4=BA=86=20MCBBS=EF=BC=8C=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E7=9A=84=E8=A1=A8=E8=BF=B0=E5=92=8C=E6=8E=92?= =?UTF-8?q?=E7=89=88=202.=20README-en.md=20=E6=9B=B4=E6=96=B0=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E8=B4=A1=E7=8C=AE=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9A=84=E5=90=8D=E7=A7=B0=E8=A1=A8=E8=BF=B0=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E9=9B=AA=E5=B0=BC=E7=9A=84=E5=90=8D=E5=AD=97=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E4=BA=86Snownee=EF=BC=8C=E5=88=A0=E9=99=A4=E4=BA=86=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E7=82=B9=E5=87=BB=E7=9A=84=E9=93=BE=E6=8E=A5=203.CONT?= =?UTF-8?q?RIBUTING.md=20=E6=9B=B4=E6=96=B0=E3=80=82=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=87=AA=E6=A0=A1=E7=9B=B8=E5=85=B3=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTING.md | 2 ++ README-en.md | 4 ++-- README.md | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2c360f9f86a6..ba76f22b0c7b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -93,6 +93,8 @@ projects 文件夹下只标出模组所属的大版本号，其中的模组翻 - 翻译**必须**符合 [Minecraft 模组简体中文翻译规范与指南](https://cfpa.site/TransRules/)的规定。 - **拒绝**接收机器翻译（含生成式 AI）、生硬翻译。 + - 若直接提交此类翻译，该 PR 将被打上“需要自校”标签。 + - 若作者不及时进行有效修改，PR 可能会依照本仓库的[搁置规则](#搁置规则)处理。 - 翻译**必须**在审查后才能进入仓库。 ### Pull Request 相关规定 diff --git a/README-en.md b/README-en.md index beeb1da6d69e..2e12d6c7076d 100644 --- a/README-en.md +++ b/README-en.md @@ -42,10 +42,10 @@ Download the resourcepack of your game version in Release page and simply apply - `phi` for setting up the Weblate server and integration with Google Translate. - `Summpot` and `Nullpinter` for a better version of the C# web scraper. - `PeakXing` for making the logo. -- `雪尼`, `FledgeXu`, `asdflj` and others who give suggestions and ideas. +- `Snownee`, `FledgeXu`, `asdflj` and others who give suggestions and ideas. - Pioneers of this project: `Aemande123`, `DYColdWind`, `Snownee`, `yuanjie000`, `forestbat`, `3TUSK`, `SihenZhang`, `MoXiaoFreak`, `gloomy_banana`, `yuanjie000`, `exia00125`, `luckyu19` for early localizations (in no particular order). - `R_liu` for the localization of SlashBalde. -- `3TUSK` for [fixing the display of full-width punctuation](./project/assets/minecraft/readme.md). This is originally involved in the pack. +- `3TUSK` for fixing the display of full-width punctuation. This is originally involved in the pack. - `LucunJi` for the internationalization of this readme file. - Finally, give thanks to every single player who engages in providing and spreading localizations. See all the contributors in the [Contributors](https://github.com/CFPAOrg/Minecraft-Mod-Language-Package/graphs/contributors) page. diff --git a/README.md b/README.md index 104ae54a4331..edca6e59be9a 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ ## 如何使用 -注意：部分[帕秋莉手册](https://www.mcmod.cn/class/1388.html)翻译需安装[帕秋莉手册加载补丁](https://www.mcmod.cn/download/8906.html)才能完整应用到游戏中。 +注意：部分版本的[帕秋莉手册](https://www.mcmod.cn/class/1388.html)翻译需安装[帕秋莉手册加载补丁](https://www.mcmod.cn/download/8906.html)才能完整应用到游戏中。 ### 选择一：安装模组（推荐） @@ -60,12 +60,12 @@ - [词源在线](https://www.etymonline.com/cn) - [汉典](https://www.zdic.net/) - [新华字典](https://www.cp.com.cn/book/506a1433-6.html)丨[现代汉语词典](https://www.cp.com.cn/book/6afc8cd8-c.html) + ### MC 相关翻译资源 - [Minecraft Wiki:译名标准化](https://zh.minecraft.wiki/w/Minecraft_Wiki:%E8%AF%91%E5%90%8D%E6%A0%87%E5%87%86%E5%8C%96)丨[译名历史](https://zh.minecraft.wiki/w/Minecraft_Wiki:%E8%AF%91%E5%90%8D%E6%A0%87%E5%87%86%E5%8C%96/%E5%8E%86%E5%8F%B2) - 原版词汇中英对照及变更记录。 - [Minecraft 中文标准译名查询](https://mcst.teahouse.team/) - 搜索原版词条在 简中/港繁/台繁/文言 中的翻译。 - [Minecraft 模组翻译参考词典](https://dict.mcmod.cn/) - 以英文检索本仓库中的翻译条目。 -- [MCBBS 的翻译讨论](https://www.mcbbs.net/forum.php?mod=forumdisplay&fid=1015&page=1&filter=typeid&typeid=2250) - 原版翻译讨论、投票、公告。 - [MC百科社群的翻译讨论](https://bbs.mcmod.cn/forum.php?mod=forumdisplay&fid=31&filter=typeid&typeid=116) - 模组翻译讨论，零散汉化发布。 ### 其他 From 7311d31117d83ba79a7d341ff7c65931491648ff Mon Sep 17 00:00:00 2001 From: Cactus_student <97865546+Cactusstudent@users.noreply.github.com> Date: Tue, 20 Aug 2024 20:23:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?Boring=20Bot=20=E9=85=8D=E7=BD=AE=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=20&=20StaleAction=20=E8=A1=A8=E8=BF=B0=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/boring-cyborg.yml | 4 ++-- .github/workflows/stale.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml index 48ffed9ead4f..29041b8a47a8 100644 --- a/.github/boring-cyborg.yml +++ b/.github/boring-cyborg.yml @@ -20,7 +20,7 @@ labelPRBasedOnFilePath: - "projects/1.20/**" - "projects/1.20-fabric/**" - Forge: + (Neo)Forge: - "projects/1.12.2/**" - "projects/1.16/**" - "projects/1.18/**" @@ -81,7 +81,7 @@ labelerFlags: firstPRWelcomeComment: | 你好贡献者，欢迎贡献本项目。请阅读 CLA Assistant 给出的《贡献者许可协议》并决定是否签署，若不签署，我们将无法接收你的贡献。 你已成功发送你在 CFPA 仓库的第一个 Pull Request！请在几分钟之后观察 CFPA-Bot 给出的内容，看是否存在报错。 - **请注意！**如果存在错误，**不要**关闭 Pull Request，几乎所有可能出现的错误都能在不关闭 Pull Request 的情况下解决。如果频繁新建/关闭 Pull Request，你可能遭到封禁。 + **请注意！** 如果存在错误，**不要**关闭 Pull Request，几乎所有可能出现的错误都能在不关闭 Pull Request 的情况下解决。如果频繁新建/关闭 Pull Request，你可能遭到封禁。 确认无误后请耐心等待审阅，并在审阅人提出意见给出答复或修改内容。 如需快速联系，请[加 QQ 群](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=b1iBq79z3h1OtJpEl8gstrhlu_oYlyl6&authKey=LgDPZAJSg2uFKjiMylQkkef9tAfTja8W4rBd5KkN6aSsYKpWKFbSqrM9GY7AoHJ7&noverify=0&group_code=630943368)：630943368 diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 3fc1ac689fad..51097e2e6569 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -15,7 +15,7 @@ jobs: with: days-before-issue-stale: -1 days-before-issue-close: -1 - stale-pr-message: "请注意回应审查人的审查意见，若 24 小时内不回应，该 PR 即将被关闭。相关规则见[贡献方针](https://github.com/CFPAOrg/Minecraft-Mod-Language-Package/blob/main/CONTRIBUTING.md#搁置规则)。" + stale-pr-message: "请注意回应审阅人的审阅意见，若 24 小时内不回应，该 PR 即将被关闭。相关规则见[贡献方针](https://github.com/CFPAOrg/Minecraft-Mod-Language-Package/blob/main/CONTRIBUTING.md#搁置规则)。" close-pr-message: "因你的回应时间超过时限，该 PR 已因搁置而被关闭。如需再次提交可重新打开（Reopen）该 PR，感谢贡献:heart:。相关规则见[贡献方针](https://github.com/CFPAOrg/Minecraft-Mod-Language-Package/blob/main/CONTRIBUTING.md#搁置规则)。" days-before-pr-stale: 7 days-before-pr-close: 1 From 9a41efb3d2287cb841ee55068b4c0f9ff12e30de Mon Sep 17 00:00:00 2001 From: Cactus_student <97865546+Cactusstudent@users.noreply.github.com> Date: Thu, 22 Aug 2024 20:17:51 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=A8=8D=E5=BE=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E6=94=B9Boring-Bot=E7=9A=84=E9=85=8D=E7=BD=AE=201.=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=201.21.x=20=E4=B8=8E=20(Neo)Forge=20=E7=9A=84=20label?= =?UTF-8?q?=202.=20=E9=87=8D=E6=96=B0=E5=88=92=E5=88=86=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=99=A8=E6=A0=87=E7=AD=BE=E7=9A=84=E5=BA=94=E7=94=A8=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=202.1=20Forge=20=E6=A0=87=E7=AD=BE=E7=8E=B0=E5=9C=A8?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BA=8E=201.12.2,=201.16,=201.18,=201.19=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=202.2=20(Neo)Forge=20=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=BA=94=E7=94=A8=E4=BA=8E=201.20,=201.21=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/boring-cyborg.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml index 29041b8a47a8..8790f6e2232d 100644 --- a/.github/boring-cyborg.yml +++ b/.github/boring-cyborg.yml @@ -19,19 +19,27 @@ labelPRBasedOnFilePath: 1.20.x: - "projects/1.20/**" - "projects/1.20-fabric/**" + + 1.21.x: + - "projects/1.21/**" + - "projects/1.21-fabric/**" - (Neo)Forge: + Forge: - "projects/1.12.2/**" - "projects/1.16/**" - "projects/1.18/**" - "projects/1.19/**" + + (Neo)Forge: - "projects/1.20/**" + - "projects/1.21/**" Fabric: - "projects/1.16-fabric/**" - "projects/1.18-fabric/**" # - "projects/1.19-fabric/**" - "projects/1.20-fabric/**" + - "projects/1.21-fabric/**" Patchouli: - "projects/**/patchouli_books/**" From 933026c6e60720825f8a4853a6861db1398966e3 Mon Sep 17 00:00:00 2001 From: SlimeSB <86453765+SlimeSB@users.noreply.github.com> Date: Fri, 23 Aug 2024 22:00:09 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E5=88=86=E6=94=AF=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/boring-cyborg.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml index 8790f6e2232d..dcf4d1d0a854 100644 --- a/.github/boring-cyborg.yml +++ b/.github/boring-cyborg.yml @@ -91,6 +91,7 @@ firstPRWelcomeComment: | 你已成功发送你在 CFPA 仓库的第一个 Pull Request！请在几分钟之后观察 CFPA-Bot 给出的内容，看是否存在报错。 **请注意！** 如果存在错误，**不要**关闭 Pull Request，几乎所有可能出现的错误都能在不关闭 Pull Request 的情况下解决。如果频繁新建/关闭 Pull Request，你可能遭到封禁。 确认无误后请耐心等待审阅，并在审阅人提出意见给出答复或修改内容。 + 若要提交多个模组，请新建一个基于 upstream/main 的分支，再向新分支提交其他模组的翻译，并发送 Pull Request。 如需快速联系，请[加 QQ 群](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=b1iBq79z3h1OtJpEl8gstrhlu_oYlyl6&authKey=LgDPZAJSg2uFKjiMylQkkef9tAfTja8W4rBd5KkN6aSsYKpWKFbSqrM9GY7AoHJ7&noverify=0&group_code=630943368)：630943368 # Comment to be posted to congratulate user on their first merged PR From 46f03fe25ace7151aca8c4b293f11c0831850940 Mon Sep 17 00:00:00 2001 From: Cactus_student <97865546+Cactusstudent@users.noreply.github.com> Date: Sat, 24 Aug 2024 14:07:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=AE=A1=E6=A0=A1=20->?= =?UTF-8?q?=20=E7=94=9F=E7=A1=AC=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ba76f22b0c7b..faf39f6e6a37 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -93,9 +93,9 @@ projects 文件夹下只标出模组所属的大版本号，其中的模组翻 - 翻译**必须**符合 [Minecraft 模组简体中文翻译规范与指南](https://cfpa.site/TransRules/)的规定。 - **拒绝**接收机器翻译（含生成式 AI）、生硬翻译。 - - 若直接提交此类翻译，该 PR 将被打上“需要自校”标签。 + - 若直接提交此类翻译，该 PR 将被打上“生硬翻译”标签。 - 若作者不及时进行有效修改，PR 可能会依照本仓库的[搁置规则](#搁置规则)处理。 -- 翻译**必须**在审查后才能进入仓库。 +- 翻译**必须**在审校后才能进入仓库。 ### Pull Request 相关规定 @@ -236,4 +236,4 @@ projects 文件夹下只标出模组所属的大版本号，其中的模组翻 ## 联系我们 -若有不明白的地方，可[前往 QQ 群](https://jq.qq.com/?_wv=1027&k=5geO1T21)（630943368）。 \ No newline at end of file +若有不明白的地方，可[前往 QQ 群](https://jq.qq.com/?_wv=1027&k=5geO1T21)（630943368）。 From 7e8d2c58723695808575eb9d1d66460eb5015c4c Mon Sep 17 00:00:00 2001 From: Cactus_student <97865546+Cactusstudent@users.noreply.github.com> Date: Sun, 8 Sep 2024 12:34:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20NeoForge=20=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index faf39f6e6a37..f2d2a121eef5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,7 +32,7 @@ Minecraft-Mod-Language-Package ├─config ---------------- // 配置文件 │ └─packer -------------- // 打包器配置文件 ├─projects -------------- // 翻译文件 - │ └─(Minecraft 版本) ---- // 不带 fabric 字样的是用于 Forge 的 + │ └─(Minecraft 版本) ---- // 不带 fabric 字样的是用于 Forge 和 NeoForge 模组的 │  └─assets │  ├─(CurseForge 项目名称) ---- // 见下 │  │ └─(命名空间) ------------- // 见下