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

Chalk 翻译更新 #4866

Merged
merged 1 commit into from
Dec 30, 2024
Merged

Chalk 翻译更新 #4866

merged 1 commit into from
Dec 30, 2024

Conversation

ChuijkYahus
Copy link
Collaborator

No description provided.

@boring-cyborg boring-cyborg bot added (Neo)Forge 包含 Forge 或 NeoForge 模组 1.19.x Minecraft 版本标签 1.20.x Minecraft 版本标签 1.21.x Minecraft 版本标签 Forge 包含 Forge 模组 labels Dec 27, 2024
Copy link
Contributor

cfpa-bot bot commented Dec 27, 2024

模组 🔗 链接 🎨 相关文件
Chalk 🔍 源代码   | 🟩 MCMOD | 📁 对比(Azusa)
语言文件链接1.16
1.18
1.19
1.20

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


chalk Mod Domain 验证通过。
ℹ chalk-1.19 语言文件验证通过。
ℹ chalk-1.19 模组内语言文件验证通过。

chalk Mod Domain 验证通过。
ℹ chalk-1.20 语言文件验证通过。
ℹ chalk-1.20 模组内语言文件验证通过。

chalk Mod Domain 验证通过。
ℹ chalk-1.21 语言文件验证通过。
ℹ chalk-1.21 模组内语言文件验证通过。


🔛 Diff:

chalk/1.19
英文 中文
Skull 骷髅
🔽
头颅
Vandalism 故意破坏
🔽
蓄意破坏
chalk/1.19-keys
Key 英文 中文
gui.chalk.symbol.skull Skull 骷髅
🔽
头颅
advancement.chalk.vandalism Vandalism 故意破坏
🔽
蓄意破坏
chalk/1.19-术语检查
Key 英文 中文 检查结果
chalk/1.20
英文 中文
Skull 骷髅
🔽
头颅
Vandalism 故意破坏
🔽
蓄意破坏
chalk/1.20-keys
Key 英文 中文
gui.chalk.symbol.skull Skull 骷髅
🔽
头颅
advancement.chalk.vandalism Vandalism 故意破坏
🔽
蓄意破坏
chalk/1.20-术语检查
Key 英文 中文 检查结果
chalk/1.21
英文 中文
Chalk Mark 粉笔标记
Black Chalk Mark 黑色粉笔标记
Red Chalk Mark 红色粉笔标记
Green Chalk Mark 绿色粉笔标记
Brown Chalk Mark 棕色粉笔标记
Blue Chalk Mark 蓝色粉笔标记
Purple Chalk Mark 紫色粉笔标记
Cyan Chalk Mark 青色粉笔标记
Light Gray Chalk Mark 淡灰色粉笔标记
Gray Chalk Mark 灰色粉笔标记
Pink Chalk Mark 粉红色粉笔标记
Lime Chalk Mark 黄绿色粉笔标记
Yellow Chalk Mark 黄色粉笔标记
Light Blue Chalk Mark 淡蓝色粉笔标记
Magenta Chalk Mark 品红色粉笔标记
Orange Chalk Mark 橙色粉笔标记
White Chalk Mark 白色粉笔标记
Black Chalk 黑色粉笔
Red Chalk 红色粉笔
Green Chalk 绿色粉笔
Brown Chalk 棕色粉笔
Blue Chalk 蓝色粉笔
Purple Chalk 紫色粉笔
Cyan Chalk 青色粉笔
Light Gray Chalk 淡灰色粉笔
Gray Chalk 灰色粉笔
Pink Chalk 粉红色粉笔
Lime Chalk 黄绿色粉笔
Yellow Chalk 黄色粉笔
Light Blue Chalk 淡蓝色粉笔
Magenta Chalk 品红色粉笔
Orange Chalk 橙色粉笔
White Chalk 白色粉笔
§8Hold [§7Shift§8] for Details §8按住[§7Shift§8]显示更多信息
Chalk Box 粉笔盒
§8[§7Right Click§8] or §8[§7Use§8] in air to open §8对空气[§7右击§8]或§8[§7使用§8]以打开
§8[§7Right Click§8] with item to insert §8以物品[§7右击§8]可放入
§8[§7Sneak + Use§8] in air to change selected §7Chalk §8对[§7潜行+使用§8]以切换选定的§7粉笔
Chalk Box 粉笔盒
Chalk breaks 粉笔:磨尽
Chalk draws 粉笔:绘制
Chalk Box rustles 粉笔盒:沙沙作响
Chalk Box opens 粉笔盒:打开
Chalk Box closes 粉笔盒:关闭
Chalk mark glows up 粉笔标记:亮起
Chalk mark erased 粉笔标记:被擦除
Dot
Arrow 箭头
House 房子
Checkmark 对号
Cross 叉号
Heart
Skull 头颅
Pickaxe
You don't know how to draw any special symbol 你还不知道如何绘制特殊图案
You learned how to draw a %s with chalk 你学会了如何用粉笔画出一个%s
Bound By Bone 受缚于骨
Obtain a Skeleton Skull 获得一个骷髅头颅
Home Is Where the Bed Is 床在家就在
Sleep in one place three times in a row 连续三次在同一个地方睡觉
This Way! 走这边!
Draw with Chalk in a labyrinthine structure 在形如迷宫的结构里使用粉笔
Vandalism 蓄意破坏
Draw with a Chalk in a Village 在村庄里使用粉笔
Alone In The Darkness 独自处于黑暗中
Draw with the Black Chalk on the black block in the blackness 在黑暗中的黑色方块上使用黑色粉笔
Symbols 粉笔图案
Chalk Box: Glowing 粉笔盒:发光
Chalk Durability 粉笔耐久度
Glowing Chalk Mark Light Level 荧光粉笔标记光照等级
Generate Chalk In Loot Chests 在战利品箱子中生成粉笔
Chalk Box: Amount Per Glowing Item 粉笔盒:荧光剂物品使用次数
Symbol Offsets 粉笔图案偏移量
Chalk Box: Contents in Tooltip 粉笔盒:在提示框中显示内容物
Chalk Box: Details in Tooltip 粉笔盒:在提示框中显示更多信息
Cross 叉号
Cross Unlock Advancement 叉号解锁进度
Check 对号
Check Unlock Advancement 对号解锁进度
Pickaxe
Pickaxe Unlock Advancement 镐解锁进度
House 房子
House Unlock Advancement 房子解锁进度
Skull 头颅
Skull Unlock Advancement 头颅解锁进度
Heart
Heart Unlock Advancement 心解锁进度
Center Rotation Offset 点旋转偏移量
Cross Rotation Offset 叉号旋转偏移量
Heart Rotation Offset 心旋转偏移量
Skull Rotation Offset 头颅旋转偏移量
House Rotation Offset 房子旋转偏移量
Check Rotation Offset 对号旋转偏移量
Pickaxe Rotation Offset 镐旋转偏移量
Arrow Rotation Offset 箭头旋转偏移量
chalk/1.21-keys
Key 英文 中文
block.chalk.chalk_mark Chalk Mark 粉笔标记
block.chalk.black_chalk_mark Black Chalk Mark 黑色粉笔标记
block.chalk.red_chalk_mark Red Chalk Mark 红色粉笔标记
block.chalk.green_chalk_mark Green Chalk Mark 绿色粉笔标记
block.chalk.brown_chalk_mark Brown Chalk Mark 棕色粉笔标记
block.chalk.blue_chalk_mark Blue Chalk Mark 蓝色粉笔标记
block.chalk.purple_chalk_mark Purple Chalk Mark 紫色粉笔标记
block.chalk.cyan_chalk_mark Cyan Chalk Mark 青色粉笔标记
block.chalk.light_gray_chalk_mark Light Gray Chalk Mark 淡灰色粉笔标记
block.chalk.gray_chalk_mark Gray Chalk Mark 灰色粉笔标记
block.chalk.pink_chalk_mark Pink Chalk Mark 粉红色粉笔标记
block.chalk.lime_chalk_mark Lime Chalk Mark 黄绿色粉笔标记
block.chalk.yellow_chalk_mark Yellow Chalk Mark 黄色粉笔标记
block.chalk.light_blue_chalk_mark Light Blue Chalk Mark 淡蓝色粉笔标记
block.chalk.magenta_chalk_mark Magenta Chalk Mark 品红色粉笔标记
block.chalk.orange_chalk_mark Orange Chalk Mark 橙色粉笔标记
block.chalk.white_chalk_mark White Chalk Mark 白色粉笔标记
item.chalk.black_chalk Black Chalk 黑色粉笔
item.chalk.red_chalk Red Chalk 红色粉笔
item.chalk.green_chalk Green Chalk 绿色粉笔
item.chalk.brown_chalk Brown Chalk 棕色粉笔
item.chalk.blue_chalk Blue Chalk 蓝色粉笔
item.chalk.purple_chalk Purple Chalk 紫色粉笔
item.chalk.cyan_chalk Cyan Chalk 青色粉笔
item.chalk.light_gray_chalk Light Gray Chalk 淡灰色粉笔
item.chalk.gray_chalk Gray Chalk 灰色粉笔
item.chalk.pink_chalk Pink Chalk 粉红色粉笔
item.chalk.lime_chalk Lime Chalk 黄绿色粉笔
item.chalk.yellow_chalk Yellow Chalk 黄色粉笔
item.chalk.light_blue_chalk Light Blue Chalk 淡蓝色粉笔
item.chalk.magenta_chalk Magenta Chalk 品红色粉笔
item.chalk.orange_chalk Orange Chalk 橙色粉笔
item.chalk.white_chalk White Chalk 白色粉笔
gui.chalk.tooltip.hold_for_details §8Hold [§7Shift§8] for Details §8按住[§7Shift§8]显示更多信息
item.chalk.chalk_box Chalk Box 粉笔盒
item.chalk.chalk_box.tooltip.open §8[§7Right Click§8] or §8[§7Use§8] in air to open §8对空气[§7右击§8]或§8[§7使用§8]以打开
item.chalk.chalk_box.tooltip.insert §8[§7Right Click§8] with item to insert §8以物品[§7右击§8]可放入
item.chalk.chalk_box.tooltip.change_selected §8[§7Sneak + Use§8] in air to change selected §7Chalk §8对[§7潜行+使用§8]以切换选定的§7粉笔
container.chalk.chalk_box Chalk Box 粉笔盒
chalk.subtitles.chalk_broken Chalk breaks 粉笔:磨尽
chalk.subtitles.mark_drawn Chalk draws 粉笔:绘制
chalk.subtitles.chalk_box_changed Chalk Box rustles 粉笔盒:沙沙作响
chalk.subtitles.chalk_box_opens Chalk Box opens 粉笔盒:打开
chalk.subtitles.chalk_box_closes Chalk Box closes 粉笔盒:关闭
chalk.subtitles.glow_applied Chalk mark glows up 粉笔标记:亮起
chalk.subtitles.mark_removed Chalk mark erased 粉笔标记:被擦除
gui.chalk.symbol.center Dot
gui.chalk.symbol.arrow Arrow 箭头
gui.chalk.symbol.house House 房子
gui.chalk.symbol.check Checkmark 对号
gui.chalk.symbol.cross Cross 叉号
gui.chalk.symbol.heart Heart
gui.chalk.symbol.skull Skull 头颅
gui.chalk.symbol.pickaxe Pickaxe
gui.chalk.no_symbols_unlocked You don't know how to draw any special symbol 你还不知道如何绘制特殊图案
chat.chalk.symbol_unlocked You learned how to draw a %s with chalk 你学会了如何用粉笔画出一个%s
advancement.chalk.bound_by_bone.title Bound By Bone 受缚于骨
advancement.chalk.bound_by_bone.description Obtain a Skeleton Skull 获得一个骷髅头颅
advancement.chalk.home_is_where_the_bed_is.title Home Is Where the Bed Is 床在家就在
advancement.chalk.home_is_where_the_bed_is.description Sleep in one place three times in a row 连续三次在同一个地方睡觉
advancement.chalk.this_way.title This Way! 走这边!
advancement.chalk.this_way.description Draw with Chalk in a labyrinthine structure 在形如迷宫的结构里使用粉笔
advancement.chalk.vandalism.title Vandalism 蓄意破坏
advancement.chalk.vandalism.description Draw with a Chalk in a Village 在村庄里使用粉笔
advancement.chalk.alone_in_the_darkness.title Alone In The Darkness 独自处于黑暗中
advancement.chalk.alone_in_the_darkness.description Draw with the Black Chalk on the black block in the blackness 在黑暗中的黑色方块上使用黑色粉笔
chalk.configuration.Symbols Symbols 粉笔图案
chalk.configuration.ChalkBoxGlowingEnabled Chalk Box: Glowing 粉笔盒:发光
chalk.configuration.ChalkDurability Chalk Durability 粉笔耐久度
chalk.configuration.GlowingMarkLightLevel Glowing Chalk Mark Light Level 荧光粉笔标记光照等级
chalk.configuration.GenerateChalkInLootChests Generate Chalk In Loot Chests 在战利品箱子中生成粉笔
chalk.configuration.ChalkBoxAmountPerGlowingItem Chalk Box: Amount Per Glowing Item 粉笔盒:荧光剂物品使用次数
chalk.configuration.SymbolOffsets Symbol Offsets 粉笔图案偏移量
chalk.configuration.ChalkBoxTooltipContents Chalk Box: Contents in Tooltip 粉笔盒:在提示框中显示内容物
chalk.configuration.ChalkBoxTooltipDetails Chalk Box: Details in Tooltip 粉笔盒:在提示框中显示更多信息
chalk.configuration.CrossEnabled Cross 叉号
chalk.configuration.CrossUnlockAdvancement Cross Unlock Advancement 叉号解锁进度
chalk.configuration.CheckEnabled Check 对号
chalk.configuration.CheckUnlockAdvancement Check Unlock Advancement 对号解锁进度
chalk.configuration.PickaxeEnabled Pickaxe
chalk.configuration.PickaxeUnlockAdvancement Pickaxe Unlock Advancement 镐解锁进度
chalk.configuration.HouseEnabled House 房子
chalk.configuration.HouseUnlockAdvancement House Unlock Advancement 房子解锁进度
chalk.configuration.SkullEnabled Skull 头颅
chalk.configuration.SkullUnlockAdvancement Skull Unlock Advancement 头颅解锁进度
chalk.configuration.HeartEnabled Heart
chalk.configuration.HeartUnlockAdvancement Heart Unlock Advancement 心解锁进度
chalk.configuration.CenterRotationOffset Center Rotation Offset 点旋转偏移量
chalk.configuration.CrossRotationOffset Cross Rotation Offset 叉号旋转偏移量
chalk.configuration.HeartRotationOffset Heart Rotation Offset 心旋转偏移量
chalk.configuration.SkullRotationOffset Skull Rotation Offset 头颅旋转偏移量
chalk.configuration.HouseRotationOffset House Rotation Offset 房子旋转偏移量
chalk.configuration.CheckRotationOffset Check Rotation Offset 对号旋转偏移量
chalk.configuration.PickaxeRotationOffset Pickaxe Rotation Offset 镐旋转偏移量
chalk.configuration.ArrowRotationOffset Arrow Rotation Offset 箭头旋转偏移量
chalk/1.21-术语检查
Key 英文 中文 检查结果
block.chalk.black_chalk_mark Black Chalk Mark 黑色粉笔标记 ✔ 术语 black => 黑色
block.chalk.red_chalk_mark Red Chalk Mark 红色粉笔标记 ✔ 术语 red => 红色
block.chalk.green_chalk_mark Green Chalk Mark 绿色粉笔标记 ✔ 术语 green => 绿色
block.chalk.brown_chalk_mark Brown Chalk Mark 棕色粉笔标记 ✔ 术语 brown => 棕色
block.chalk.blue_chalk_mark Blue Chalk Mark 蓝色粉笔标记 ✔ 术语 blue => 蓝色
block.chalk.purple_chalk_mark Purple Chalk Mark 紫色粉笔标记 ✔ 术语 purple => 紫色
block.chalk.cyan_chalk_mark Cyan Chalk Mark 青色粉笔标记 ✔ 术语 cyan => 青色
block.chalk.light_gray_chalk_mark Light Gray Chalk Mark 淡灰色粉笔标记 ⚠ 术语异常 light => 光
✔ 术语 gray => 灰色
✔ 术语 light gray => 淡灰色
block.chalk.gray_chalk_mark Gray Chalk Mark 灰色粉笔标记 ✔ 术语 gray => 灰色
block.chalk.pink_chalk_mark Pink Chalk Mark 粉红色粉笔标记 ✔ 术语 pink => 粉红色
block.chalk.lime_chalk_mark Lime Chalk Mark 黄绿色粉笔标记 ✔ 术语 lime => 黄绿色
block.chalk.yellow_chalk_mark Yellow Chalk Mark 黄色粉笔标记 ✔ 术语 yellow => 黄色
block.chalk.light_blue_chalk_mark Light Blue Chalk Mark 淡蓝色粉笔标记 ⚠ 术语异常 light => 光
✔ 术语 blue => 蓝色
✔ 术语 light blue => 淡蓝色
block.chalk.magenta_chalk_mark Magenta Chalk Mark 品红色粉笔标记 ✔ 术语 magenta => 品红色
block.chalk.orange_chalk_mark Orange Chalk Mark 橙色粉笔标记 ✔ 术语 orange => 橙色
block.chalk.white_chalk_mark White Chalk Mark 白色粉笔标记 ✔ 术语 white => 白色
item.chalk.black_chalk Black Chalk 黑色粉笔 ✔ 术语 black => 黑色
item.chalk.red_chalk Red Chalk 红色粉笔 ✔ 术语 red => 红色
item.chalk.green_chalk Green Chalk 绿色粉笔 ✔ 术语 green => 绿色
item.chalk.brown_chalk Brown Chalk 棕色粉笔 ✔ 术语 brown => 棕色
item.chalk.blue_chalk Blue Chalk 蓝色粉笔 ✔ 术语 blue => 蓝色
item.chalk.purple_chalk Purple Chalk 紫色粉笔 ✔ 术语 purple => 紫色
item.chalk.cyan_chalk Cyan Chalk 青色粉笔 ✔ 术语 cyan => 青色
item.chalk.light_gray_chalk Light Gray Chalk 淡灰色粉笔 ⚠ 术语异常 light => 光
✔ 术语 gray => 灰色
✔ 术语 light gray => 淡灰色
item.chalk.gray_chalk Gray Chalk 灰色粉笔 ✔ 术语 gray => 灰色
item.chalk.pink_chalk Pink Chalk 粉红色粉笔 ✔ 术语 pink => 粉红色
item.chalk.lime_chalk Lime Chalk 黄绿色粉笔 ✔ 术语 lime => 黄绿色
item.chalk.yellow_chalk Yellow Chalk 黄色粉笔 ✔ 术语 yellow => 黄色
item.chalk.light_blue_chalk Light Blue Chalk 淡蓝色粉笔 ⚠ 术语异常 light => 光
✔ 术语 blue => 蓝色
✔ 术语 light blue => 淡蓝色
item.chalk.magenta_chalk Magenta Chalk 品红色粉笔 ✔ 术语 magenta => 品红色
item.chalk.orange_chalk Orange Chalk 橙色粉笔 ✔ 术语 orange => 橙色
item.chalk.white_chalk White Chalk 白色粉笔 ✔ 术语 white => 白色
item.chalk.chalk_box.tooltip.open §8[§7Right Click§8] or §8[§7Use§8] in air to open §8对空气[§7右击§8]或§8[§7使用§8]以打开 ✔ 术语 air => 空气
✔ 术语 open => 打开, 开启
item.chalk.chalk_box.tooltip.insert §8[§7Right Click§8] with item to insert §8以物品[§7右击§8]可放入 ⚠ 术语异常 insert => insert
✔ 术语 item => 物品
item.chalk.chalk_box.tooltip.change_selected §8[§7Sneak + Use§8] in air to change selected §7Chalk §8对[§7潜行+使用§8]以切换选定的§7粉笔 ⚠ 术语异常 air => 空气
chalk.subtitles.chalk_broken Chalk breaks 粉笔:磨尽 ⚠ 术语异常 breaks => 破裂
⚠ 术语异常 breaks => 被破坏
⚠ 术语异常 breaks => 毁坏
⚠ 术语异常 breaks => 碎裂
⚠ 术语异常 breaks => 受损
chalk.subtitles.chalk_box_changed Chalk Box rustles 粉笔盒:沙沙作响 ⚠ 术语异常 rustles => 摩擦
✔ 术语 rustles => 沙沙作响
chalk.subtitles.chalk_box_closes Chalk Box closes 粉笔盒:关闭 ✔ 术语 closes => 关闭
chalk.subtitles.glow_applied Chalk mark glows up 粉笔标记:亮起 ⚠ 术语异常 up => 向上
gui.chalk.symbol.arrow Arrow 箭头 ✔ 术语 arrow => 箭
gui.chalk.symbol.pickaxe Pickaxe ✔ 术语 pickaxe => 镐
advancement.chalk.bound_by_bone.title Bound By Bone 受缚于骨 ⚠ 术语异常 bone => 骨头
advancement.chalk.bound_by_bone.description Obtain a Skeleton Skull 获得一个骷髅头颅 ✔ 术语 skeleton skull => 骷髅头颅
✔ 术语 skeleton => 骷髅
advancement.chalk.home_is_where_the_bed_is.title Home Is Where the Bed Is 床在家就在 ⚠ 术语异常 home => home
✔ 术语 bed => 床
advancement.chalk.alone_in_the_darkness.description Draw with the Black Chalk on the black block in the blackness 在黑暗中的黑色方块上使用黑色粉笔 ⚠ 术语异常 on => 开
✔ 术语 black => 黑色
chalk.configuration.ChalkBoxGlowingEnabled Chalk Box: Glowing 粉笔盒:发光 ✔ 术语 glowing => 发光
chalk.configuration.GlowingMarkLightLevel Glowing Chalk Mark Light Level 荧光粉笔标记光照等级 ✔ 术语 light => 光
⚠ 术语异常 glowing => 发光
chalk.configuration.GenerateChalkInLootChests Generate Chalk In Loot Chests 在战利品箱子中生成粉笔 ✔ 术语 loot => 战利品
chalk.configuration.ChalkBoxAmountPerGlowingItem Chalk Box: Amount Per Glowing Item 粉笔盒:荧光剂物品使用次数 ✔ 术语 item => 物品
⚠ 术语异常 glowing => 发光
chalk.configuration.CrossUnlockAdvancement Cross Unlock Advancement 叉号解锁进度 ✔ 术语 advancement => 进度
chalk.configuration.CheckUnlockAdvancement Check Unlock Advancement 对号解锁进度 ✔ 术语 advancement => 进度
chalk.configuration.PickaxeEnabled Pickaxe ✔ 术语 pickaxe => 镐
chalk.configuration.PickaxeUnlockAdvancement Pickaxe Unlock Advancement 镐解锁进度 ✔ 术语 pickaxe => 镐
✔ 术语 advancement => 进度
chalk.configuration.HouseUnlockAdvancement House Unlock Advancement 房子解锁进度 ✔ 术语 advancement => 进度
chalk.configuration.SkullUnlockAdvancement Skull Unlock Advancement 头颅解锁进度 ✔ 术语 advancement => 进度
chalk.configuration.HeartUnlockAdvancement Heart Unlock Advancement 心解锁进度 ✔ 术语 advancement => 进度
chalk.configuration.PickaxeRotationOffset Pickaxe Rotation Offset 镐旋转偏移量 ✔ 术语 pickaxe => 镐
chalk.configuration.ArrowRotationOffset Arrow Rotation Offset 箭头旋转偏移量 ✔ 术语 arrow => 箭

机器人的命令列表

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

@cfpa-bot cfpa-bot bot added the 100+ 行数标签 label Dec 27, 2024
@luoxueyasha luoxueyasha added the 即将合并 在此标签被添加的 24 小时后 Pull Request 才可被合并 label Dec 29, 2024
@luoxueyasha luoxueyasha merged commit cd0a6a0 into CFPAOrg:main Dec 30, 2024
24 checks passed
@ChuijkYahus ChuijkYahus deleted the main-chalkk branch December 30, 2024 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.19.x Minecraft 版本标签 1.20.x Minecraft 版本标签 1.21.x Minecraft 版本标签 100+ 行数标签 Forge 包含 Forge 模组 (Neo)Forge 包含 Forge 或 NeoForge 模组 即将合并 在此标签被添加的 24 小时后 Pull Request 才可被合并
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants