Closed AIMEIXIZI closed 4 years ago
我这显示无法自动合并是什么意思啊
证明你源文件版本比合并目标的文件版本要旧,你需要检查并解决内容冲突后才能进行合并。 详细可在Web页面里查看并操作,自己摸索一下吧,我英语0级都没问题,相信你也可以的。😉
ok我试试
Misha notifications@github.com于2020年4月18日 周六下午8:04写道:
我这显示无法自动合并是什么意思啊
证明你源文件版本比合并目标的文件版本要旧,你需要检查并解决内容冲突后才能进行合并。 详细可在Web页面里查看并操作,自己摸索一下吧,我英语0级都没问题,相信你也可以的。😉
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/Mishasama/ProjectZomboidTranslations/pull/58#issuecomment-615915229, or unsubscribe https://github.com/notifications/unsubscribe-auth/AOV7SB5EUWQGXIMK72C3KA3RNHTULANCNFSM4MLCT75A .
对对对,应该是视力测试表,我之前翻译的时候硬是想不起来这个词 其他的词我大概都会进游戏看看(如果我有时间的话)有些奇怪的东西我还是会进游戏看看的 对了,这里面还有些关于品牌的我不知道怎么翻译好
Misha notifications@github.com 于2020年5月18日周一 下午8:48写道:
@Mishasama approved this pull request.
还行😂 物品数量太多我没空进游戏一一核对翻译是否正确了…… 如果条件允许的话希望你能替我对着游戏里的物品来以实物为准,因为我印象里第187行的“眼科”海报应该是视力测试表,但我不是很确定………
In CN/Moveables_CN.txt https://github.com/Mishasama/ProjectZomboidTranslations/pull/58#discussion_r426817717 :
- Dark_Purple_Rug = "深紫色地毯",
Dark_Red_Carpet = "深红色地毯",
Dark_Round_Table = "深色圆桌",
Dark_School_Bench = "深色学校长椅",
Dark_Wall_Lamp = "深色壁灯",
Dark_Wall_Shelves = "深色墙架",
Dark_Wooden_Chair = "深色木制椅",
Darkblue_Modern_Chair = "深蓝色现代椅",
Decorated_Altar = "装饰用祭坛",
Deluxe_Shower = "高级淋浴器",
Dentist_Patient_Chair = "牙医诊所椅",
Desktop_Computer = "台式电脑",
Diner_Corner_Counter = "小餐馆转角柜台",
Diner_Counter = "小餐馆柜台",
Diner_Floor = "小餐馆地板",
Diner_Neon_Sign = "小餐馆霓虹灯招牌",
Dixie_Sign = "Dixie Sign",
⬇️ Suggested change
Dixie_Sign = "Dixie Sign",
Dixie_Sign = "迪克西标志",
In CN/Moveables_CN.txt https://github.com/Mishasama/ProjectZomboidTranslations/pull/58#discussion_r426821323 :
Empty_Mall_Decoration = "Empty Mall Decoration",
Empty_Pallet = "Empty Pallet",
Empty_Pallet = "空托盘",
Enigma_Books_Sign = "Enigma Books Sign",
⬇️ Suggested change
Enigma_Books_Sign = "Enigma Books Sign",
Enigma_Books_Sign = "谜语书店标志",
In CN/Moveables_CN.txt https://github.com/Mishasama/ProjectZomboidTranslations/pull/58#discussion_r426822260 :
Enigma_Books_Sign = "Enigma Books Sign",
Exceptional_Large_Table = "Exceptional Large Table",
Exceptional_Table = "Exceptional Table",
Exceptionally_crafted_Chair = "Exceptionally crafted Chair",
Exit_Sign = "Exit Sign",
Eye_Test_Poster = "Eye Test Poster",
Exceptional_Large_Table = "极好的大桌子",
Exceptional_Table = "极好的桌子",
Exceptionally_crafted_Chair = "极好的手工椅",
Exit_Sign = "出口标志",
Eye_Test_Poster = "眼科测试海报",
Family_Fashion_Sign = "Family Fashion Sign",
⬇️ Suggested change
Family_Fashion_Sign = "Family Fashion Sign",
Family_Fashion_Sign = "家居时装标志",
In CN/Moveables_CN.txt https://github.com/Mishasama/ProjectZomboidTranslations/pull/58#discussion_r426823002 :
Family_Fashion_Sign = "Family Fashion Sign",
Fancy_Bed = "Fancy Bed",
Fancy_Blue_Rug = "Fancy Blue Rug",
Fancy_Brown_Rug = "Fancy Brown Rug",
Fancy_Counter = "Fancy Counter",
Fancy_Dark_Table = "Fancy Dark Table",
Fancy_Drawers = "Fancy Drawers",
Fancy_Bed = "精致床",
Fancy_Blue_Rug = "精致蓝色地毯",
Fancy_Brown_Rug = "精致棕色地毯",
Fancy_Counter = "精致柜台",
Fancy_Dark_Table = "精致深色桌子",
Fancy_Drawers = "精致抽屉",
Fancy_Floating_Counter = "Fancy Floating Counter",
⬇️ Suggested change
Fancy_Floating_Counter = "Fancy Floating Counter",
Fancy_Floating_Counter = "精致流动柜台",
In CN/Moveables_CN.txt https://github.com/Mishasama/ProjectZomboidTranslations/pull/58#discussion_r426823302 :
- Fancy_Oak_Drawers = "Fancy Oak Drawers",
Fancy_Oak_Wardrobe = "Fancy Oak Wardrobe",
Fancy_Orange_Rug = "Fancy Orange Rug",
Fancy_Outdoor_Lamp = "Fancy Outdoor Lamp",
Fancy_Outdoors_Bench = "Fancy Outdoors Bench",
Fancy_Table = "Fancy Table",
Fancy_Green_Rug = "精致绿色地毯",
Fancy_Hanging_Sink = "精致水槽",
Fancy_Low_Glass_Table = "精致玻璃矮桌",
Fancy_Low_Table = "精致矮桌",
Fancy_Oak_Drawers = "精致橡木抽屉",
Fancy_Oak_Wardrobe = "精致橡木衣柜",
Fancy_Orange_Rug = "精致橙色地毯",
Fancy_Outdoor_Lamp = "精致室外灯",
Fancy_Outdoors_Bench = "精致户外长凳",
Fancy_Table = "精致桌",
Fancy_Toilet = "Fancy Toilet",
⬇️ Suggested change
Fancy_Toilet = "Fancy Toilet",
Fancy_Toilet = "精致厕所",
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/Mishasama/ProjectZomboidTranslations/pull/58#pullrequestreview-413839247, or unsubscribe https://github.com/notifications/unsubscribe-auth/AOV7SB3EFHSKU5WW7642HQTRSF7JTANCNFSM4MLCT75A .
我这显示无法自动合并是什么意思啊