Skip to content

统一库内多个植物的翻译 #4739

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.

Sign up for GitHub

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

Closed
AnzhiZhang wants to merge 5 commits into from
Closed

统一库内多个植物的翻译 #4739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c29f71
`凤梨` -> `菠萝`
AnzhiZhang Oct 22, 2024
90df65d
`奇异果` -> `猕猴桃`
AnzhiZhang Oct 22, 2024
db7b772
Update projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/la…
AnzhiZhang Oct 22, 2024
7c504f3
Merge branch 'pr/4741' into pr/4739
SlimeSB Oct 22, 2024
2beab85
revert kamenrider
SlimeSB Oct 22, 2024
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
4 changes: 2 additions & 2 deletions projects/1.12.2/assets/1UNKNOWN/pmp/lang/zh_cn.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ item.fruit_cherr.name=樱桃
item.fruit_cocon.name=椰子
item.fruit_grapf.name=柚子
item.fruit_grnap.name=青苹果
item.fruit_kiwi.name=奇异果
item.fruit_kiwi.name=猕猴桃
item.fruit_lemon.name=柠檬
item.fruit_lime.name=青柠檬
item.fruit_mango.name=芒果
Expand Down Expand Up @@ -545,7 +545,7 @@ tile.climb_cgrpv.name=葡萄藤
tile.climb_gldho.name=蛇麻
tile.climb_hyacb.name=扁豆
tile.climb_japcr.name=日本爬行藤
tile.climb_kiwi.name=奇异果
tile.climb_kiwi.name=猕猴桃
tile.climb_maidf.name=美国铁线蕨
tile.climb_porce.name=瓷色浆果
tile.climb_swpea_blu.name=蓝天鹅甜豌豆
Expand Down
2 changes: 1 addition & 1 deletion projects/1.20/assets/tropicraft/tropicraft/lang/zh_cn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@
"item.tropicraft.orangeade": "橙汁",
"item.tropicraft.pab_shell": "Pab贝壳",
"item.tropicraft.pianguas": "扇贝",
"item.tropicraft.pina_colada": "凤梨可乐达",
"item.tropicraft.pina_colada": "菠萝可乐达",
Copy link
Contributor

@FridayAnubis FridayAnubis Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://zh.wikipedia.org/wiki/%E9%B3%B3%E6%A2%A8%E5%8F%AF%E6%A8%82%E9%81%94
参考如上，我认为这个更改是不合适的
“凤梨可乐达”是更加广泛使用的名称

Copy link
Contributor Author

@AnzhiZhang AnzhiZhang Oct 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

凤梨可乐达、凤梨汁、菠萝可乐达、菠萝汁 都是农产品菠萝/凤梨的衍生词，应当和农产品名称保持一致。

根据指示精神，需要保持统一，无论选择菠萝还是凤梨，与农产品名称应该统一。维基百科是不可信来源，这里决定统一方向后，可以按需修改维基百科。

另外根据提供的维基百科，西班牙语：Piña colada，Piña 是西班牙语的 pineapple

Copy link
Contributor

@FridayAnubis FridayAnubis Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

群内目前讨论争执不一，要不就改成椰林飘香

Copy link
Contributor Author

@AnzhiZhang AnzhiZhang Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

是广为流传的中文另起的名字，个人没有意见

Suggested change
"item.tropicraft.pina_colada": "菠萝可乐达",
"item.tropicraft.pina_colada": "椰林飘香",

Copy link
Contributor

@SummerFleur2997 SummerFleur2997 Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tropicraft 是我焊的，在这里发表一下我的看法
因其俗名确为 凤梨可乐达，故不支持改为 菠萝可乐达，以下是相关数据：
在 cn.bing 上搜索词条 凤梨可乐达，首页相关项均为鸡尾酒
在 cn.bing 上搜索词条 菠萝可乐达，首页相关项几乎全部为彩虹六号某枪械皮肤
综上，不支持更改。

"item.tropicraft.pineapple_cubes": "菠萝果粒",
"item.tropicraft.pink_beach_float": "粉红色沙滩浮排",
"item.tropicraft.pink_chair": "粉红色椅子",
Expand Down