sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(translation): resolve merge conflict

Browse source
This commit is contained in:
SabreCat 2017-04-11 22:04:55 +00:00
parent dd5a9aa6cc
commit c1d1a3e14e
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
website/common/locales/zh/gear.json
View file

@ -1021,11 +1021,7 @@
"shieldArmoireMushroomDruidShieldText": "德鲁伊蘑菇盾",
"shieldArmoireMushroomDruidShieldNotes": "尽管是由蘑菇打造而成的，却坚硬无比！增加 <%= con %> 点体质和 <%= str %> 点力量。魔法衣橱：德鲁伊蘑菇套装( 3 件套之 3 )",
"shieldArmoireFestivalParasolText": "节日阳伞",
<<<<<<< HEAD
"shieldArmoireFestivalParasolNotes": "This lightweight parasol will shield you from the glare--whether it's from the sun or from dark red Dailies! Increases Constitution by <%= con %>. Enchanted Armoire: Festival Attire Set (Item 2 of 3).",
=======
"shieldArmoireFestivalParasolNotes": "这把轻盈的太阳伞能够帮你抵御强光--无论它是来自太阳还是暗红色的每日任务！增加体质 <%= con %> 点。魔法衣橱：节日盛典套装(3件中的第2件)",
>>>>>>> sabrecat/egg-quest
"back": "背部挂件",
"backBase0Text": "没有背部挂件",
"backBase0Notes": "没有背部挂件。",