Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Macaw's Roofs 翻译更新与 Macaw 系列译名标准化 #2715

Merged
merged 3 commits into from
Feb 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions projects/1.16/assets/macaws-roofs/mcwroofs/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -348,34 +348,44 @@
"block.mcwroofs.white_steep_roof": "White Steep Base Roof",
"block.mcwroofs.white_upper_lower_roof": "White Lower Top Roof",
"block.mcwroofs.white_upper_steep_roof": "White Steep Top Roof",
"block.mcwroofs.white_roof_block": "White Roof Block",
"block.mcwroofs.white_roof_slab": "White Roof Slab",
"block.mcwroofs.light_gray_roof": "Light Gray Roof",
"block.mcwroofs.light_gray_attic_roof": "Light Gray Attic Roof",
"block.mcwroofs.light_gray_top_roof": "Light Gray Top Roof",
"block.mcwroofs.light_gray_lower_roof": "Light Gray Lower Base Roof",
"block.mcwroofs.light_gray_steep_roof": "Light Gray Steep Base Roof",
"block.mcwroofs.light_gray_upper_lower_roof": "Light Gray Lower Top Roof",
"block.mcwroofs.light_gray_upper_steep_roof": "Light Gray Steep Top Roof",
"block.mcwroofs.light_gray_roof_block": "Light Gray Roof Block",
"block.mcwroofs.light_gray_roof_slab": "Light Gray Roof Slab",
"block.mcwroofs.gray_roof": "Gray Roof",
"block.mcwroofs.gray_attic_roof": "Gray Attic Roof",
"block.mcwroofs.gray_top_roof": "Gray Top Roof",
"block.mcwroofs.gray_lower_roof": "Gray Lower Base Roof",
"block.mcwroofs.gray_steep_roof": "Gray Steep Base Roof",
"block.mcwroofs.gray_upper_lower_roof": "Gray Lower Top Roof",
"block.mcwroofs.gray_upper_steep_roof": "Gray Steep Top Roof",
"block.mcwroofs.gray_roof_block": "Gray Roof Block",
"block.mcwroofs.gray_roof_slab": "Gray Roof Slab",
"block.mcwroofs.black_roof": "Black Roof",
"block.mcwroofs.black_attic_roof": "Black Attic Roof",
"block.mcwroofs.black_top_roof": "Black Top Roof",
"block.mcwroofs.black_lower_roof": "Black Lower Base Roof",
"block.mcwroofs.black_steep_roof": "Black Steep Base Roof",
"block.mcwroofs.black_upper_lower_roof": "Black Lower Top Roof",
"block.mcwroofs.black_upper_steep_roof": "Black Steep Top Roof",
"block.mcwroofs.black_roof_block": "Black Roof Block",
"block.mcwroofs.black_roof_slab": "Black Roof Slab",
"block.mcwroofs.base_roof": "Base Roof",
"block.mcwroofs.base_attic_roof": "Base Attic Roof",
"block.mcwroofs.base_top_roof": "Base Top Roof",
"block.mcwroofs.base_lower_roof": "Base Lower Base Roof",
"block.mcwroofs.base_steep_roof": "Base Steep Base Roof",
"block.mcwroofs.base_upper_lower_roof": "Base Lower Top Roof",
"block.mcwroofs.base_upper_steep_roof": "Base Steep Top Roof",
"block.mcwroofs.base_roof_block": "Base Roof Block",
"block.mcwroofs.base_roof_slab": "Base Roof Slab",
"block.mcwroofs.stone_roof": "Stone Roof",
"block.mcwroofs.stone_attic_roof": "Stone Attic Roof",
"block.mcwroofs.stone_top_roof": "Stone Top Roof",
Expand Down Expand Up @@ -439,20 +449,27 @@
"block.mcwroofs.blackstone_steep_roof": "Blackstone Steep Base Roof",
"block.mcwroofs.blackstone_upper_lower_roof": "Blackstone Lower Top Roof",
"block.mcwroofs.blackstone_upper_steep_roof": "Blackstone Steep Top Roof",
"block.mcwroofs.deepslate_roof": "Deepslate Roof",
"block.mcwroofs.deepslate_attic_roof": "Deepslate Attic Roof",
"block.mcwroofs.deepslate_top_roof": "Deepslate Top Roof",
"block.mcwroofs.deepslate_lower_roof": "Deepslate Lower Base Roof",
"block.mcwroofs.deepslate_steep_roof": "Deepslate Steep Base Roof",
"block.mcwroofs.deepslate_upper_lower_roof": "Deepslate Lower Top Roof",
"block.mcwroofs.deepslate_upper_steep_roof": "Deepslate Steep Top Roof",
"block.mcwroofs.thatch_roof": "Thatch Roof",
"block.mcwroofs.thatch_attic_roof": "Thatch Attic Roof",
"block.mcwroofs.thatch_top_roof": "Thatch Top Roof",
"block.mcwroofs.thatch_lower_roof": "Thatch Lower Base Roof",
"block.mcwroofs.thatch_steep_roof": "Thatch Steep Base Roof",
"block.mcwroofs.thatch_upper_lower_roof": "Thatch Lower Top Roof",
"block.mcwroofs.thatch_upper_steep_roof": "Thatch Steep Top Roof",
"block.mcwroofs.prismarine_brick_roof": "Prismarine Brick Roof",
"block.mcwroofs.prismarine_brick_attic_roof": "Prismarine Brick Attic Roof",
"block.mcwroofs.prismarine_brick_top_roof": "Prismarine Brick Top Roof",
"block.mcwroofs.prismarine_brick_lower_roof": "Prismarine Brick Lower Base Roof",
"block.mcwroofs.prismarine_brick_steep_roof": "Prismarine Brick Steep Base Roof",
"block.mcwroofs.prismarine_brick_upper_lower_roof": "Prismarine Brick Lower Top Roof",
"block.mcwroofs.prismarine_brick_upper_steep_roof": "Prismarine Brick Steep Top Roof",
"block.mcwroofs.dark_prismarine_roof": "Dark Prismarine Roof",
"block.mcwroofs.dark_prismarine_attic_roof": "Dark Prismarine Attic Roof",
"block.mcwroofs.dark_prismarine_top_roof": "Dark Prismarine Top Roof",
"block.mcwroofs.dark_prismarine_lower_roof": "Dark Prismarine Lower Base Roof",
"block.mcwroofs.dark_prismarine_steep_roof": "Dark Prismarine Steep Base Roof",
"block.mcwroofs.dark_prismarine_upper_lower_roof": "Dark Prismarine Lower Top Roof",
"block.mcwroofs.dark_prismarine_upper_steep_roof": "Dark Prismarine Steep Top Roof",
"block.mcwroofs.black_striped_awning": "Black Striped Awning",
"block.mcwroofs.blue_striped_awning": "Blue Striped Awning",
"block.mcwroofs.brown_striped_awning": "Brown Striped Awning",
Expand Down
31 changes: 24 additions & 7 deletions projects/1.16/assets/macaws-roofs/mcwroofs/lang/zh_cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -348,34 +348,44 @@
"block.mcwroofs.white_steep_roof": "白色陡峭屋顶底端",
"block.mcwroofs.white_upper_lower_roof": "白色平缓屋顶顶端",
"block.mcwroofs.white_upper_steep_roof": "白色陡峭屋顶顶端",
"block.mcwroofs.white_roof_block": "白色屋顶方块",
"block.mcwroofs.white_roof_slab": "白色屋顶台阶",
"block.mcwroofs.light_gray_roof": "淡灰色屋顶",
"block.mcwroofs.light_gray_attic_roof": "淡灰色天窗屋顶",
"block.mcwroofs.light_gray_top_roof": "淡灰色屋顶顶端",
"block.mcwroofs.light_gray_lower_roof": "淡灰色平缓屋顶底端",
"block.mcwroofs.light_gray_steep_roof": "淡灰色陡峭屋顶底端",
"block.mcwroofs.light_gray_upper_lower_roof": "淡灰色平缓屋顶顶端",
"block.mcwroofs.light_gray_upper_steep_roof": "淡灰色陡峭屋顶顶端",
"block.mcwroofs.light_gray_roof_block": "淡灰色屋顶方块",
"block.mcwroofs.light_gray_roof_slab": "淡灰色屋顶台阶",
"block.mcwroofs.gray_roof": "灰色屋顶",
"block.mcwroofs.gray_attic_roof": "灰色天窗屋顶",
"block.mcwroofs.gray_top_roof": "灰色屋顶顶端",
"block.mcwroofs.gray_lower_roof": "灰色平缓屋顶底端",
"block.mcwroofs.gray_steep_roof": "灰色陡峭屋顶底端",
"block.mcwroofs.gray_upper_lower_roof": "灰色平缓屋顶顶端",
"block.mcwroofs.gray_upper_steep_roof": "灰色陡峭屋顶顶端",
"block.mcwroofs.gray_roof_block": "灰色屋顶方块",
"block.mcwroofs.gray_roof_slab": "灰色屋顶台阶",
"block.mcwroofs.black_roof": "黑色屋顶",
"block.mcwroofs.black_attic_roof": "黑色天窗屋顶",
"block.mcwroofs.black_top_roof": "黑色屋顶顶端",
"block.mcwroofs.black_lower_roof": "黑色平缓屋顶底端",
"block.mcwroofs.black_steep_roof": "黑色陡峭屋顶底端",
"block.mcwroofs.black_upper_lower_roof": "黑色平缓屋顶顶端",
"block.mcwroofs.black_upper_steep_roof": "黑色陡峭屋顶顶端",
"block.mcwroofs.black_roof_block": "黑色屋顶方块",
"block.mcwroofs.black_roof_slab": "黑色屋顶台阶",
"block.mcwroofs.base_roof": "基本款屋顶",
"block.mcwroofs.base_attic_roof": "基本款天窗屋顶",
"block.mcwroofs.base_top_roof": "基本款屋顶顶端",
"block.mcwroofs.base_lower_roof": "基本款平缓屋顶底端",
"block.mcwroofs.base_steep_roof": "基本款陡峭屋顶底端",
"block.mcwroofs.base_upper_lower_roof": "基本款平缓屋顶顶端",
"block.mcwroofs.base_upper_steep_roof": "基本款陡峭屋顶顶端",
"block.mcwroofs.base_roof_block": "基本款屋顶方块",
"block.mcwroofs.base_roof_slab": "基本款屋顶台阶",
"block.mcwroofs.stone_roof": "石头屋顶",
"block.mcwroofs.stone_attic_roof": "石头天窗屋顶",
"block.mcwroofs.stone_top_roof": "石头屋顶顶端",
Expand Down Expand Up @@ -439,20 +449,27 @@
"block.mcwroofs.blackstone_steep_roof": "黑石陡峭屋顶底端",
"block.mcwroofs.blackstone_upper_lower_roof": "黑石平缓屋顶顶端",
"block.mcwroofs.blackstone_upper_steep_roof": "黑石陡峭屋顶顶端",
"block.mcwroofs.deepslate_roof": "深板岩屋顶",
"block.mcwroofs.deepslate_attic_roof": "深板岩天窗屋顶",
"block.mcwroofs.deepslate_top_roof": "深板岩屋顶顶端",
"block.mcwroofs.deepslate_lower_roof": "深板岩平缓屋顶底端",
"block.mcwroofs.deepslate_steep_roof": "深板岩陡峭屋顶底端",
"block.mcwroofs.deepslate_upper_lower_roof": "深板岩平缓屋顶顶端",
"block.mcwroofs.deepslate_upper_steep_roof": "深板岩陡峭屋顶顶端",
"block.mcwroofs.thatch_roof": "干草屋顶",
"block.mcwroofs.thatch_attic_roof": "干草天窗屋顶",
"block.mcwroofs.thatch_top_roof": "干草屋顶顶端",
"block.mcwroofs.thatch_lower_roof": "干草平缓屋顶底端",
"block.mcwroofs.thatch_steep_roof": "干草陡峭屋顶底端",
"block.mcwroofs.thatch_upper_lower_roof": "干草平缓屋顶顶端",
"block.mcwroofs.thatch_upper_steep_roof": "干草陡峭屋顶顶端",
"block.mcwroofs.prismarine_brick_roof": "海晶石砖屋顶",
"block.mcwroofs.prismarine_brick_attic_roof": "海晶石砖天窗屋顶",
"block.mcwroofs.prismarine_brick_top_roof": "海晶石砖屋顶顶端",
"block.mcwroofs.prismarine_brick_lower_roof": "海晶石砖平缓屋顶底端",
"block.mcwroofs.prismarine_brick_steep_roof": "海晶石砖陡峭屋顶底端",
"block.mcwroofs.prismarine_brick_upper_lower_roof": "海晶石砖平缓屋顶顶端",
"block.mcwroofs.prismarine_brick_upper_steep_roof": "海晶石砖陡峭屋顶顶端",
"block.mcwroofs.dark_prismarine_roof": "暗海晶石屋顶",
"block.mcwroofs.dark_prismarine_attic_roof": "暗海晶石天窗屋顶",
"block.mcwroofs.dark_prismarine_top_roof": "暗海晶石屋顶顶端",
"block.mcwroofs.dark_prismarine_lower_roof": "暗海晶石平缓屋顶底端",
"block.mcwroofs.dark_prismarine_steep_roof": "暗海晶石陡峭屋顶底端",
"block.mcwroofs.dark_prismarine_upper_lower_roof": "暗海晶石平缓屋顶顶端",
"block.mcwroofs.dark_prismarine_upper_steep_roof": "暗海晶石陡峭屋顶顶端",
"block.mcwroofs.black_striped_awning": "黑色条纹顶棚",
"block.mcwroofs.blue_striped_awning": "蓝色条纹顶棚",
"block.mcwroofs.brown_striped_awning": "棕色条纹顶棚",
Expand Down
45 changes: 45 additions & 0 deletions projects/1.18/assets/macaws-roofs/mcwroofs/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@
"block.mcwroofs.warped_steep_roof": "Warped Steep Base Roof",
"block.mcwroofs.warped_upper_lower_roof": "Warped Lower Top Roof",
"block.mcwroofs.warped_upper_steep_roof": "Warped Steep Top Roof",
"block.mcwroofs.mangrove_roof": "Mangrove Roof",
"block.mcwroofs.mangrove_attic_roof": "Mangrove Attic Roof",
"block.mcwroofs.mangrove_top_roof": "Mangrove Top Roof",
"block.mcwroofs.mangrove_lower_roof": "Mangrove Lower Base Roof",
"block.mcwroofs.mangrove_steep_roof": "Mangrove Steep Base Roof",
"block.mcwroofs.mangrove_upper_lower_roof": "Mangrove Lower Top Roof",
"block.mcwroofs.mangrove_upper_steep_roof": "Mangrove Steep Top Roof",
"block.mcwroofs.oak_planks_roof": "Oak Planks Roof",
"block.mcwroofs.oak_planks_attic_roof": "Oak Planks Attic Roof",
"block.mcwroofs.oak_planks_top_roof": "Oak Planks Top Roof",
Expand Down Expand Up @@ -117,6 +124,13 @@
"block.mcwroofs.warped_planks_steep_roof": "Warped Planks Steep Base Roof",
"block.mcwroofs.warped_planks_upper_lower_roof": "Warped Planks Lower Top Roof",
"block.mcwroofs.warped_planks_upper_steep_roof": "Warped Planks Steep Top Roof",
"block.mcwroofs.mangrove_planks_roof": "Mangrove Planks Roof",
"block.mcwroofs.mangrove_planks_attic_roof": "Mangrove Planks Attic Roof",
"block.mcwroofs.mangrove_planks_top_roof": "Mangrove Planks Top Roof",
"block.mcwroofs.mangrove_planks_lower_roof": "Mangrove Planks Lower Base Roof",
"block.mcwroofs.mangrove_planks_steep_roof": "Mangrove Planks Steep Base Roof",
"block.mcwroofs.mangrove_planks_upper_lower_roof": "Mangrove Planks Lower Top Roof",
"block.mcwroofs.mangrove_planks_upper_steep_roof": "Mangrove Planks Steep Top Roof",
"block.mcwroofs.white_terracotta_roof": "White Terracotta Roof",
"block.mcwroofs.white_terracotta_attic_roof": "White Terracotta Attic Roof",
"block.mcwroofs.white_terracotta_top_roof": "White Terracotta Top Roof",
Expand Down Expand Up @@ -348,34 +362,44 @@
"block.mcwroofs.white_steep_roof": "White Steep Base Roof",
"block.mcwroofs.white_upper_lower_roof": "White Lower Top Roof",
"block.mcwroofs.white_upper_steep_roof": "White Steep Top Roof",
"block.mcwroofs.white_roof_block": "White Roof Block",
"block.mcwroofs.white_roof_slab": "White Roof Slab",
"block.mcwroofs.light_gray_roof": "Light Gray Roof",
"block.mcwroofs.light_gray_attic_roof": "Light Gray Attic Roof",
"block.mcwroofs.light_gray_top_roof": "Light Gray Top Roof",
"block.mcwroofs.light_gray_lower_roof": "Light Gray Lower Base Roof",
"block.mcwroofs.light_gray_steep_roof": "Light Gray Steep Base Roof",
"block.mcwroofs.light_gray_upper_lower_roof": "Light Gray Lower Top Roof",
"block.mcwroofs.light_gray_upper_steep_roof": "Light Gray Steep Top Roof",
"block.mcwroofs.light_gray_roof_block": "Light Gray Roof Block",
"block.mcwroofs.light_gray_roof_slab": "Light Gray Roof Slab",
"block.mcwroofs.gray_roof": "Gray Roof",
"block.mcwroofs.gray_attic_roof": "Gray Attic Roof",
"block.mcwroofs.gray_top_roof": "Gray Top Roof",
"block.mcwroofs.gray_lower_roof": "Gray Lower Base Roof",
"block.mcwroofs.gray_steep_roof": "Gray Steep Base Roof",
"block.mcwroofs.gray_upper_lower_roof": "Gray Lower Top Roof",
"block.mcwroofs.gray_upper_steep_roof": "Gray Steep Top Roof",
"block.mcwroofs.gray_roof_block": "Gray Roof Block",
"block.mcwroofs.gray_roof_slab": "Gray Roof Slab",
"block.mcwroofs.black_roof": "Black Roof",
"block.mcwroofs.black_attic_roof": "Black Attic Roof",
"block.mcwroofs.black_top_roof": "Black Top Roof",
"block.mcwroofs.black_lower_roof": "Black Lower Base Roof",
"block.mcwroofs.black_steep_roof": "Black Steep Base Roof",
"block.mcwroofs.black_upper_lower_roof": "Black Lower Top Roof",
"block.mcwroofs.black_upper_steep_roof": "Black Steep Top Roof",
"block.mcwroofs.black_roof_block": "Black Roof Block",
"block.mcwroofs.black_roof_slab": "Black Roof Slab",
"block.mcwroofs.base_roof": "Base Roof",
"block.mcwroofs.base_attic_roof": "Base Attic Roof",
"block.mcwroofs.base_top_roof": "Base Top Roof",
"block.mcwroofs.base_lower_roof": "Base Lower Base Roof",
"block.mcwroofs.base_steep_roof": "Base Steep Base Roof",
"block.mcwroofs.base_upper_lower_roof": "Base Lower Top Roof",
"block.mcwroofs.base_upper_steep_roof": "Base Steep Top Roof",
"block.mcwroofs.base_roof_block": "Base Roof Block",
"block.mcwroofs.base_roof_slab": "Base Roof Slab",
"block.mcwroofs.stone_roof": "Stone Roof",
"block.mcwroofs.stone_attic_roof": "Stone Attic Roof",
"block.mcwroofs.stone_top_roof": "Stone Top Roof",
Expand Down Expand Up @@ -446,13 +470,34 @@
"block.mcwroofs.deepslate_steep_roof": "Deepslate Steep Base Roof",
"block.mcwroofs.deepslate_upper_lower_roof": "Deepslate Lower Top Roof",
"block.mcwroofs.deepslate_upper_steep_roof": "Deepslate Steep Top Roof",
"block.mcwroofs.mud_brick_roof": "Mud Brick Roof",
"block.mcwroofs.mud_brick_attic_roof": "Mud Brick Attic Roof",
"block.mcwroofs.mud_brick_top_roof": "Mud Brick Top Roof",
"block.mcwroofs.mud_brick_lower_roof": "Mud Brick Lower Base Roof",
"block.mcwroofs.mud_brick_steep_roof": "Mud Brick Steep Base Roof",
"block.mcwroofs.mud_brick_upper_lower_roof": "Mud Brick Lower Top Roof",
"block.mcwroofs.mud_brick_upper_steep_roof": "Mud Brick Steep Top Roof",
"block.mcwroofs.thatch_roof": "Thatch Roof",
"block.mcwroofs.thatch_attic_roof": "Thatch Attic Roof",
"block.mcwroofs.thatch_top_roof": "Thatch Top Roof",
"block.mcwroofs.thatch_lower_roof": "Thatch Lower Base Roof",
"block.mcwroofs.thatch_steep_roof": "Thatch Steep Base Roof",
"block.mcwroofs.thatch_upper_lower_roof": "Thatch Lower Top Roof",
"block.mcwroofs.thatch_upper_steep_roof": "Thatch Steep Top Roof",
"block.mcwroofs.prismarine_brick_roof": "Prismarine Brick Roof",
"block.mcwroofs.prismarine_brick_attic_roof": "Prismarine Brick Attic Roof",
"block.mcwroofs.prismarine_brick_top_roof": "Prismarine Brick Top Roof",
"block.mcwroofs.prismarine_brick_lower_roof": "Prismarine Brick Lower Base Roof",
"block.mcwroofs.prismarine_brick_steep_roof": "Prismarine Brick Steep Base Roof",
"block.mcwroofs.prismarine_brick_upper_lower_roof": "Prismarine Brick Lower Top Roof",
"block.mcwroofs.prismarine_brick_upper_steep_roof": "Prismarine Brick Steep Top Roof",
"block.mcwroofs.dark_prismarine_roof": "Dark Prismarine Roof",
"block.mcwroofs.dark_prismarine_attic_roof": "Dark Prismarine Attic Roof",
"block.mcwroofs.dark_prismarine_top_roof": "Dark Prismarine Top Roof",
"block.mcwroofs.dark_prismarine_lower_roof": "Dark Prismarine Lower Base Roof",
"block.mcwroofs.dark_prismarine_steep_roof": "Dark Prismarine Steep Base Roof",
"block.mcwroofs.dark_prismarine_upper_lower_roof": "Dark Prismarine Lower Top Roof",
"block.mcwroofs.dark_prismarine_upper_steep_roof": "Dark Prismarine Steep Top Roof",
"block.mcwroofs.black_striped_awning": "Black Striped Awning",
"block.mcwroofs.blue_striped_awning": "Blue Striped Awning",
"block.mcwroofs.brown_striped_awning": "Brown Striped Awning",
Expand Down
Loading