Macaw's Windows 1.12 翻译提交 #4497

Charlotte-7414 · 2024-07-12T18:17:10Z

No description provided.

boring-cyborg · 2024-07-12T18:17:17Z

你好贡献者，欢迎贡献本项目。请阅读 CLA Assistant 给出的《贡献者许可协议》并决定是否签署，若不签署，我们将无法接收你的贡献。
你已成功发送你在 CFPA 仓库的第一个 Pull Request！请在几分钟之后观察 CFPA-Bot 给出的内容，看是否存在报错。
**请注意！**如果存在错误，不要关闭 Pull Request，几乎所有可能出现的错误都能在不关闭 Pull Request 的情况下解决。如果频繁新建/关闭 Pull Request，你可能遭到封禁。
确认无误后请耐心等待审阅，并在审阅人提出意见给出答复或修改内容。
如需快速联系，请加 QQ 群：630943368

cfpa-bot · 2024-07-12T18:17:18Z

	模组	🔗 链接	🎨 相关文件
	Macaw's Windows	🔍无源代码 \| 🟩 MCMOD \| 📁 对比(Azusa)	语言文件链接 1.12
	依赖-Fabric API	🔍无源代码 \| 🟩 MCMOD \| *	*

💾 基于此 PR 所打包的资源包：

Minecraft-Mod-Language-Package-1.12.2.zip

✔ mcwwindows Mod Domain 验证通过。
⚠ 获取 PR 中 mcwwindows-1.12.2 的中文语言文件失败。如果你在提交或更新英文语言文件，请忽略此信息。
ℹ mcwwindows-1.12.2 模组内语言文件验证通过。

🔛 Diff：

macaws-windows/1.12.2

英文	中文
Macaw's Windows	Macaw的窗户
Window Base	窗框
Window Framed Base	四格窗棂
Oak Framed Window	橡木四格窗户
Spruce Framed Window	云杉木四格窗户
Birch Framed Window	白桦木四格窗户
Jungle Framed Window	从林木木四格窗户
Acacia Framed Window	金合欢木四格窗户
Dark Oak Framed Window	深色橡木四格窗户
Oak Plank Framed Window	橡木木板四格窗户
Spruce Plank Framed Window	云杉木板四格窗户
Birch Plank Framed Window	白桦木板四格窗户
Jungle Plank Framed Window	格丛林木板四窗户
Acacia Plank Framed Window	金合欢木板四格窗户
Dark Oak Plank Framed Window	深色橡木木板四格窗户
2x1 Oak Plank Framed Window	2x1 橡木木板四格窗户
2x1 Oak Framed Window	2x1 橡木四格窗户
2x1 Spruce Plank Framed Window	2x1 云杉木板四格窗户
2x1 Spruce Framed Window	2x1 云杉木四格窗户
2x1 Birch Plank Framed Window	2x1 白桦木板四格窗户
2x1 Birch Framed Window	2x1 白桦木四格窗户
2x1 Jungle Plank Framed Window	2x1 丛林木板四格窗户
2x1 Jungle Framed Window	2x1 从林木四格窗户
2x1 Acacia Plank Framed Window	2x1 金合欢木板四格窗户
2x1 Acacia Framed Window	2x1 金合欢木四格窗户
2x1 Dark Oak Framed Plank Window	2x1 深色橡木木板四格窗户
2x1 Dark Oak Framed Window	2x1 深色橡木四格窗户
Oak Window	橡木窗户
Oak Plank Window	橡木木板窗户
Spruce Window	云杉木窗户
Spruce Plank Window	云杉木板窗户
Birch Window	白桦木窗户
Birch Plank Window	白桦木板窗户
Jungle Window	丛林木窗户
Jungle Window	从林木板窗户
Acacia Window	金合欢木窗户
Acacia Plank Window	金合欢木板窗户
Dark Oak Window	深色橡木窗户
Dark Oak Window	深色橡木木板窗户
Oak 2x1 Window	2x1 橡木窗户
Oak Plank 2x1 Window	2x1 橡木木板窗户
Spruce 2x1 Window	2x1 云杉木窗户
Sruce Plank 2x1 Window	2x1 云杉木板窗户
Birch 2x1 Window	2x1 白桦木窗户
Birch Plank 2x1 Window	2x1 白桦木板窗户
Jungle 2x1 Window	2x1 丛林木窗户
Jungle Plank 2x1 Window	2x1 从林木板窗户
Acacia 2x1 Window	2x1 金合欢木窗户
Acacia Plank 2x1 Window	2x1 金合欢木板窗户
Dark Oak 2x1 Window	2x1 深色橡木窗户
Dark Oak 2x1 Window	2x1 深色橡木木板窗户

macaws-windows/1.12.2-keys

Key	英文	中文
`itemGroup.wintab`	Macaw's Windows	Macaw的窗户
`item.window_base.name`	Window Base	窗框
`item.window_centre_bar_base.name`	Window Framed Base	四格窗棂
`tile.oak_window.name`	Oak Framed Window	橡木四格窗户
`tile.spruce_window.name`	Spruce Framed Window	云杉木四格窗户
`tile.birch_window.name`	Birch Framed Window	白桦木四格窗户
`tile.jungle_window.name`	Jungle Framed Window	从林木木四格窗户
`tile.acacia_window.name`	Acacia Framed Window	金合欢木四格窗户
`tile.dark_oak_window.name`	Dark Oak Framed Window	深色橡木四格窗户
`tile.oak_plank_window.name`	Oak Plank Framed Window	橡木木板四格窗户
`tile.spruce_plank_window.name`	Spruce Plank Framed Window	云杉木板四格窗户
`tile.birch_plank_window.name`	Birch Plank Framed Window	白桦木板四格窗户
`tile.jungle_plank_window.name`	Jungle Plank Framed Window	格丛林木板四窗户
`tile.acacia_plank_window.name`	Acacia Plank Framed Window	金合欢木板四格窗户
`tile.dark_oak_plank_window.name`	Dark Oak Plank Framed Window	深色橡木木板四格窗户
`tile.oak_planks_win_2tall.name`	2x1 Oak Plank Framed Window	2x1 橡木木板四格窗户
`tile.oak_win_2tall.name`	2x1 Oak Framed Window	2x1 橡木四格窗户
`tile.spruce_planks_win_2tall.name`	2x1 Spruce Plank Framed Window	2x1 云杉木板四格窗户
`tile.spruce_win_2tall.name`	2x1 Spruce Framed Window	2x1 云杉木四格窗户
`tile.birch_planks_win_2tall.name`	2x1 Birch Plank Framed Window	2x1 白桦木板四格窗户
`tile.birch_win_2tall.name`	2x1 Birch Framed Window	2x1 白桦木四格窗户
`tile.jungle_planks_win_2tall.name`	2x1 Jungle Plank Framed Window	2x1 丛林木板四格窗户
`tile.jungle_win_2tall.name`	2x1 Jungle Framed Window	2x1 从林木四格窗户
`tile.acacia_planks_win_2tall.name`	2x1 Acacia Plank Framed Window	2x1 金合欢木板四格窗户
`tile.acacia_win_2tall.name`	2x1 Acacia Framed Window	2x1 金合欢木四格窗户
`tile.dark_oak_planks_win_2tall.name`	2x1 Dark Oak Framed Plank Window	2x1 深色橡木木板四格窗户
`tile.dark_oak_win_2tall.name`	2x1 Dark Oak Framed Window	2x1 深色橡木四格窗户
`tile.oak_window2.name`	Oak Window	橡木窗户
`tile.oak_plank_window2.name`	Oak Plank Window	橡木木板窗户
`tile.spruce_window2.name`	Spruce Window	云杉木窗户
`tile.spruce_plank_window2.name`	Spruce Plank Window	云杉木板窗户
`tile.birch_window2.name`	Birch Window	白桦木窗户
`tile.birch_plank_window2.name`	Birch Plank Window	白桦木板窗户
`tile.jungle_window2.name`	Jungle Window	丛林木窗户
`tile.jungle_plank_window2.name`	Jungle Window	从林木板窗户
`tile.acacia_window2.name`	Acacia Window	金合欢木窗户
`tile.acacia_plank_window2.name`	Acacia Plank Window	金合欢木板窗户
`tile.dark_oak_window2.name`	Dark Oak Window	深色橡木窗户
`tile.dark_oak_plank_window2.name`	Dark Oak Window	深色橡木木板窗户
`tile.oak_window2_2tall.name`	Oak 2x1 Window	2x1 橡木窗户
`tile.oak_plank_window2_2tall.name`	Oak Plank 2x1 Window	2x1 橡木木板窗户
`tile.spruce_window2_2tall.name`	Spruce 2x1 Window	2x1 云杉木窗户
`tile.spruce_plank_window2_2tall.name`	Sruce Plank 2x1 Window	2x1 云杉木板窗户
`tile.birch_window2_2tall.name`	Birch 2x1 Window	2x1 白桦木窗户
`tile.birch_plank_window2_2tall.name`	Birch Plank 2x1 Window	2x1 白桦木板窗户
`tile.jungle_window2_2tall.name`	Jungle 2x1 Window	2x1 丛林木窗户
`tile.jungle_plank_window2_2tall.name`	Jungle Plank 2x1 Window	2x1 从林木板窗户
`tile.acacia_window2_2tall.name`	Acacia 2x1 Window	2x1 金合欢木窗户
`tile.acacia_plank_window2_2tall.name`	Acacia Plank 2x1 Window	2x1 金合欢木板窗户
`tile.dark_oak_window2_2tall.name`	Dark Oak 2x1 Window	2x1 深色橡木窗户
`tile.dark_oak_plank_window2_2tall.name`	Dark Oak 2x1 Window	2x1 深色橡木木板窗户

macaws-windows/1.12.2-术语检查

Key	英文	中文	检查结果
`tile.oak_window.name`	Oak Framed Window	橡木四格窗户	✔ 术语 oak => 橡木, 橡树
`tile.spruce_window.name`	Spruce Framed Window	云杉木四格窗户	✔ 术语 spruce => 云杉木, 云杉
`tile.birch_window.name`	Birch Framed Window	白桦木四格窗户	✔ 术语 birch => 白桦木, 白桦
`tile.jungle_window.name`	Jungle Framed Window	从林木木四格窗户	⚠ 术语异常 jungle => 丛林 ⚠ 术语异常 jungle => 丛林木, 丛林
`tile.acacia_window.name`	Acacia Framed Window	金合欢木四格窗户	✔ 术语 acacia => 金合欢木, 金合欢
`tile.dark_oak_window.name`	Dark Oak Framed Window	深色橡木四格窗户	✔ 术语 dark oak => 深色橡木, 深色橡树 ✔ 术语 oak => 橡木, 橡树
`tile.oak_plank_window.name`	Oak Plank Framed Window	橡木木板四格窗户	✔ 术语 plank => 木板 ✔ 术语 oak => 橡木, 橡树
`tile.spruce_plank_window.name`	Spruce Plank Framed Window	云杉木板四格窗户	✔ 术语 plank => 木板 ✔ 术语 spruce => 云杉木, 云杉
`tile.birch_plank_window.name`	Birch Plank Framed Window	白桦木板四格窗户	✔ 术语 plank => 木板 ✔ 术语 birch => 白桦木, 白桦
`tile.jungle_plank_window.name`	Jungle Plank Framed Window	格丛林木板四窗户	✔ 术语 plank => 木板 ✔ 术语 jungle => 丛林 ✔ 术语 jungle => 丛林木, 丛林
`tile.acacia_plank_window.name`	Acacia Plank Framed Window	金合欢木板四格窗户	✔ 术语 plank => 木板 ✔ 术语 acacia => 金合欢木, 金合欢
`tile.dark_oak_plank_window.name`	Dark Oak Plank Framed Window	深色橡木木板四格窗户	✔ 术语 plank => 木板 ✔ 术语 dark oak => 深色橡木, 深色橡树 ✔ 术语 oak => 橡木, 橡树
`tile.oak_planks_win_2tall.name`	2x1 Oak Plank Framed Window	2x1 橡木木板四格窗户	✔ 术语 plank => 木板 ✔ 术语 oak => 橡木, 橡树
`tile.oak_win_2tall.name`	2x1 Oak Framed Window	2x1 橡木四格窗户	✔ 术语 oak => 橡木, 橡树
`tile.spruce_planks_win_2tall.name`	2x1 Spruce Plank Framed Window	2x1 云杉木板四格窗户	✔ 术语 plank => 木板 ✔ 术语 spruce => 云杉木, 云杉
`tile.spruce_win_2tall.name`	2x1 Spruce Framed Window	2x1 云杉木四格窗户	✔ 术语 spruce => 云杉木, 云杉
`tile.birch_planks_win_2tall.name`	2x1 Birch Plank Framed Window	2x1 白桦木板四格窗户	✔ 术语 plank => 木板 ✔ 术语 birch => 白桦木, 白桦
`tile.birch_win_2tall.name`	2x1 Birch Framed Window	2x1 白桦木四格窗户	✔ 术语 birch => 白桦木, 白桦
`tile.jungle_planks_win_2tall.name`	2x1 Jungle Plank Framed Window	2x1 丛林木板四格窗户	✔ 术语 plank => 木板 ✔ 术语 jungle => 丛林 ✔ 术语 jungle => 丛林木, 丛林
`tile.jungle_win_2tall.name`	2x1 Jungle Framed Window	2x1 从林木四格窗户	⚠ 术语异常 jungle => 丛林 ⚠ 术语异常 jungle => 丛林木, 丛林
`tile.acacia_planks_win_2tall.name`	2x1 Acacia Plank Framed Window	2x1 金合欢木板四格窗户	✔ 术语 plank => 木板 ✔ 术语 acacia => 金合欢木, 金合欢
`tile.acacia_win_2tall.name`	2x1 Acacia Framed Window	2x1 金合欢木四格窗户	✔ 术语 acacia => 金合欢木, 金合欢
`tile.dark_oak_planks_win_2tall.name`	2x1 Dark Oak Framed Plank Window	2x1 深色橡木木板四格窗户	✔ 术语 plank => 木板 ✔ 术语 dark oak => 深色橡木, 深色橡树 ✔ 术语 oak => 橡木, 橡树
`tile.dark_oak_win_2tall.name`	2x1 Dark Oak Framed Window	2x1 深色橡木四格窗户	✔ 术语 dark oak => 深色橡木, 深色橡树 ✔ 术语 oak => 橡木, 橡树
`tile.oak_window2.name`	Oak Window	橡木窗户	✔ 术语 oak => 橡木, 橡树
`tile.oak_plank_window2.name`	Oak Plank Window	橡木木板窗户	✔ 术语 plank => 木板 ✔ 术语 oak => 橡木, 橡树
`tile.spruce_window2.name`	Spruce Window	云杉木窗户	✔ 术语 spruce => 云杉木, 云杉
`tile.spruce_plank_window2.name`	Spruce Plank Window	云杉木板窗户	✔ 术语 plank => 木板 ✔ 术语 spruce => 云杉木, 云杉
`tile.birch_window2.name`	Birch Window	白桦木窗户	✔ 术语 birch => 白桦木, 白桦
`tile.birch_plank_window2.name`	Birch Plank Window	白桦木板窗户	✔ 术语 plank => 木板 ✔ 术语 birch => 白桦木, 白桦
`tile.jungle_window2.name`	Jungle Window	丛林木窗户	✔ 术语 jungle => 丛林 ✔ 术语 jungle => 丛林木, 丛林
`tile.jungle_plank_window2.name`	Jungle Window	从林木板窗户	⚠ 术语异常 jungle => 丛林 ⚠ 术语异常 jungle => 丛林木, 丛林
`tile.acacia_window2.name`	Acacia Window	金合欢木窗户	✔ 术语 acacia => 金合欢木, 金合欢
`tile.acacia_plank_window2.name`	Acacia Plank Window	金合欢木板窗户	✔ 术语 plank => 木板 ✔ 术语 acacia => 金合欢木, 金合欢
`tile.dark_oak_window2.name`	Dark Oak Window	深色橡木窗户	✔ 术语 dark oak => 深色橡木, 深色橡树 ✔ 术语 oak => 橡木, 橡树
`tile.dark_oak_plank_window2.name`	Dark Oak Window	深色橡木木板窗户	✔ 术语 dark oak => 深色橡木, 深色橡树 ✔ 术语 oak => 橡木, 橡树
`tile.oak_window2_2tall.name`	Oak 2x1 Window	2x1 橡木窗户	✔ 术语 oak => 橡木, 橡树
`tile.oak_plank_window2_2tall.name`	Oak Plank 2x1 Window	2x1 橡木木板窗户	✔ 术语 plank => 木板 ✔ 术语 oak => 橡木, 橡树
`tile.spruce_window2_2tall.name`	Spruce 2x1 Window	2x1 云杉木窗户	✔ 术语 spruce => 云杉木, 云杉
`tile.spruce_plank_window2_2tall.name`	Sruce Plank 2x1 Window	2x1 云杉木板窗户	✔ 术语 plank => 木板
`tile.birch_window2_2tall.name`	Birch 2x1 Window	2x1 白桦木窗户	✔ 术语 birch => 白桦木, 白桦
`tile.birch_plank_window2_2tall.name`	Birch Plank 2x1 Window	2x1 白桦木板窗户	✔ 术语 plank => 木板 ✔ 术语 birch => 白桦木, 白桦
`tile.jungle_window2_2tall.name`	Jungle 2x1 Window	2x1 丛林木窗户	✔ 术语 jungle => 丛林 ✔ 术语 jungle => 丛林木, 丛林
`tile.jungle_plank_window2_2tall.name`	Jungle Plank 2x1 Window	2x1 从林木板窗户	✔ 术语 plank => 木板 ⚠ 术语异常 jungle => 丛林 ⚠ 术语异常 jungle => 丛林木, 丛林
`tile.acacia_window2_2tall.name`	Acacia 2x1 Window	2x1 金合欢木窗户	✔ 术语 acacia => 金合欢木, 金合欢
`tile.acacia_plank_window2_2tall.name`	Acacia Plank 2x1 Window	2x1 金合欢木板窗户	✔ 术语 plank => 木板 ✔ 术语 acacia => 金合欢木, 金合欢
`tile.dark_oak_window2_2tall.name`	Dark Oak 2x1 Window	2x1 深色橡木窗户	✔ 术语 dark oak => 深色橡木, 深色橡树 ✔ 术语 oak => 橡木, 橡树
`tile.dark_oak_plank_window2_2tall.name`	Dark Oak 2x1 Window	2x1 深色橡木木板窗户	✔ 术语 dark oak => 深色橡木, 深色橡树 ✔ 术语 oak => 橡木, 橡树

ℹ 机器人的命令列表

🔄 勾选这个复选框来强制刷新

Charlotte-7414 · 2024-07-12T18:20:31Z

我这样提交...对吗？希望没有弄错。

luoxueyasha · 2024-07-16T08:43:11Z

~~需要上传英文文件~~
眼瞎库里有英文了

建议参考#3795 的翻译（也欢迎去那边审核

projects/1.12.2/assets/macaws-windows/mcwwindows/lang/zh_cn.lang

luoxueyasha · 2024-11-06T13:22:58Z

7+7时限进入第一阶段，从该评论发出的时间开始计时，届时请注意查看审查意见。若在7天内仍未做出任何实质性回应，则7+7时限自动进入下一阶段。

@Charlotte-7414

Charlotte-7414 · 2024-11-06T15:48:31Z

游戏截图，如果2x1不合适我可以修改
更新：
(2x1) --木(板)(四格)窗户
修正：
窗架 → 窗框
四格窗架 → 四格窗棂
@luoxueyasha
抱歉这么晚才修改，之前没找到方法修改（太蠢了），然后想着之后再弄，结果忘了这么久(＃°Д°)

Charlotte-7414 · 2024-11-06T16:01:27Z

tile.dark_oak_plank_window2.name=深色橡木木板窗户
这个也修正了一下，原来是2x1的，因为原版的.lang文件里也是这个位置，不小心看错了0.0

luoxueyasha · 2024-11-06T22:41:08Z

主要是跨版本和#3795 同步。

Charlotte-7414 · 2024-11-07T11:05:25Z

主要是跨版本和#3795 同步。

完全同步了，窗棂就是参考的#3795，2x1的窗户是高版本没有的

luoxueyasha · 2024-11-07T11:54:27Z

主要是跨版本和#3795 同步。

完全同步了，窗棂就是参考的#3795，2x1的窗户是高版本没有的

这个2x1指的是？可推拉？
要不要考虑推拉窗这种命名（仅建议）

Charlotte-7414 · 2024-11-07T12:10:40Z

主要是跨版本和#3795 同步。

完全同步了，窗棂就是参考的#3795，2x1的窗户是高版本没有的

这个2x1指的是？可推拉？要不要考虑推拉窗这种命名（仅建议）

我觉得遵循原版英语比较好一些，确实就是一个2格高的窗户，像门一样。推拉窗可能会造成部分误解

boring-cyborg · 2024-11-09T10:23:29Z

干得好！你在 CFPA 的第一份翻译已成功入库，将在次日通过自动汉化更新模组分发给广大玩家。

提交 macaws-windows 模组翻译

e5ca29a

boring-cyborg bot added 1.12.x Minecraft 版本标签 Forge 包含 Forge 模组 labels Jul 12, 2024

cfpa-bot bot added the 40+ 行数标签 label Jul 12, 2024

luoxueyasha added the 需要作者操作如作者未签署 CLA label Jul 16, 2024

zh_cn.lang

203a305

luoxueyasha removed the 需要作者操作如作者未签署 CLA label Aug 7, 2024

luoxueyasha reviewed Oct 13, 2024

View reviewed changes

cfpa-bot bot mentioned this pull request Oct 13, 2024

Macaw's Windows 翻译更新 #3795

Merged

cfpa-bot bot mentioned this pull request Oct 20, 2024

Macaws 系列本体更新与改组合文件 #4734

Merged

luoxueyasha added the 即将被搁置在加上本标签后7内若无进一步动作，PR 将被关闭 label Nov 6, 2024

Update zh_cn.lang

a80bb7e

luoxueyasha removed the 即将被搁置在加上本标签后7内若无进一步动作，PR 将被关闭 label Nov 6, 2024

luoxueyasha approved these changes Nov 7, 2024

View reviewed changes

luoxueyasha added the 即将合并在此标签被添加的 24 小时后 Pull Request 才可被合并 label Nov 7, 2024

SlimeSB changed the title ~~提交 macaws-windows 模组翻译~~ Macaw's Windows 1.12 翻译提交 Nov 7, 2024

SlimeSB merged commit 7ec7753 into CFPAOrg:main Nov 9, 2024
13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Macaw's Windows 1.12 翻译提交 #4497

Macaw's Windows 1.12 翻译提交 #4497

Charlotte-7414 commented Jul 12, 2024

boring-cyborg bot commented Jul 12, 2024

cfpa-bot bot commented Jul 12, 2024 •

edited

Loading

Charlotte-7414 commented Jul 12, 2024

luoxueyasha commented Jul 16, 2024 •

edited

Loading

luoxueyasha commented Nov 6, 2024

Charlotte-7414 commented Nov 6, 2024

Charlotte-7414 commented Nov 6, 2024

luoxueyasha commented Nov 6, 2024

Charlotte-7414 commented Nov 7, 2024

luoxueyasha commented Nov 7, 2024

Charlotte-7414 commented Nov 7, 2024

boring-cyborg bot commented Nov 9, 2024

Macaw's Windows 1.12 翻译提交 #4497

Macaw's Windows 1.12 翻译提交 #4497

Conversation

Charlotte-7414 commented Jul 12, 2024

boring-cyborg bot commented Jul 12, 2024

cfpa-bot bot commented Jul 12, 2024 • edited Loading

Charlotte-7414 commented Jul 12, 2024

luoxueyasha commented Jul 16, 2024 • edited Loading

luoxueyasha commented Nov 6, 2024

Charlotte-7414 commented Nov 6, 2024

Charlotte-7414 commented Nov 6, 2024

luoxueyasha commented Nov 6, 2024

Charlotte-7414 commented Nov 7, 2024

luoxueyasha commented Nov 7, 2024

Charlotte-7414 commented Nov 7, 2024

boring-cyborg bot commented Nov 9, 2024

cfpa-bot bot commented Jul 12, 2024 •

edited

Loading

luoxueyasha commented Jul 16, 2024 •

edited

Loading