diff --git a/Translations/zh_CN.po b/Translations/zh_CN.po
index 8b3ef7201..13265c431 100644
--- a/Translations/zh_CN.po
+++ b/Translations/zh_CN.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DevilutionX\n"
-"POT-Creation-Date: 2021-10-18 14:05+0800\n"
+"POT-Creation-Date: 2021-11-01 15:00+0800\n"
 "PO-Revision-Date: \n"
 "Last-Translator: muziling <pieceking@qq.com>\n"
 "Language-Team: Emiliano Augusto Gonzalez\n"
@@ -311,15 +311,43 @@ msgid "\tNo souls were sold in the making of this game."
 msgstr "\t在这个游戏的制作过程中没有灵魂被出卖。"
 
 #: Source/DiabloUI/dialogs.cpp:194 Source/DiabloUI/dialogs.cpp:206
-#: Source/DiabloUI/selconn.cpp:79 Source/DiabloUI/selgame.cpp:102
-#: Source/DiabloUI/selgame.cpp:183 Source/DiabloUI/selgame.cpp:201
-#: Source/DiabloUI/selgame.cpp:337 Source/DiabloUI/selgame.cpp:411
+#: Source/DiabloUI/selconn.cpp:79 Source/DiabloUI/selgame.cpp:103
+#: Source/DiabloUI/selgame.cpp:193 Source/DiabloUI/selgame.cpp:211
+#: Source/DiabloUI/selgame.cpp:352 Source/DiabloUI/selgame.cpp:428
 #: Source/DiabloUI/selhero.cpp:186 Source/DiabloUI/selhero.cpp:211
 #: Source/DiabloUI/selhero.cpp:281 Source/DiabloUI/selhero.cpp:536
 #: Source/DiabloUI/selok.cpp:68
 msgid "OK"
 msgstr "确定"
 
+#: Source/DiabloUI/extrasmenu.cpp:41 Source/DiabloUI/selstart.cpp:44
+msgid "Switch to Diablo"
+msgstr "切换到原版"
+
+#: Source/DiabloUI/extrasmenu.cpp:41
+msgid "Switch to Hellfire"
+msgstr "切换到地狱火"
+
+#: Source/DiabloUI/extrasmenu.cpp:43
+msgid "Switch to Fullgame"
+msgstr "切换到完整版游戏"
+
+#: Source/DiabloUI/extrasmenu.cpp:43
+msgid "Switch to Shareware"
+msgstr "切换到共享版"
+
+#: Source/DiabloUI/extrasmenu.cpp:44
+msgid "Replay Intro"
+msgstr "重播动画"
+
+#: Source/DiabloUI/extrasmenu.cpp:45
+msgid "Support"
+msgstr "支持"
+
+#: Source/DiabloUI/extrasmenu.cpp:46 Source/gamemenu.cpp:61
+msgid "Previous Menu"
+msgstr "上一个菜单"
+
 #: Source/DiabloUI/mainmenu.cpp:36
 msgid "Single Player"
 msgstr "单人游戏"
@@ -329,33 +357,24 @@ msgid "Multi Player"
 msgstr "多人游戏"
 
 #: Source/DiabloUI/mainmenu.cpp:38
-msgid "Replay Intro"
-msgstr "重播动画"
+msgid "Extras"
+msgstr "额外内容"
 
 #: Source/DiabloUI/mainmenu.cpp:39
-msgid "Support"
-msgstr "支持"
-
-#: Source/DiabloUI/mainmenu.cpp:40
 msgid "Show Credits"
 msgstr "显示制作组"
 
-#: Source/DiabloUI/mainmenu.cpp:41
+#: Source/DiabloUI/mainmenu.cpp:40
 msgid "Exit Hellfire"
 msgstr "退出地狱火"
 
-#: Source/DiabloUI/mainmenu.cpp:41
+#: Source/DiabloUI/mainmenu.cpp:40
 msgid "Exit Diablo"
 msgstr "退出暗黑破坏神"
 
-#. TRANSLATORS:  Error Message when a Shareware User clicks on "Replay Intro" in the Main Menu
-#: Source/DiabloUI/mainmenu.cpp:99
-msgid ""
-"The Diablo introduction cinematic is only available in the full retail "
-"version of Diablo. Visit https://www.gog.com/game/diablo to purchase."
-msgstr ""
-"暗黑破坏神介绍影片只在完整的零售版暗黑破坏神提供。请前往 https://www.gog.com/"
-"game/diablo 购买。"
+#: Source/DiabloUI/mainmenu.cpp:55
+msgid "Shareware"
+msgstr "共享版"
 
 #: Source/DiabloUI/progress.cpp:36 Source/DiabloUI/selconn.cpp:82
 #: Source/DiabloUI/selhero.cpp:189 Source/DiabloUI/selhero.cpp:214
@@ -371,8 +390,8 @@ msgstr "客户端-服务器(TCP)"
 msgid "Loopback"
 msgstr "回环"
 
-#: Source/DiabloUI/selconn.cpp:53 Source/DiabloUI/selgame.cpp:458
-#: Source/DiabloUI/selgame.cpp:476
+#: Source/DiabloUI/selconn.cpp:53 Source/DiabloUI/selgame.cpp:484
+#: Source/DiabloUI/selgame.cpp:505
 msgid "Multi Player Game"
 msgstr "多人游戏"
 
@@ -408,72 +427,82 @@ msgstr "在没有网络开放的情况下自己游玩。"
 msgid "Players Supported: {:d}"
 msgstr "支持的玩家: {:d}"
 
-#: Source/DiabloUI/selgame.cpp:84 Source/DiabloUI/selgame.cpp:399
+#: Source/DiabloUI/selgame.cpp:82 Source/DiabloUI/selgame.cpp:414
 msgid "Description:"
 msgstr "说明:"
 
-#: Source/DiabloUI/selgame.cpp:90
+#: Source/DiabloUI/selgame.cpp:88
 msgid "Select Action"
 msgstr "选择操作"
 
-#: Source/DiabloUI/selgame.cpp:92 Source/DiabloUI/selgame.cpp:171
-#: Source/DiabloUI/selgame.cpp:318
+#: Source/DiabloUI/selgame.cpp:91 Source/DiabloUI/selgame.cpp:181
+#: Source/DiabloUI/selgame.cpp:333
 msgid "Create Game"
 msgstr "创建游戏"
 
 #: Source/DiabloUI/selgame.cpp:93
+msgid "Create Public Game"
+msgstr "创建公开游戏"
+
+#: Source/DiabloUI/selgame.cpp:94
 msgid "Join Game"
 msgstr "加入游戏"
 
-#: Source/DiabloUI/selgame.cpp:105 Source/DiabloUI/selgame.cpp:186
-#: Source/DiabloUI/selgame.cpp:204 Source/DiabloUI/selgame.cpp:340
-#: Source/DiabloUI/selgame.cpp:414
+#: Source/DiabloUI/selgame.cpp:106 Source/DiabloUI/selgame.cpp:196
+#: Source/DiabloUI/selgame.cpp:214 Source/DiabloUI/selgame.cpp:355
+#: Source/DiabloUI/selgame.cpp:431
 msgid "CANCEL"
 msgstr "取消"
 
-#: Source/DiabloUI/selgame.cpp:115
+#: Source/DiabloUI/selgame.cpp:122
 msgid "Create a new game with a difficulty setting of your choice."
 msgstr "从你选择的难度设置创建游戏。"
 
-#: Source/DiabloUI/selgame.cpp:118
+#: Source/DiabloUI/selgame.cpp:125
+msgid ""
+"Create a new public game that anyone can join with a difficulty setting of "
+"your choice."
+msgstr "创建一个公开游戏，任何人都可加入的，游戏难度将依据你的设定。"
+
+#: Source/DiabloUI/selgame.cpp:128
 msgid ""
 "Enter an IP or a hostname and join a game already in progress at that "
 "address."
 msgstr "输入IP或主机名，然后加入在该地址正在进行的游戏。"
 
-#: Source/DiabloUI/selgame.cpp:121
+#: Source/DiabloUI/selgame.cpp:131
 msgid "Join the public game already in progress at this address."
 msgstr "加入该地址已经处于进行中的公开游戏。"
 
-#: Source/DiabloUI/selgame.cpp:174
+#: Source/DiabloUI/selgame.cpp:184
 msgid "Select Difficulty"
 msgstr "选择难度"
 
-#: Source/DiabloUI/selgame.cpp:176 Source/DiabloUI/selgame.cpp:224
-#: Source/DiabloUI/selgame.cpp:329 Source/DiabloUI/selgame.cpp:349
-#: Source/diablo.cpp:1431
+#: Source/DiabloUI/selgame.cpp:186 Source/DiabloUI/selgame.cpp:239
+#: Source/DiabloUI/selgame.cpp:344 Source/DiabloUI/selgame.cpp:364
+#: Source/diablo.cpp:1446
 msgid "Normal"
 msgstr "正常"
 
-#: Source/DiabloUI/selgame.cpp:177 Source/DiabloUI/selgame.cpp:228
-#: Source/diablo.cpp:1432
+#: Source/DiabloUI/selgame.cpp:187 Source/DiabloUI/selgame.cpp:243
+#: Source/diablo.cpp:1447
 msgid "Nightmare"
 msgstr "噩梦"
 
-#: Source/DiabloUI/selgame.cpp:178 Source/DiabloUI/selgame.cpp:232
-#: Source/diablo.cpp:1433
+#: Source/DiabloUI/selgame.cpp:188 Source/DiabloUI/selgame.cpp:247
+#: Source/diablo.cpp:1448
 msgid "Hell"
 msgstr "地狱"
 
-#: Source/DiabloUI/selgame.cpp:192
+#: Source/DiabloUI/selgame.cpp:202
 msgid "Join TCP Games"
 msgstr "加入TCP游戏"
 
-#: Source/DiabloUI/selgame.cpp:195 Source/DiabloUI/selgame.cpp:198
+#: Source/DiabloUI/selgame.cpp:205 Source/DiabloUI/selgame.cpp:208
 msgid "Enter address"
 msgstr "输入地址"
 
-#: Source/DiabloUI/selgame.cpp:225
+#: Source/DiabloUI/selgame.cpp:240
 msgid ""
 "Normal Difficulty\n"
 "This is where a starting character should begin the quest to defeat Diablo."
@@ -481,7 +510,7 @@ msgstr ""
 "正常难度\n"
 "一个新角色应从此开始，最终击败迪亚波罗。"
 
-#: Source/DiabloUI/selgame.cpp:229
+#: Source/DiabloUI/selgame.cpp:244
 msgid ""
 "Nightmare Difficulty\n"
 "The denizens of the Labyrinth have been bolstered and will prove to be a "
@@ -490,7 +519,7 @@ msgstr ""
 "噩梦难度\n"
 "迷宫里的怪物将被强化，这将是一个更大的挑战。只建议经验丰富的角色进行挑战。"
 
-#: Source/DiabloUI/selgame.cpp:233
+#: Source/DiabloUI/selgame.cpp:248
 msgid ""
 "Hell Difficulty\n"
 "The most powerful of the underworld's creatures lurk at the gateway into "
@@ -500,35 +529,35 @@ msgstr ""
 "最强大的地底世界的生物潜伏在地狱的大门。只有最有经验的角色才能在这个国度中冒"
 "险。"
 
-#: Source/DiabloUI/selgame.cpp:249
+#: Source/DiabloUI/selgame.cpp:264
 msgid ""
 "Your character must reach level 20 before you can enter a multiplayer game "
 "of Nightmare difficulty."
 msgstr "你的角色必须达到20级才能进入噩梦难度的多人游戏。"
 
-#: Source/DiabloUI/selgame.cpp:251
+#: Source/DiabloUI/selgame.cpp:266
 msgid ""
 "Your character must reach level 30 before you can enter a multiplayer game "
 "of Hell difficulty."
 msgstr "你的角色必须达到30级才能进入地狱难度的多人游戏。"
 
-#: Source/DiabloUI/selgame.cpp:327
+#: Source/DiabloUI/selgame.cpp:342
 msgid "Select Game Speed"
 msgstr "选择游戏速度"
 
-#: Source/DiabloUI/selgame.cpp:330 Source/DiabloUI/selgame.cpp:353
+#: Source/DiabloUI/selgame.cpp:345 Source/DiabloUI/selgame.cpp:368
 msgid "Fast"
 msgstr "快速"
 
-#: Source/DiabloUI/selgame.cpp:331 Source/DiabloUI/selgame.cpp:357
+#: Source/DiabloUI/selgame.cpp:346 Source/DiabloUI/selgame.cpp:372
 msgid "Faster"
 msgstr "更快"
 
-#: Source/DiabloUI/selgame.cpp:332 Source/DiabloUI/selgame.cpp:361
+#: Source/DiabloUI/selgame.cpp:347 Source/DiabloUI/selgame.cpp:376
 msgid "Fastest"
 msgstr "最快"
 
-#: Source/DiabloUI/selgame.cpp:350
+#: Source/DiabloUI/selgame.cpp:365
 msgid ""
 "Normal Speed\n"
 "This is where a starting character should begin the quest to defeat Diablo."
@@ -536,7 +565,7 @@ msgstr ""
 "正常\n"
 "一个新角色应从此开始，最终击败迪亚波罗。"
 
-#: Source/DiabloUI/selgame.cpp:354
+#: Source/DiabloUI/selgame.cpp:369
 msgid ""
 "Fast Speed\n"
 "The denizens of the Labyrinth have been hastened and will prove to be a "
@@ -546,7 +575,7 @@ msgstr ""
 "迷宫的居民们已经被催促了，这将是一个更大的挑战。只建议经验丰富的角色进行挑"
 "战。"
 
-#: Source/DiabloUI/selgame.cpp:358
+#: Source/DiabloUI/selgame.cpp:373
 msgid ""
 "Faster Speed\n"
 "Most monsters of the dungeon will seek you out quicker than ever before. "
@@ -556,7 +585,7 @@ msgstr ""
 "地牢里的大多数怪物会比以前更快地找到你。只有经验丰富的勇士才能在这个速度下砰"
 "砰运气。"
 
-#: Source/DiabloUI/selgame.cpp:362
+#: Source/DiabloUI/selgame.cpp:377
 msgid ""
 "Fastest Speed\n"
 "The minions of the underworld will rush to attack without hesitation. Only a "
@@ -565,16 +594,16 @@ msgstr ""
 "最快\n"
 "地下世界的仆从们会毫不犹豫地冲过来袭击。只有真正的速度恶魔才能赶得上脚步。"
 
-#: Source/DiabloUI/selgame.cpp:405 Source/DiabloUI/selgame.cpp:408
+#: Source/DiabloUI/selgame.cpp:420 Source/DiabloUI/selgame.cpp:425
 msgid "Enter Password"
 msgstr "输入密码"
 
-#: Source/DiabloUI/selgame.cpp:431
+#: Source/DiabloUI/selgame.cpp:448
 msgid "The host is running a different game than you."
 msgstr "主机运行的游戏与您不同。"
 
 #. TRANSLATORS: Error message when somebody tries to join a game running another version.
-#: Source/DiabloUI/selgame.cpp:434
+#: Source/DiabloUI/selgame.cpp:451
 msgid "Your version {:s} does not match the host {:d}.{:d}.{:d}."
 msgstr "您的版本{:s}与主机{:d}.{:d}.{:d}不匹配。"
 
@@ -706,6 +735,10 @@ msgstr "删除单人游戏英雄"
 msgid "Are you sure you want to delete the character \"{:s}\"?"
 msgstr "是否确实要删除角色“{:s}”？"
 
+#: Source/DiabloUI/selstart.cpp:43
+msgid "Enter Hellfire"
+msgstr "进入《地狱火》"
+
 #: Source/DiabloUI/selyesno.cpp:54 Source/stores.cpp:928
 msgid "Yes"
 msgstr "是"
@@ -716,10 +749,12 @@ msgstr "否"
 
 #: Source/DiabloUI/support_lines.cpp:8
 msgid ""
-"We maintains a chat server at Discord.gg/YQKCAYQ Follow the links to join "
-"our community where we talk about things related to Diablo, and the Hellfire "
+"We maintain a chat server at Discord.gg/YQKCAYQ Follow the links to join our "
+"community where we talk about things related to Diablo, and the Hellfire "
 "expansion."
 msgstr ""
+"我们维护的聊天服务器部署在 Discord.gg/YQKCAYQ ，点击连接加入我们的社群，我们"
+"在那里谈论有关暗黑破坏神以及地狱火资料片。"
 
 #: Source/DiabloUI/support_lines.cpp:10
 msgid ""
@@ -755,6 +790,9 @@ msgid ""
 "CC-BY 4.0. The port also makes use of SDL which is licensed under the zlib-"
 "license. See the ReadMe for further details."
 msgstr ""
+"\t这个移植使用了 CharisSILB、Unifont 和 Noto，它们处于SIL Open Font License、"
+"CC-BY 4.0和Twitmoji许可授权。该移植还使用了SDL，处于zlib-license许可。更多细"
+"节请参见ReadMe。"
 
 #: Source/DiabloUI/title.cpp:44
 msgid "Copyright © 1996-2001 Blizzard Entertainment"
@@ -775,7 +813,7 @@ msgstr ""
 "\n"
 "错误发生在: {:s}，行{:d}"
 
-#: Source/appfat.cpp:115
+#: Source/appfat.cpp:116
 msgid ""
 "Unable to open main data archive ({:s}).\n"
 "\n"
@@ -785,15 +823,12 @@ msgstr ""
 "\n"
 "确保它在游戏文件夹中，并且文件名都是小写的。"
 
-msgid "diabdat.mpq or spawn.mpq"
-msgstr "diabdat.mpq或spawn.mpq"
-
-#: Source/appfat.cpp:119
+#: Source/appfat.cpp:122
 msgid "Data File Error"
 msgstr "数据文件错误"
 
 #. TRANSLATORS: Error when Program is not allowed to write data
-#: Source/appfat.cpp:127
+#: Source/appfat.cpp:130
 msgid ""
 "Unable to write to location:\n"
 "{:s}"
@@ -801,27 +836,31 @@ msgstr ""
 "无法写入位置: \n"
 "{:s}"
 
-#: Source/appfat.cpp:129
+#: Source/appfat.cpp:132
 msgid "Read-Only Directory Error"
 msgstr "只读目录错误"
 
-#: Source/automap.cpp:464
+#: Source/automap.cpp:484
 msgid "game: "
 msgstr "游戏: "
 
-#: Source/automap.cpp:470
+#: Source/automap.cpp:490
 msgid "password: "
 msgstr "密码: "
 
-#: Source/automap.cpp:483
+#: Source/automap.cpp:492
+msgid "Public Game"
+msgstr "公开游戏"
+
+#: Source/automap.cpp:504
 msgid "Level: Nest {:d}"
 msgstr "巢穴: {:d} 层"
 
-#: Source/automap.cpp:485
+#: Source/automap.cpp:506
 msgid "Level: Crypt {:d}"
 msgstr "墓穴: {:d} 层"
 
-#: Source/automap.cpp:487 Source/items.cpp:2079
+#: Source/automap.cpp:508 Source/items.cpp:2076
 msgid "Level: {:d}"
 msgstr "等级: {:d}"
 
@@ -899,7 +938,7 @@ msgstr "卷轴"
 
 #: Source/control.cpp:788 Source/control.cpp:1240
 msgid "Scroll of {:s}"
-msgstr "{:s}的卷轴"
+msgstr "{:s}卷轴"
 
 #: Source/control.cpp:793 Source/control.cpp:1246
 msgid "{:d} Scroll"
@@ -911,9 +950,9 @@ msgstr[0] "{:d}卷轴"
 msgid "Staff"
 msgstr "法杖"
 
-#: Source/control.cpp:801 Source/control.cpp:1250 Source/items.cpp:1320
+#: Source/control.cpp:801 Source/control.cpp:1250 Source/items.cpp:1317
 msgid "Staff of {:s}"
-msgstr "{:s}的法杖"
+msgstr "{:s}法杖"
 
 #: Source/control.cpp:803 Source/control.cpp:1252
 msgid "{:d} Charge"
@@ -944,7 +983,7 @@ msgstr "当前选择的法术按钮"
 msgid "Hotkey: 's'"
 msgstr "热键: “s”"
 
-#: Source/control.cpp:1374 Source/inv.cpp:1904 Source/items.cpp:3745
+#: Source/control.cpp:1374 Source/inv.cpp:1992 Source/items.cpp:3739
 msgid "{:d} gold piece"
 msgid_plural "{:d} gold pieces"
 msgstr[0] "{:d}金币堆"
@@ -1035,112 +1074,126 @@ msgstr "不洁祭坛"
 msgid "level 15"
 msgstr "15级"
 
-#: Source/diablo.cpp:112
+#: Source/diablo.cpp:114
 msgid "I need help! Come Here!"
 msgstr "我需要帮助！过来！"
 
-#: Source/diablo.cpp:113
+#: Source/diablo.cpp:115
 msgid "Follow me."
 msgstr "跟着我。"
 
-#: Source/diablo.cpp:114
+#: Source/diablo.cpp:116
 msgid "Here's something for you."
 msgstr "这是给你的。"
 
-#: Source/diablo.cpp:115
+#: Source/diablo.cpp:117
 msgid "Now you DIE!"
 msgstr "现在你死定了！"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:779
+#: Source/diablo.cpp:781
 msgid "Options:\n"
 msgstr "选项: \n"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:780
+#: Source/diablo.cpp:782
 msgid "Print this message and exit"
 msgstr "打印此消息并退出"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:781
+#: Source/diablo.cpp:783
 msgid "Print the version and exit"
 msgstr "打印版本并退出"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:782
+#: Source/diablo.cpp:784
 msgid "Specify the folder of diabdat.mpq"
 msgstr "指定diabdat.mpq的文件夹"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:783
+#: Source/diablo.cpp:785
 msgid "Specify the folder of save files"
 msgstr "指定保存文件的文件夹"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:784
+#: Source/diablo.cpp:786
 msgid "Specify the location of diablo.ini"
 msgstr "指定diablo.ini的位置"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:785
+#: Source/diablo.cpp:787
 msgid "Skip startup videos"
 msgstr "跳过启动视频"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:786
+#: Source/diablo.cpp:788
 msgid "Display frames per second"
 msgstr "每秒显示帧数"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:787
+#: Source/diablo.cpp:789
 msgid "Run in windowed mode"
 msgstr "在窗口模式下运行"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:788
+#: Source/diablo.cpp:790
 msgid "Enable verbose logging"
 msgstr "启用详细日志记录"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:789
-msgid "Force spawn mode even if diabdat.mpq is found"
-msgstr "即使找到diabdat.mpq，也使用强制生成模式"
-
-#. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:790
+#: Source/diablo.cpp:791
 msgid "Record a demo file"
 msgstr "记录一个录像文件"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:791
+#: Source/diablo.cpp:792
 msgid "Play a demo file"
 msgstr "播放录像文件"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:792
+#: Source/diablo.cpp:793
 msgid "Disable all frame limiting during demo playback"
 msgstr "播放录像回放时禁用帧数限制"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:793
+#: Source/diablo.cpp:794
 msgid ""
 "\n"
-"Hellfire options:\n"
+"Game selection:\n"
 msgstr ""
 "\n"
-"地狱火选项: \n"
+"游戏选项：\n"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:794
-msgid "Force diablo mode even if hellfire.mpq is found"
-msgstr "即使hellfire.mpq存在，也强制使用暗黑破坏神原版模式"
+#: Source/diablo.cpp:795
+msgid "Force Shareware mode"
+msgstr "强制共享版模式"
 
 #. TRANSLATORS: Commandline Option
-#: Source/diablo.cpp:795
+#: Source/diablo.cpp:796
+msgid "Force Diablo mode"
+msgstr "强制原版模式"
+
+#. TRANSLATORS: Commandline Option
+#: Source/diablo.cpp:797
+msgid "Force Hellfire mode"
+msgstr "强制地狱火模式"
+
+#. TRANSLATORS: Commandline Option
+#: Source/diablo.cpp:798
+msgid ""
+"\n"
+"Hellfire options:\n"
+msgstr ""
+"\n"
+"地狱火选项: \n"
+
+#. TRANSLATORS: Commandline Option
+#: Source/diablo.cpp:799
 msgid "Use alternate nest palette"
 msgstr "使用备用嵌套调色板"
 
-#: Source/diablo.cpp:801
+#: Source/diablo.cpp:805
 msgid ""
 "\n"
 "Report bugs at https://github.com/diasurgical/devilutionX/\n"
@@ -1148,32 +1201,32 @@ msgstr ""
 "\n"
 "报告错误https://github.com/diasurgical/devilutionX/\n"
 
-#: Source/diablo.cpp:865
+#: Source/diablo.cpp:869
 msgid "unrecognized option '{:s}'\n"
 msgstr "无法识别的选项{:s}\n"
 
-#: Source/diablo.cpp:896
+#: Source/diablo.cpp:900
 msgid "version {:s}"
 msgstr "版本{:s}"
 
-#: Source/diablo.cpp:1203
+#: Source/diablo.cpp:1218
 msgid "-- Network timeout --"
 msgstr "--网络超时--"
 
-#: Source/diablo.cpp:1204
+#: Source/diablo.cpp:1219
 msgid "-- Waiting for players --"
 msgstr "--等待玩家--"
 
-#: Source/diablo.cpp:1223
+#: Source/diablo.cpp:1238
 msgid "No help available"
 msgstr "没有可用的帮助"
 
-#: Source/diablo.cpp:1224
+#: Source/diablo.cpp:1239
 msgid "while in stores"
 msgstr "在商店里"
 
 #. TRANSLATORS: {:s} means: Character Name, Game Version, Game Difficulty.
-#: Source/diablo.cpp:1436
+#: Source/diablo.cpp:1451
 msgid "{:s}, version = {:s}, mode = {:s}"
 msgstr "{:s}, 版本 = {:s}, 模式 = {:s}"
 
@@ -1181,11 +1234,11 @@ msgstr "{:s}, 版本 = {:s}, 模式 = {:s}"
 msgid "loopback"
 msgstr "环回"
 
-#: Source/dvlnet/tcp_client.cpp:68
+#: Source/dvlnet/tcp_client.cpp:65
 msgid "Unable to connect"
 msgstr "无法连接"
 
-#: Source/dvlnet/tcp_client.cpp:89
+#: Source/dvlnet/tcp_client.cpp:86
 msgid "error: read 0 bytes from server"
 msgstr "错误: 从服务器读取了0个字节"
 
@@ -1469,10 +1522,6 @@ msgstr "伽马"
 msgid "Speed"
 msgstr "速度"
 
-#: Source/gamemenu.cpp:61
-msgid "Previous Menu"
-msgstr "上一个菜单"
-
 #: Source/gamemenu.cpp:68
 msgid "Music Disabled"
 msgstr "音乐已禁用"
@@ -1704,31 +1753,35 @@ msgid ""
 "you to cast the spell more effectively."
 msgstr "阅读不止一本书可以增加您对该法术的了解，使您能够更有效地施展该法术。"
 
-#: Source/help.cpp:129
+#: Source/help.cpp:135
 msgid "Shareware Hellfire Help"
 msgstr "共享软件地狱火帮助"
 
-#: Source/help.cpp:129
+#: Source/help.cpp:135
 msgid "Hellfire Help"
 msgstr "地狱火帮助"
 
-#: Source/help.cpp:131
+#: Source/help.cpp:137
 msgid "Shareware Diablo Help"
 msgstr "共享软件暗黑破坏神帮助"
 
-#: Source/help.cpp:131
+#: Source/help.cpp:137
 msgid "Diablo Help"
 msgstr "暗黑破坏神帮助"
 
-#: Source/help.cpp:155
+#: Source/help.cpp:161
 msgid "Press ESC to end or the arrow keys to scroll."
 msgstr "按ESC键结束，或按方向键滚动。"
 
-#: Source/init.cpp:217
+#: Source/init.cpp:206
+msgid "diabdat.mpq or spawn.mpq"
+msgstr "diabdat.mpq或spawn.mpq"
+
+#: Source/init.cpp:226
 msgid "Some Hellfire MPQs are missing"
 msgstr "一些地狱火MPQ无法找到"
 
-#: Source/init.cpp:217
+#: Source/init.cpp:226
 msgid ""
 "Not all Hellfire MPQs were found.\n"
 "Please copy all the hf*.mpq files."
@@ -1736,11 +1789,11 @@ msgstr ""
 "地狱火MPQ未能全部找到。\n"
 "请复制所有hf*.mpq文件。"
 
-#: Source/init.cpp:227
+#: Source/init.cpp:234
 msgid "Unable to create main window"
 msgstr "无法创建主窗口"
 
-#: Source/itemdat.cpp:16 Source/itemdat.cpp:198 Source/panels/charpanel.cpp:154
+#: Source/itemdat.cpp:16 Source/itemdat.cpp:198 Source/panels/charpanel.cpp:155
 msgid "Gold"
 msgstr "金币"
 
@@ -1980,7 +2033,7 @@ msgid "Quilted Armor"
 msgstr "内衬甲"
 
 #: Source/itemdat.cpp:74 Source/itemdat.cpp:75 Source/itemdat.cpp:76
-#: Source/itemdat.cpp:77 Source/objects.cpp:5459
+#: Source/itemdat.cpp:77 Source/objects.cpp:5435
 msgid "Armor"
 msgstr "护甲"
 
@@ -2397,7 +2450,7 @@ msgstr "秘银"
 msgid "Meteoric"
 msgstr "陨铁"
 
-#: Source/itemdat.cpp:202 Source/objects.cpp:104
+#: Source/itemdat.cpp:202 Source/objects.cpp:107
 msgid "Weird"
 msgstr "诡异"
 
@@ -2533,7 +2586,7 @@ msgstr "圣者"
 msgid "Awesome"
 msgstr "惊叹"
 
-#: Source/itemdat.cpp:237 Source/objects.cpp:116
+#: Source/itemdat.cpp:237 Source/objects.cpp:119
 msgid "Holy"
 msgstr "圣佑"
 
@@ -3540,640 +3593,649 @@ msgstr "{0}{1}"
 msgid "{0} of {1}"
 msgstr "{1}{0}"
 
-#: Source/items.cpp:1895 Source/items.cpp:1907
+#: Source/items.cpp:1892 Source/items.cpp:1904
 msgid "increases a weapon's"
 msgstr "增加武器的"
 
-#: Source/items.cpp:1897
+#: Source/items.cpp:1894
 msgid "chance to hit"
 msgstr "命中概率"
 
-#: Source/items.cpp:1901
+#: Source/items.cpp:1898
 msgid "greatly increases a"
 msgstr "显著增加一件"
 
-#: Source/items.cpp:1903
+#: Source/items.cpp:1900
 msgid "weapon's chance to hit"
 msgstr "武器命中概率"
 
-#: Source/items.cpp:1909
+#: Source/items.cpp:1906
 msgid "damage potential"
 msgstr "伤害潜力"
 
-#: Source/items.cpp:1913
+#: Source/items.cpp:1910
 msgid "greatly increases a weapon's"
 msgstr "大大提高非弓类武器"
 
-#: Source/items.cpp:1915
+#: Source/items.cpp:1912
 msgid "damage potential - not bows"
 msgstr "的伤害潜力"
 
-#: Source/items.cpp:1919
+#: Source/items.cpp:1916
 msgid "reduces attributes needed"
 msgstr "减少护甲或武器"
 
-#: Source/items.cpp:1921
+#: Source/items.cpp:1918
 msgid "to use armor or weapons"
 msgstr "使用所需属性"
 
-#: Source/items.cpp:1925
+#: Source/items.cpp:1922
 #, no-c-format
 msgid "restores 20% of an"
 msgstr "恢复20%的"
 
-#: Source/items.cpp:1927
+#: Source/items.cpp:1924
 msgid "item's durability"
 msgstr "物品耐久度"
 
-#: Source/items.cpp:1931
+#: Source/items.cpp:1928
 msgid "increases an item's"
 msgstr "增加一件物品的"
 
-#: Source/items.cpp:1933
+#: Source/items.cpp:1930
 msgid "current and max durability"
 msgstr "当前和最大耐久度"
 
-#: Source/items.cpp:1937
+#: Source/items.cpp:1934
 msgid "makes an item indestructible"
 msgstr "使物品坚不可摧"
 
-#: Source/items.cpp:1941
+#: Source/items.cpp:1938
 msgid "increases the armor class"
 msgstr "增加护甲和盾牌的"
 
-#: Source/items.cpp:1943
+#: Source/items.cpp:1940
 msgid "of armor and shields"
 msgstr "护甲等级"
 
-#: Source/items.cpp:1947
+#: Source/items.cpp:1944
 msgid "greatly increases the armor"
 msgstr "极大增加护甲和盾牌"
 
-#: Source/items.cpp:1949
+#: Source/items.cpp:1946
 msgid "class of armor and shields"
 msgstr "的护甲等级"
 
-#: Source/items.cpp:1953 Source/items.cpp:1962
+#: Source/items.cpp:1950 Source/items.cpp:1959
 msgid "sets fire trap"
 msgstr "设置火焰陷阱"
 
-#: Source/items.cpp:1958
+#: Source/items.cpp:1955
 msgid "sets lightning trap"
 msgstr "设置闪电陷阱"
 
-#: Source/items.cpp:1966
+#: Source/items.cpp:1963
 msgid "sets petrification trap"
 msgstr "设置石化陷阱"
 
-#: Source/items.cpp:1970
+#: Source/items.cpp:1967
 msgid "restore all life"
 msgstr "恢复所有生命值"
 
-#: Source/items.cpp:1974
+#: Source/items.cpp:1971
 msgid "restore some life"
 msgstr "恢复部分生命值"
 
-#: Source/items.cpp:1978
+#: Source/items.cpp:1975
 msgid "recover life"
 msgstr "恢复生命值"
 
-#: Source/items.cpp:1982
+#: Source/items.cpp:1979
 msgid "deadly heal"
 msgstr "治疗致命伤"
 
-#: Source/items.cpp:1986
+#: Source/items.cpp:1983
 msgid "restore some mana"
 msgstr "恢复部分法力"
 
-#: Source/items.cpp:1990
+#: Source/items.cpp:1987
 msgid "restore all mana"
 msgstr "恢复所有法力"
 
-#: Source/items.cpp:1994
+#: Source/items.cpp:1991
 msgid "increase strength"
 msgstr "增加力量"
 
-#: Source/items.cpp:1998
+#: Source/items.cpp:1995
 msgid "increase magic"
 msgstr "增加魔法"
 
-#: Source/items.cpp:2002
+#: Source/items.cpp:1999
 msgid "increase dexterity"
 msgstr "增加敏捷"
 
-#: Source/items.cpp:2006
+#: Source/items.cpp:2003
 msgid "increase vitality"
 msgstr "增加活力"
 
-#: Source/items.cpp:2011
+#: Source/items.cpp:2008
 msgid "decrease strength"
 msgstr "降低力量"
 
-#: Source/items.cpp:2015
+#: Source/items.cpp:2012
 msgid "decrease dexterity"
 msgstr "降低敏捷"
 
-#: Source/items.cpp:2019
+#: Source/items.cpp:2016
 msgid "decrease vitality"
 msgstr "降低活力"
 
-#: Source/items.cpp:2023
+#: Source/items.cpp:2020
 msgid "restore some life and mana"
 msgstr "恢复部分生命和法力"
 
-#: Source/items.cpp:2027
+#: Source/items.cpp:2024
 msgid "restore all life and mana"
 msgstr "恢复所有生命和法力"
 
-#: Source/items.cpp:2042 Source/items.cpp:2067
+#: Source/items.cpp:2039 Source/items.cpp:2064
 msgid "Right-click to read"
 msgstr "右击阅读"
 
-#: Source/items.cpp:2046
+#: Source/items.cpp:2043
 msgid "Right-click to read, then"
 msgstr "右击阅读，然后"
 
-#: Source/items.cpp:2048
+#: Source/items.cpp:2045
 msgid "left-click to target"
 msgstr "左击目标"
 
-#: Source/items.cpp:2053
+#: Source/items.cpp:2050
 msgid "Right-click to use"
 msgstr "右击使用"
 
-#: Source/items.cpp:2058 Source/items.cpp:2063
+#: Source/items.cpp:2055 Source/items.cpp:2060
 msgid "Right click to use"
 msgstr "右击使用"
 
-#: Source/items.cpp:2071
+#: Source/items.cpp:2068
 msgid "Right click to read"
 msgstr "右击阅读"
 
-#: Source/items.cpp:2075
+#: Source/items.cpp:2072
 msgid "Right-click to view"
 msgstr "右击查看"
 
-#: Source/items.cpp:2083
+#: Source/items.cpp:2080
 msgid "Doubles gold capacity"
 msgstr "金币容量翻倍"
 
-#: Source/items.cpp:2095 Source/stores.cpp:212
+#: Source/items.cpp:2092 Source/stores.cpp:212
 msgid "Required:"
 msgstr "需求:"
 
-#: Source/items.cpp:2097 Source/stores.cpp:214
+#: Source/items.cpp:2094 Source/stores.cpp:214
 msgid " {:d} Str"
 msgstr " {:d} 力量"
 
-#: Source/items.cpp:2099 Source/stores.cpp:216
+#: Source/items.cpp:2096 Source/stores.cpp:216
 msgid " {:d} Mag"
 msgstr " {:d} 魔法"
 
-#: Source/items.cpp:2101 Source/stores.cpp:218
+#: Source/items.cpp:2098 Source/stores.cpp:218
 msgid " {:d} Dex"
 msgstr " {:d} 敏捷"
 
 #. TRANSLATORS: {:s} will be a Character Name
-#: Source/items.cpp:3529 Source/player.cpp:3027
+#: Source/items.cpp:3523 Source/player.cpp:3027
 msgid "Ear of {:s}"
 msgstr "{:s}的耳朵"
 
-#: Source/items.cpp:3824
+#: Source/items.cpp:3818
 msgid "chance to hit: {:+d}%"
 msgstr "命中几率: {:+d}%"
 
-#: Source/items.cpp:3828
+#: Source/items.cpp:3822
 #, no-c-format
 msgid "{:+d}% damage"
 msgstr "{:+d}% 伤害"
 
-#: Source/items.cpp:3832 Source/items.cpp:4088
+#: Source/items.cpp:3826 Source/items.cpp:4082
 msgid "to hit: {:+d}%, {:+d}% damage"
 msgstr "命中: {:+d}%, {:+d}%伤害"
 
-#: Source/items.cpp:3836
+#: Source/items.cpp:3830
 #, no-c-format
 msgid "{:+d}% armor"
 msgstr "{:+d}% 护甲"
 
-#: Source/items.cpp:3840
+#: Source/items.cpp:3834
 msgid "armor class: {:d}"
 msgstr "护甲等级: {:d}"
 
-#: Source/items.cpp:3845 Source/items.cpp:4070
+#: Source/items.cpp:3839 Source/items.cpp:4064
 msgid "Resist Fire: {:+d}%"
 msgstr "火焰抗性: {:+d}%"
 
-#: Source/items.cpp:3847
+#: Source/items.cpp:3841
 #, no-c-format
 msgid "Resist Fire: 75% MAX"
 msgstr "火焰抗性: 最大75%"
 
-#: Source/items.cpp:3852
+#: Source/items.cpp:3846
 msgid "Resist Lightning: {:+d}%"
 msgstr "闪电抗性: {:+d}%"
 
-#: Source/items.cpp:3854
+#: Source/items.cpp:3848
 #, no-c-format
 msgid "Resist Lightning: 75% MAX"
 msgstr "闪电抗性: 最大75%"
 
-#: Source/items.cpp:3859
+#: Source/items.cpp:3853
 msgid "Resist Magic: {:+d}%"
 msgstr "抵抗魔法: {:+d}%"
 
-#: Source/items.cpp:3861
+#: Source/items.cpp:3855
 #, no-c-format
 msgid "Resist Magic: 75% MAX"
 msgstr "抵抗魔法: 最大75%"
 
-#: Source/items.cpp:3866
+#: Source/items.cpp:3860
 msgid "Resist All: {:+d}%"
 msgstr "所有抗性: {:+d}%"
 
-#: Source/items.cpp:3868
+#: Source/items.cpp:3862
 #, no-c-format
 msgid "Resist All: 75% MAX"
 msgstr "所有抗性: 最大75%"
 
-#: Source/items.cpp:3872
+#: Source/items.cpp:3866
 msgid "spells are increased {:d} level"
 msgid_plural "spells are increased {:d} levels"
 msgstr[0] "法术增加{:d}级"
 
-#: Source/items.cpp:3874
+#: Source/items.cpp:3868
 msgid "spells are decreased {:d} level"
 msgid_plural "spells are decreased {:d} levels"
 msgstr[0] "法术降低{:d}级"
 
-#: Source/items.cpp:3876
+#: Source/items.cpp:3870
 msgid "spell levels unchanged (?)"
 msgstr "法术等级不变(?)"
 
-#: Source/items.cpp:3879
+#: Source/items.cpp:3873
 msgid "Extra charges"
 msgstr "额外充能次数"
 
-#: Source/items.cpp:3882
+#: Source/items.cpp:3876
 msgid "{:d} {:s} charge"
 msgid_plural "{:d} {:s} charges"
 msgstr[0] "{:d} {:s} 充能"
 
-#: Source/items.cpp:3886
+#: Source/items.cpp:3880
 msgid "Fire hit damage: {:d}"
 msgstr "火焰伤害: {:d}"
 
-#: Source/items.cpp:3888
+#: Source/items.cpp:3882
 msgid "Fire hit damage: {:d}-{:d}"
 msgstr "火焰伤害: {:d}-{:d}"
 
-#: Source/items.cpp:3892
+#: Source/items.cpp:3886
 msgid "Lightning hit damage: {:d}"
 msgstr "闪电伤害: {:d}"
 
-#: Source/items.cpp:3894
+#: Source/items.cpp:3888
 msgid "Lightning hit damage: {:d}-{:d}"
 msgstr "闪电伤害: {:d}-{:d}"
 
-#: Source/items.cpp:3898
+#: Source/items.cpp:3892
 msgid "{:+d} to strength"
 msgstr "{:+d} 力量"
 
-#: Source/items.cpp:3902
+#: Source/items.cpp:3896
 msgid "{:+d} to magic"
 msgstr "{:+d} 魔法"
 
-#: Source/items.cpp:3906
+#: Source/items.cpp:3900
 msgid "{:+d} to dexterity"
 msgstr "{:+d} 敏捷"
 
-#: Source/items.cpp:3910
+#: Source/items.cpp:3904
 msgid "{:+d} to vitality"
 msgstr "{:+d} 活力"
 
-#: Source/items.cpp:3914
+#: Source/items.cpp:3908
 msgid "{:+d} to all attributes"
 msgstr "{:+d} 所有属性"
 
-#: Source/items.cpp:3918
+#: Source/items.cpp:3912
 msgid "{:+d} damage from enemies"
 msgstr "{:+d} 来自敌人的伤害"
 
-#: Source/items.cpp:3922
+#: Source/items.cpp:3916
 msgid "Hit Points: {:+d}"
 msgstr "生命值: {:+d}"
 
-#: Source/items.cpp:3926
+#: Source/items.cpp:3920
 msgid "Mana: {:+d}"
 msgstr "法力值: {:+d}"
 
-#: Source/items.cpp:3929
+#: Source/items.cpp:3923
 msgid "high durability"
 msgstr "高耐久度"
 
-#: Source/items.cpp:3932
+#: Source/items.cpp:3926
 msgid "decreased durability"
 msgstr "耐久度降低"
 
-#: Source/items.cpp:3935
+#: Source/items.cpp:3929
 msgid "indestructible"
 msgstr "坚不可摧"
 
-#: Source/items.cpp:3938
+#: Source/items.cpp:3932
 #, no-c-format
 msgid "+{:d}% light radius"
 msgstr "+{:d}% 照亮范围"
 
-#: Source/items.cpp:3941
+#: Source/items.cpp:3935
 #, no-c-format
 msgid "-{:d}% light radius"
 msgstr "-{:d}% 照亮范围"
 
-#: Source/items.cpp:3944
+#: Source/items.cpp:3938
 msgid "multiple arrows per shot"
 msgstr "多重射击"
 
-#: Source/items.cpp:3948
+#: Source/items.cpp:3942
 msgid "fire arrows damage: {:d}"
 msgstr "火箭伤害: {:d}"
 
-#: Source/items.cpp:3950
+#: Source/items.cpp:3944
 msgid "fire arrows damage: {:d}-{:d}"
 msgstr "火箭伤害: {:d}-{:d}"
 
-#: Source/items.cpp:3954
+#: Source/items.cpp:3948
 msgid "lightning arrows damage {:d}"
 msgstr "闪电箭伤害{:d}"
 
-#: Source/items.cpp:3956
+#: Source/items.cpp:3950
 msgid "lightning arrows damage {:d}-{:d}"
 msgstr "闪电箭伤害{:d}-{:d}"
 
-#: Source/items.cpp:3960
+#: Source/items.cpp:3954
 msgid "fireball damage: {:d}"
 msgstr "火球伤害: {:d}"
 
-#: Source/items.cpp:3962
+#: Source/items.cpp:3956
 msgid "fireball damage: {:d}-{:d}"
 msgstr "火球伤害: {:d}-{:d}"
 
-#: Source/items.cpp:3965
+#: Source/items.cpp:3959
 msgid "attacker takes 1-3 damage"
 msgstr "攻击者受到1-3点伤害"
 
-#: Source/items.cpp:3968
+#: Source/items.cpp:3962
 msgid "user loses all mana"
 msgstr "使用者失去所有法力值"
 
-#: Source/items.cpp:3971
+#: Source/items.cpp:3965
 msgid "you can't heal"
 msgstr "你无法治愈"
 
-#: Source/items.cpp:3974
+#: Source/items.cpp:3968
 msgid "absorbs half of trap damage"
 msgstr "吸收一半陷阱伤害"
 
-#: Source/items.cpp:3977
+#: Source/items.cpp:3971
 msgid "knocks target back"
 msgstr "击退目标"
 
-#: Source/items.cpp:3980
+#: Source/items.cpp:3974
 #, no-c-format
 msgid "+200% damage vs. demons"
 msgstr "+200% 对恶魔的伤害"
 
-#: Source/items.cpp:3983
+#: Source/items.cpp:3977
 msgid "All Resistance equals 0"
 msgstr "所有抗性变为0"
 
-#: Source/items.cpp:3986
+#: Source/items.cpp:3980
 msgid "hit monster doesn't heal"
 msgstr "命中怪物无法自愈"
 
-#: Source/items.cpp:3990
+#: Source/items.cpp:3984
 #, no-c-format
 msgid "hit steals 3% mana"
 msgstr "命中时3%法力偷取"
 
-#: Source/items.cpp:3992
+#: Source/items.cpp:3986
 #, no-c-format
 msgid "hit steals 5% mana"
 msgstr "命中时5%法力偷取"
 
-#: Source/items.cpp:3996
+#: Source/items.cpp:3990
 #, no-c-format
 msgid "hit steals 3% life"
 msgstr "命中时3%生命偷取"
 
-#: Source/items.cpp:3998
+#: Source/items.cpp:3992
 #, no-c-format
 msgid "hit steals 5% life"
 msgstr "命中时5%生命偷取"
 
-#: Source/items.cpp:4001
+#: Source/items.cpp:3995
 msgid "penetrates target's armor"
 msgstr "穿透目标的护甲"
 
-#: Source/items.cpp:4005
+#: Source/items.cpp:3999
 msgid "quick attack"
 msgstr "快速攻击"
 
-#: Source/items.cpp:4007
+#: Source/items.cpp:4001
 msgid "fast attack"
 msgstr "更快攻击"
 
-#: Source/items.cpp:4009
+#: Source/items.cpp:4003
 msgid "faster attack"
 msgstr "极速攻击"
 
-#: Source/items.cpp:4011
+#: Source/items.cpp:4005
 msgid "fastest attack"
 msgstr "最快攻击"
 
-#: Source/items.cpp:4015
+#: Source/items.cpp:4009
 msgid "fast hit recovery"
 msgstr "快速打击回复"
 
-#: Source/items.cpp:4017
+#: Source/items.cpp:4011
 msgid "faster hit recovery"
 msgstr "更快打击回复"
 
-#: Source/items.cpp:4019
+#: Source/items.cpp:4013
 msgid "fastest hit recovery"
 msgstr "最快打击回复"
 
-#: Source/items.cpp:4022
+#: Source/items.cpp:4016
 msgid "fast block"
 msgstr "快速格挡"
 
-#: Source/items.cpp:4025
+#: Source/items.cpp:4019
 msgid "adds {:d} point to damage"
 msgid_plural "adds {:d} points to damage"
 msgstr[0] "增加{:d}点伤害"
 
-#: Source/items.cpp:4028
+#: Source/items.cpp:4022
 msgid "fires random speed arrows"
 msgstr "发射随机速度箭矢"
 
-#: Source/items.cpp:4031
+#: Source/items.cpp:4025
 msgid "unusual item damage"
 msgstr "异常的物品损坏"
 
-#: Source/items.cpp:4034
+#: Source/items.cpp:4028
 msgid "altered durability"
 msgstr "改变耐久度"
 
-#: Source/items.cpp:4037
+#: Source/items.cpp:4031
 msgid "Faster attack swing"
 msgstr "更快的挥动"
 
-#: Source/items.cpp:4040
+#: Source/items.cpp:4034
 msgid "one handed sword"
 msgstr "单手剑"
 
-#: Source/items.cpp:4043
+#: Source/items.cpp:4037
 msgid "constantly lose hit points"
 msgstr "持续失去生命值"
 
-#: Source/items.cpp:4046
+#: Source/items.cpp:4040
 msgid "life stealing"
 msgstr "生命偷取"
 
-#: Source/items.cpp:4049
+#: Source/items.cpp:4043
 msgid "no strength requirement"
 msgstr "无力量要求"
 
-#: Source/items.cpp:4052
+#: Source/items.cpp:4046
 msgid "see with infravision"
 msgstr "夜视能力"
 
-#: Source/items.cpp:4059
+#: Source/items.cpp:4053
 msgid "lightning damage: {:d}"
 msgstr "闪电伤害: {:d}"
 
-#: Source/items.cpp:4061
+#: Source/items.cpp:4055
 msgid "lightning damage: {:d}-{:d}"
 msgstr "闪电伤害: {:d}-{:d}"
 
-#: Source/items.cpp:4064
+#: Source/items.cpp:4058
 msgid "charged bolts on hits"
 msgstr "击中时触发电荷弹"
 
-#: Source/items.cpp:4073
+#: Source/items.cpp:4067
 msgid "occasional triple damage"
 msgstr "有概率造成三倍伤害"
 
-#: Source/items.cpp:4076
+#: Source/items.cpp:4070
 #, no-c-format
 msgid "decaying {:+d}% damage"
 msgstr "减少{:+d}%伤害"
 
-#: Source/items.cpp:4079
+#: Source/items.cpp:4073
 msgid "2x dmg to monst, 1x to you"
 msgstr "2x 对怪物伤害，1x 反噬自身"
 
-#: Source/items.cpp:4082
+#: Source/items.cpp:4076
 #, no-c-format
 msgid "Random 0 - 500% damage"
 msgstr "随机0-500%伤害"
 
-#: Source/items.cpp:4085
+#: Source/items.cpp:4079
 #, no-c-format
 msgid "low dur, {:+d}% damage"
 msgstr "低耐久，{:+d}% d伤害"
 
-#: Source/items.cpp:4091
+#: Source/items.cpp:4085
 msgid "extra AC vs demons"
 msgstr "对抗恶魔的额外精准"
 
-#: Source/items.cpp:4094
+#: Source/items.cpp:4088
 msgid "extra AC vs undead"
 msgstr "对抗亡灵的额外精准"
 
-#: Source/items.cpp:4097
+#: Source/items.cpp:4091
 #, no-c-format
 msgid "50% Mana moved to Health"
 msgstr "50%法力值转换至生命值"
 
-#: Source/items.cpp:4100
+#: Source/items.cpp:4094
 #, no-c-format
 msgid "40% Health moved to Mana"
 msgstr "40%的生命值转换至法力值"
 
-#: Source/items.cpp:4103
+#: Source/items.cpp:4097
 msgid "Another ability (NW)"
 msgstr "另一种能力(NW)"
 
-#: Source/items.cpp:4140 Source/items.cpp:4187
+#: Source/items.cpp:4134 Source/items.cpp:4181
 msgid "damage: {:d}  Indestructible"
 msgstr "伤害: {:d}  坚不可摧"
 
 #. TRANSLATORS: Dur: is durability
-#: Source/items.cpp:4142 Source/items.cpp:4189
+#: Source/items.cpp:4136 Source/items.cpp:4183
 msgid "damage: {:d}  Dur: {:d}/{:d}"
 msgstr "伤害: {:d} 耐久: {:d}/{:d}"
 
-#: Source/items.cpp:4145 Source/items.cpp:4192
+#: Source/items.cpp:4139 Source/items.cpp:4186
 msgid "damage: {:d}-{:d}  Indestructible"
 msgstr "伤害: {:d}-{:d} 坚不可摧"
 
 #. TRANSLATORS: Dur: is durability
-#: Source/items.cpp:4147 Source/items.cpp:4194
+#: Source/items.cpp:4141 Source/items.cpp:4188
 msgid "damage: {:d}-{:d}  Dur: {:d}/{:d}"
 msgstr "伤害: {:d}-{:d} 耐久: {:d}/{:d}"
 
-#: Source/items.cpp:4153 Source/items.cpp:4206
+#: Source/items.cpp:4147 Source/items.cpp:4200
 msgid "armor: {:d}  Indestructible"
 msgstr "护甲: {:d} 坚不可摧"
 
 #. TRANSLATORS: Dur: is durability
-#: Source/items.cpp:4155 Source/items.cpp:4208
+#: Source/items.cpp:4149 Source/items.cpp:4202
 msgid "armor: {:d}  Dur: {:d}/{:d}"
 msgstr "护甲: {:d} 耐久: {:d}/{:d}"
 
 #. TRANSLATORS: dam: is damage Dur: is durability
-#: Source/items.cpp:4160
+#: Source/items.cpp:4154
 msgid "dam: {:d}  Dur: {:d}/{:d}"
 msgstr "伤害: {:d} 耐久: {:d}/{:d}"
 
 #. TRANSLATORS: dam: is damage Dur: is durability
-#: Source/items.cpp:4162
+#: Source/items.cpp:4156
 msgid "dam: {:d}-{:d}  Dur: {:d}/{:d}"
 msgstr "伤害: {:d}-{:d} 耐久: {:d}/{:d}"
 
-#: Source/items.cpp:4163 Source/items.cpp:4198 Source/items.cpp:4213
+#: Source/items.cpp:4157 Source/items.cpp:4192 Source/items.cpp:4207
 #: Source/stores.cpp:184
 msgid "Charges: {:d}/{:d}"
 msgstr "充能: {:d}/{:d}"
 
-#: Source/items.cpp:4175
+#: Source/items.cpp:4169
 msgid "unique item"
 msgstr "独特装备"
 
-#: Source/items.cpp:4202 Source/items.cpp:4211 Source/items.cpp:4218
+#: Source/items.cpp:4196 Source/items.cpp:4205 Source/items.cpp:4212
 msgid "Not Identified"
 msgstr "未鉴定"
 
-#: Source/loadsave.cpp:1661 Source/loadsave.cpp:2123
+#: Source/loadsave.cpp:1683 Source/loadsave.cpp:2149
 msgid "Unable to open save file archive"
 msgstr "无法打开保存文件存档"
 
-#: Source/loadsave.cpp:1664
+#: Source/loadsave.cpp:1686
 msgid "Invalid save file"
 msgstr "无效的保存文件"
 
-#: Source/loadsave.cpp:1693
+#: Source/loadsave.cpp:1717
 msgid "Player is on a Hellfire only level"
 msgstr "玩家处于地狱火特有地图"
 
-#: Source/loadsave.cpp:1886
+#: Source/loadsave.cpp:1912
 msgid "Invalid game state"
 msgstr "无效的游戏状态"
 
-#: Source/menu.cpp:144
+#: Source/menu.cpp:154
 msgid "Unable to display mainmenu"
 msgstr "无法显示主菜单"
 
+#. TRANSLATORS:  Error Message when a Shareware User clicks on "Replay Intro" in the Main Menu
+#: Source/menu.cpp:179
+msgid ""
+"The Diablo introduction cinematic is only available in the full retail "
+"version of Diablo. Visit https://www.gog.com/game/diablo to purchase."
+msgstr ""
+"暗黑破坏神介绍影片只在完整的零售版暗黑破坏神提供。请前往 https://www.gog.com/"
+"game/diablo 购买。"
+
 #. TRANSLATORS: Monster Block start
 #. MT_NZOMBIE
 #: Source/monstdat.cpp:20
@@ -4754,10 +4816,9 @@ msgstr "鞭状蠕虫"
 
 #: Source/monstdat.cpp:142
 #, fuzzy
-#| msgid "Torchant"
 msgctxt "monster"
 msgid "Torchant"
-msgstr "托尔昌特"
+msgstr "火蚂蚁"
 
 #: Source/monstdat.cpp:143 Source/monstdat.cpp:483
 msgctxt "monster"
@@ -5053,18 +5114,18 @@ msgstr "死亡之影·肉锤"
 #: Source/monstdat.cpp:518
 msgctxt "monster"
 msgid "Warmaggot the Mad"
-msgstr "疯狂的蛆虫"
+msgstr "疯狂的战斗蛆虫"
 
 #: Source/monstdat.cpp:519
 #, fuzzy
 msgctxt "monster"
 msgid "Glasskull the Jagged"
-msgstr "边沿破碎玻璃的颅骨"
+msgstr "玻璃颅·锯齿"
 
 #: Source/monstdat.cpp:520
 msgctxt "monster"
 msgid "Blightfire"
-msgstr "明火"
+msgstr "死疫之火"
 
 #: Source/monstdat.cpp:521
 msgctxt "monster"
@@ -5084,7 +5145,7 @@ msgstr "青铜拳·火石"
 #: Source/monstdat.cpp:524
 msgctxt "monster"
 msgid "Wrathfire the Doomed"
-msgstr "愤怒火·末日"
+msgstr "怒火·末日"
 
 #: Source/monstdat.cpp:525
 msgctxt "monster"
@@ -5119,7 +5180,7 @@ msgstr "疯燃者"
 #: Source/monstdat.cpp:531
 msgctxt "monster"
 msgid "Bonesaw the Litch"
-msgstr "巫妖骨锯"
+msgstr "骨锯·巫妖"
 
 #: Source/monstdat.cpp:532
 msgctxt "monster"
@@ -5331,71 +5392,71 @@ msgctxt "monster"
 msgid "Doomlock"
 msgstr "杜姆洛克"
 
-#: Source/monster.cpp:3495
+#: Source/monster.cpp:3497
 msgid "Animal"
 msgstr "野兽"
 
-#: Source/monster.cpp:3497
+#: Source/monster.cpp:3499
 msgid "Demon"
 msgstr "恶魔"
 
-#: Source/monster.cpp:3499
+#: Source/monster.cpp:3501
 msgid "Undead"
 msgstr "亡灵"
 
-#: Source/monster.cpp:4630
+#: Source/monster.cpp:4632
 msgid "Type: {:s}  Kills: {:d}"
 msgstr "类型: {:s} 击杀: {:d}"
 
-#: Source/monster.cpp:4632
+#: Source/monster.cpp:4634
 msgid "Total kills: {:d}"
 msgstr "击杀总数: {:d}"
 
-#: Source/monster.cpp:4665
+#: Source/monster.cpp:4667
 msgid "Hit Points: {:d}-{:d}"
 msgstr "生命值: {:d}-{:d}"
 
-#: Source/monster.cpp:4671
+#: Source/monster.cpp:4673
 msgid "No magic resistance"
 msgstr "没有魔法抗性"
 
-#: Source/monster.cpp:4675
+#: Source/monster.cpp:4677
 msgid "Resists: "
 msgstr "抗性: "
 
-#: Source/monster.cpp:4677 Source/monster.cpp:4688
+#: Source/monster.cpp:4679 Source/monster.cpp:4690
 msgid "Magic "
 msgstr "魔法 "
 
-#: Source/monster.cpp:4679 Source/monster.cpp:4690
+#: Source/monster.cpp:4681 Source/monster.cpp:4692
 msgid "Fire "
 msgstr "火焰 "
 
-#: Source/monster.cpp:4681 Source/monster.cpp:4692
+#: Source/monster.cpp:4683 Source/monster.cpp:4694
 msgid "Lightning "
 msgstr "闪电 "
 
-#: Source/monster.cpp:4686
+#: Source/monster.cpp:4688
 msgid "Immune: "
 msgstr "免疫: "
 
-#: Source/monster.cpp:4704
+#: Source/monster.cpp:4706
 msgid "Type: {:s}"
 msgstr "类型: {:s}"
 
-#: Source/monster.cpp:4710 Source/monster.cpp:4717
+#: Source/monster.cpp:4712 Source/monster.cpp:4719
 msgid "No resistances"
 msgstr "无抗性"
 
-#: Source/monster.cpp:4712 Source/monster.cpp:4722
+#: Source/monster.cpp:4714 Source/monster.cpp:4724
 msgid "No Immunities"
 msgstr "无免疫"
 
-#: Source/monster.cpp:4715
+#: Source/monster.cpp:4717
 msgid "Some Magic Resistances"
 msgstr "部分魔法抗性"
 
-#: Source/monster.cpp:4720
+#: Source/monster.cpp:4722
 msgid "Some Magic Immunities"
 msgstr "部分魔法免疫"
 
@@ -5403,482 +5464,482 @@ msgstr "部分魔法免疫"
 msgid "Trying to drop a floor item?"
 msgstr "尝试扔掉一些物品?"
 
-#: Source/msg.cpp:984 Source/msg.cpp:1019 Source/msg.cpp:1052
-#: Source/msg.cpp:1179 Source/msg.cpp:1211 Source/msg.cpp:1243
-#: Source/msg.cpp:1273
+#: Source/msg.cpp:982 Source/msg.cpp:1017 Source/msg.cpp:1048
+#: Source/msg.cpp:1175 Source/msg.cpp:1207 Source/msg.cpp:1239
+#: Source/msg.cpp:1269
 msgid "{:s} has cast an illegal spell."
 msgstr "{:s}施放了非法法术。"
 
-#: Source/msg.cpp:1659 Source/multi.cpp:803
+#: Source/msg.cpp:1655 Source/multi.cpp:805
 msgid "Player '{:s}' (level {:d}) just joined the game"
 msgstr "玩家{:s}(等级{:d})刚加入了游戏"
 
-#: Source/msg.cpp:1963
+#: Source/msg.cpp:1959
 msgid "Waiting for game data..."
 msgstr "正在等待游戏数据……"
 
-#: Source/msg.cpp:1971
+#: Source/msg.cpp:1967
 msgid "The game ended"
 msgstr "比赛结束了"
 
-#: Source/msg.cpp:1977
+#: Source/msg.cpp:1973
 msgid "Unable to get level data"
 msgstr "无法获取场景数据"
 
-#: Source/multi.cpp:194
+#: Source/multi.cpp:195
 msgid "Player '{:s}' just left the game"
 msgstr "玩家{:s}刚刚离开了游戏"
 
-#: Source/multi.cpp:197
+#: Source/multi.cpp:198
 msgid "Player '{:s}' killed Diablo and left the game!"
 msgstr "玩家{:s}杀死了迪亚波罗并离开了游戏！"
 
-#: Source/multi.cpp:201
+#: Source/multi.cpp:202
 msgid "Player '{:s}' dropped due to timeout"
 msgstr "由于超时，玩家{:s}的掉落物被删除"
 
-#: Source/multi.cpp:805
+#: Source/multi.cpp:807
 msgid "Player '{:s}' (level {:d}) is already in the game"
 msgstr "玩家{:s}(等级{:d})已经在游戏中"
 
 #. TRANSLATORS: Shrine Name Block
-#: Source/objects.cpp:101
+#: Source/objects.cpp:104
 msgid "Mysterious"
 msgstr "神秘"
 
-#: Source/objects.cpp:102
+#: Source/objects.cpp:105
 msgid "Hidden"
 msgstr "潜行"
 
-#: Source/objects.cpp:103
+#: Source/objects.cpp:106
 msgid "Gloomy"
 msgstr "阴郁"
 
-#: Source/objects.cpp:105 Source/objects.cpp:112
+#: Source/objects.cpp:108 Source/objects.cpp:115
 msgid "Magical"
 msgstr "魔力"
 
-#: Source/objects.cpp:106
+#: Source/objects.cpp:109
 msgid "Stone"
 msgstr "岩石"
 
-#: Source/objects.cpp:107
+#: Source/objects.cpp:110
 msgid "Religious"
 msgstr "教法"
 
-#: Source/objects.cpp:108
+#: Source/objects.cpp:111
 msgid "Enchanted"
 msgstr "强化"
 
-#: Source/objects.cpp:109
+#: Source/objects.cpp:112
 msgid "Thaumaturgic"
 msgstr "奇幻"
 
-#: Source/objects.cpp:110
+#: Source/objects.cpp:113
 msgid "Fascinating"
 msgstr "炫目"
 
-#: Source/objects.cpp:111
+#: Source/objects.cpp:114
 msgid "Cryptic"
 msgstr "奥秘"
 
-#: Source/objects.cpp:113
+#: Source/objects.cpp:116
 msgid "Eldritch"
 msgstr "奇异"
 
-#: Source/objects.cpp:114
+#: Source/objects.cpp:117
 msgid "Eerie"
 msgstr "怪诞"
 
-#: Source/objects.cpp:115
+#: Source/objects.cpp:118
 msgid "Divine"
 msgstr "神灵"
 
-#: Source/objects.cpp:117
+#: Source/objects.cpp:120
 msgid "Sacred"
 msgstr "圣洁"
 
-#: Source/objects.cpp:118
+#: Source/objects.cpp:121
 msgid "Spiritual"
 msgstr "精魂"
 
-#: Source/objects.cpp:119
+#: Source/objects.cpp:122
 msgid "Spooky"
 msgstr "幽灵"
 
-#: Source/objects.cpp:120
+#: Source/objects.cpp:123
 msgid "Abandoned"
 msgstr "抛弃"
 
-#: Source/objects.cpp:121
+#: Source/objects.cpp:124
 msgid "Creepy"
 msgstr "怪物"
 
-#: Source/objects.cpp:122
+#: Source/objects.cpp:125
 msgid "Quiet"
 msgstr "静谧"
 
-#: Source/objects.cpp:123
+#: Source/objects.cpp:126
 msgid "Secluded"
 msgstr "隔世"
 
-#: Source/objects.cpp:124
+#: Source/objects.cpp:127
 msgid "Ornate"
 msgstr "华丽"
 
-#: Source/objects.cpp:125
+#: Source/objects.cpp:128
 msgid "Glimmering"
 msgstr "微光"
 
-#: Source/objects.cpp:126
+#: Source/objects.cpp:129
 msgid "Tainted"
 msgstr "污染"
 
-#: Source/objects.cpp:127
+#: Source/objects.cpp:130
 msgid "Oily"
 msgstr "油腻"
 
-#: Source/objects.cpp:128
+#: Source/objects.cpp:131
 msgid "Glowing"
 msgstr "辉光"
 
-#: Source/objects.cpp:129
+#: Source/objects.cpp:132
 msgid "Mendicant's"
 msgstr "乞丐"
 
-#: Source/objects.cpp:130
+#: Source/objects.cpp:133
 msgid "Sparkling"
 msgstr "闪亮"
 
-#: Source/objects.cpp:131
+#: Source/objects.cpp:134
 msgid "Town"
 msgstr "城镇"
 
-#: Source/objects.cpp:132
+#: Source/objects.cpp:135
 msgid "Shimmering"
 msgstr "光鲜"
 
-#: Source/objects.cpp:133
+#: Source/objects.cpp:136
 msgid "Solar"
 msgstr "日光"
 
 #. TRANSLATORS: Shrine Name Block end
-#: Source/objects.cpp:135
+#: Source/objects.cpp:138
 msgid "Murphy's"
 msgstr "浑浊"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:265
+#: Source/objects.cpp:268
 msgid "The Great Conflict"
 msgstr "大分歧"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:266
+#: Source/objects.cpp:269
 msgid "The Wages of Sin are War"
 msgstr "原罪的代价即是战争"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:267
+#: Source/objects.cpp:270
 msgid "The Tale of the Horadrim"
 msgstr "赫拉迪姆的故事"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:268
+#: Source/objects.cpp:271
 msgid "The Dark Exile"
 msgstr "黑暗的流放"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:269
+#: Source/objects.cpp:272
 msgid "The Sin War"
 msgstr "原罪之战"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:270
+#: Source/objects.cpp:273
 msgid "The Binding of the Three"
 msgstr "三位一体"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:271
+#: Source/objects.cpp:274
 msgid "The Realms Beyond"
 msgstr "超越的王国"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:272
+#: Source/objects.cpp:275
 msgid "Tale of the Three"
 msgstr "三部曲"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:273
+#: Source/objects.cpp:276
 msgid "The Black King"
 msgstr "黑色国王"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:274
+#: Source/objects.cpp:277
 msgid "Journal: The Ensorcellment"
 msgstr "日记: 感悟"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:275
+#: Source/objects.cpp:278
 msgid "Journal: The Meeting"
 msgstr "日记: 会议"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:276
+#: Source/objects.cpp:279
 msgid "Journal: The Tirade"
 msgstr "日记: 长篇大论"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:277
+#: Source/objects.cpp:280
 msgid "Journal: His Power Grows"
 msgstr "日记: 他的力量在增长"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:278
+#: Source/objects.cpp:281
 msgid "Journal: NA-KRUL"
 msgstr "日志: 纳·克鲁"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:279
+#: Source/objects.cpp:282
 msgid "Journal: The End"
 msgstr "日记: 结束"
 
 #. TRANSLATORS: Book Title
-#: Source/objects.cpp:280
+#: Source/objects.cpp:283
 msgid "A Spellbook"
 msgstr "一本法术书"
 
-#: Source/objects.cpp:5365
+#: Source/objects.cpp:5341
 msgid "Crucified Skeleton"
 msgstr "钉死的骷髅"
 
-#: Source/objects.cpp:5369
+#: Source/objects.cpp:5345
 msgid "Lever"
 msgstr "控制杆"
 
-#: Source/objects.cpp:5378
+#: Source/objects.cpp:5354
 msgid "Open Door"
 msgstr "打开的门"
 
-#: Source/objects.cpp:5380
+#: Source/objects.cpp:5356
 msgid "Closed Door"
 msgstr "关闭的门"
 
-#: Source/objects.cpp:5382
+#: Source/objects.cpp:5358
 msgid "Blocked Door"
 msgstr "封死的门"
 
-#: Source/objects.cpp:5387
+#: Source/objects.cpp:5363
 msgid "Ancient Tome"
 msgstr "古籍"
 
-#: Source/objects.cpp:5389
+#: Source/objects.cpp:5365
 msgid "Book of Vileness"
 msgstr "卑鄙之书"
 
-#: Source/objects.cpp:5394
+#: Source/objects.cpp:5370
 msgid "Skull Lever"
 msgstr "骸骨控制杆"
 
-#: Source/objects.cpp:5397
+#: Source/objects.cpp:5373
 msgid "Mythical Book"
 msgstr "神秘之书"
 
-#: Source/objects.cpp:5401
+#: Source/objects.cpp:5377
 msgid "Small Chest"
 msgstr "小箱子"
 
-#: Source/objects.cpp:5405
+#: Source/objects.cpp:5381
 msgid "Chest"
 msgstr "箱子"
 
-#: Source/objects.cpp:5410
+#: Source/objects.cpp:5386
 msgid "Large Chest"
 msgstr "大箱子"
 
-#: Source/objects.cpp:5413
+#: Source/objects.cpp:5389
 msgid "Sarcophagus"
 msgstr "石棺"
 
-#: Source/objects.cpp:5416
+#: Source/objects.cpp:5392
 msgid "Bookshelf"
 msgstr "书架"
 
-#: Source/objects.cpp:5420
+#: Source/objects.cpp:5396
 msgid "Bookcase"
 msgstr "书柜"
 
-#: Source/objects.cpp:5425
+#: Source/objects.cpp:5401
 msgid "Pod"
 msgstr "茧"
 
-#: Source/objects.cpp:5427
+#: Source/objects.cpp:5403
 msgid "Urn"
 msgstr "罐子"
 
-#: Source/objects.cpp:5429
+#: Source/objects.cpp:5405
 msgid "Barrel"
 msgstr "木桶"
 
 #. TRANSLATORS: {:s} will be a name from the Shrine block above
-#: Source/objects.cpp:5433
+#: Source/objects.cpp:5409
 msgid "{:s} Shrine"
 msgstr "{:s}圣坛"
 
-#: Source/objects.cpp:5437
+#: Source/objects.cpp:5413
 msgid "Skeleton Tome"
 msgstr "骸骨堆"
 
-#: Source/objects.cpp:5440
+#: Source/objects.cpp:5416
 msgid "Library Book"
 msgstr "典籍"
 
-#: Source/objects.cpp:5443
+#: Source/objects.cpp:5419
 msgid "Blood Fountain"
 msgstr "血泉"
 
-#: Source/objects.cpp:5446
+#: Source/objects.cpp:5422
 msgid "Decapitated Body"
 msgstr "无头尸"
 
-#: Source/objects.cpp:5449
+#: Source/objects.cpp:5425
 msgid "Book of the Blind"
 msgstr "目盲之书"
 
-#: Source/objects.cpp:5452
+#: Source/objects.cpp:5428
 msgid "Book of Blood"
 msgstr "鲜血之书"
 
-#: Source/objects.cpp:5455
+#: Source/objects.cpp:5431
 msgid "Purifying Spring"
 msgstr "纯净之泉"
 
-#: Source/objects.cpp:5462 Source/objects.cpp:5486
+#: Source/objects.cpp:5438 Source/objects.cpp:5462
 msgid "Weapon Rack"
 msgstr "武器架"
 
-#: Source/objects.cpp:5465
+#: Source/objects.cpp:5441
 msgid "Goat Shrine"
 msgstr "山羊神殿"
 
-#: Source/objects.cpp:5468
+#: Source/objects.cpp:5444
 msgid "Cauldron"
 msgstr "坩埚"
 
-#: Source/objects.cpp:5471
+#: Source/objects.cpp:5447
 msgid "Murky Pool"
 msgstr "浑浊的水池"
 
-#: Source/objects.cpp:5474
+#: Source/objects.cpp:5450
 msgid "Fountain of Tears"
 msgstr "泪泉"
 
-#: Source/objects.cpp:5477
+#: Source/objects.cpp:5453
 msgid "Steel Tome"
 msgstr "钢铁之书"
 
-#: Source/objects.cpp:5480
+#: Source/objects.cpp:5456
 msgid "Pedestal of Blood"
 msgstr "鲜血底座"
 
-#: Source/objects.cpp:5489
+#: Source/objects.cpp:5465
 msgid "Mushroom Patch"
 msgstr "蘑菇碎片"
 
-#: Source/objects.cpp:5492
+#: Source/objects.cpp:5468
 msgid "Vile Stand"
 msgstr "卑鄙旗帜"
 
-#: Source/objects.cpp:5495
+#: Source/objects.cpp:5471
 msgid "Slain Hero"
 msgstr "被杀英雄"
 
 #. TRANSLATORS: {:s} will either be a chest or a door
-#: Source/objects.cpp:5502
+#: Source/objects.cpp:5478
 msgid "Trapped {:s}"
 msgstr "机关{:s}"
 
 #. TRANSLATORS: If user enabled diablo.ini setting "Disable Crippling Shrines" is set to 1; also used for Na-Kruls leaver
-#: Source/objects.cpp:5508
+#: Source/objects.cpp:5484
 msgid "{:s} (disabled)"
 msgstr "{:s}(已禁用)"
 
-#: Source/panels/charpanel.cpp:109
+#: Source/panels/charpanel.cpp:110
 msgid "MAX"
 msgstr "最大"
 
-#: Source/panels/charpanel.cpp:119
+#: Source/panels/charpanel.cpp:120
 msgid "Level"
 msgstr "等级"
 
-#: Source/panels/charpanel.cpp:121
+#: Source/panels/charpanel.cpp:122
 msgid "Experience"
 msgstr "经验"
 
-#: Source/panels/charpanel.cpp:123
+#: Source/panels/charpanel.cpp:124
 msgid "Next level"
 msgstr "下一级"
 
-#: Source/panels/charpanel.cpp:126
+#: Source/panels/charpanel.cpp:127
 msgid "None"
 msgstr "没有一个"
 
-#: Source/panels/charpanel.cpp:132
+#: Source/panels/charpanel.cpp:133
 msgid "Base"
 msgstr "基础值"
 
-#: Source/panels/charpanel.cpp:133
+#: Source/panels/charpanel.cpp:134
 msgid "Now"
 msgstr "当前"
 
-#: Source/panels/charpanel.cpp:134
+#: Source/panels/charpanel.cpp:135
 msgid "Strength"
 msgstr "力量"
 
-#: Source/panels/charpanel.cpp:138
+#: Source/panels/charpanel.cpp:139
 msgid "Magic"
 msgstr "魔法"
 
-#: Source/panels/charpanel.cpp:142
+#: Source/panels/charpanel.cpp:143
 msgid "Dexterity"
 msgstr "敏捷"
 
-#: Source/panels/charpanel.cpp:145
+#: Source/panels/charpanel.cpp:146
 msgid "Vitality"
 msgstr "活力"
 
-#: Source/panels/charpanel.cpp:148
+#: Source/panels/charpanel.cpp:149
 msgid "Points to distribute"
 msgstr "可分配点数"
 
-#: Source/panels/charpanel.cpp:158
+#: Source/panels/charpanel.cpp:159
 msgid "Armor class"
 msgstr "护甲等级"
 
-#: Source/panels/charpanel.cpp:160
+#: Source/panels/charpanel.cpp:161
 msgid "To hit"
 msgstr "命中"
 
-#: Source/panels/charpanel.cpp:162
+#: Source/panels/charpanel.cpp:163
 msgid "Damage"
 msgstr "伤害"
 
-#: Source/panels/charpanel.cpp:168
+#: Source/panels/charpanel.cpp:170
 msgid "Life"
 msgstr "生命"
 
-#: Source/panels/charpanel.cpp:172
+#: Source/panels/charpanel.cpp:174
 msgid "Mana"
 msgstr "法力"
 
-#: Source/panels/charpanel.cpp:177
+#: Source/panels/charpanel.cpp:179
 msgid "Resist magic"
 msgstr "魔法抗性"
 
-#: Source/panels/charpanel.cpp:179
+#: Source/panels/charpanel.cpp:181
 msgid "Resist fire"
 msgstr "火焰抗性"
 
-#: Source/panels/charpanel.cpp:181
+#: Source/panels/charpanel.cpp:183
 msgid "Resist lightning"
 msgstr "闪电抗性"
 
@@ -5920,23 +5981,22 @@ msgstr "静音"
 msgid "Failed to open player archive for writing."
 msgstr "无法加载玩家数据进行写入。"
 
-#: Source/pfile.cpp:389
+#: Source/pfile.cpp:392
 msgid "Unable to open archive"
 msgstr "无法打开存档"
 
-#: Source/pfile.cpp:391
+#: Source/pfile.cpp:394
 msgid "Unable to load character"
 msgstr "无法加载角色"
 
-#: Source/pfile.cpp:416 Source/pfile.cpp:436
+#: Source/pfile.cpp:419 Source/pfile.cpp:439
 msgid "Unable to read to save file archive"
 msgstr "因无法读取，无法保存存档"
 
-#: Source/pfile.cpp:455
+#: Source/pfile.cpp:458
 msgid "Unable to write to save file archive"
 msgstr "因无法写入，无法保存存档"
 
-#. TRANSLATORS: Shown if player presses "v" button. {:s} is player name, {:d} is level, {:s} is location
 #: Source/plrmsg.cpp:88
 msgid "{:s} (lvl {:d}): {:s}"
 msgstr "{:s} (等级 {:d}): {:s}"
@@ -6366,6 +6426,44 @@ msgctxt "spell"
 msgid "Rune of Stone"
 msgstr "符文石"
 
+#: Source/stores.cpp:91
+#, fuzzy
+#| msgid "Griswold's Edge"
+msgid "Griswold"
+msgstr "格里斯沃尔德的锐利"
+
+#: Source/stores.cpp:92
+msgid "Pepin"
+msgstr ""
+
+#: Source/stores.cpp:94
+msgid "Ogden"
+msgstr ""
+
+#: Source/stores.cpp:95
+msgid "Cain"
+msgstr ""
+
+#: Source/stores.cpp:96
+#, fuzzy
+#| msgid "Talk to Farnham"
+msgid "Farnham"
+msgstr "与法恩汉交谈"
+
+#: Source/stores.cpp:97
+msgid "Adria"
+msgstr ""
+
+#: Source/stores.cpp:98 Source/stores.cpp:1252
+#, fuzzy
+#| msgid "brilliance"
+msgid "Gillian"
+msgstr "辉煌"
+
+#: Source/stores.cpp:99
+msgid "Wirt"
+msgstr ""
+
 #: Source/stores.cpp:179 Source/stores.cpp:186
 msgid ",  "
 msgstr ",  "
@@ -7028,8 +7126,8 @@ msgid ""
 "townsfolk of Tristram. So many were injured, I could not save them all..."
 msgstr ""
 "当我听说镇上的人那天晚上打算干什么时，我很震惊。我想在所有人中，拉扎鲁斯应该"
-"更有理智。他是一位大主教，似乎总是那么关心特里斯特拉姆的市民。这么多人受伤，"
-"我救不了他们"
+"更有理智。他是一位大主教，似乎总是那么关心崔斯特姆的市民。这么多人受伤，我救"
+"不了他们"
 
 #. TRANSLATORS: Quest dialog spoken by Gillian
 #: Source/textdat.cpp:73
@@ -7187,7 +7285,7 @@ msgid ""
 "Know this - demons are at the heart of this matter, but they remain ignorant "
 "of what they have spawned."
 msgstr ""
-"如果你不能恢复井中的淡水，崔斯特瑞姆人就会死。\n"
+"如果你不能恢复井中的淡水，崔斯特姆人就会死。\n"
 " \n"
 "知道这一点-恶魔是这件事的核心，但他们仍然不知道他们产生了什么"
 
@@ -7287,9 +7385,9 @@ msgid ""
 "for what lay within the cold earth... Lazarus abandoned them down there - "
 "left in the clutches of unspeakable horrors - to die."
 msgstr ""
-"似乎拉扎鲁斯大主教怂恿许多市民冒险进入迷宫寻找国王失踪的儿子。他利用他们的恐"
-"惧，把他们鞭打成一群疯狂的暴徒。他们中没有一个人准备好面对冰冷的地球上的一"
-"切。。。拉扎鲁斯把他们丢在那里，丢在难以形容的恐惧魔爪里，等死"
+"大主教拉扎鲁斯似乎怂恿过很多镇民冒险进入迷宫，去寻找国王失踪的儿子。他以镇民"
+"的恐惧为乐，鞭打他们使其成为疯狂的暴徒。没有人对倒在冰冷地面有所准备……拉扎鲁"
+"斯抛弃了他们，使留在难以言喻的恐怖中，等死。"
 
 #. TRANSLATORS: Quest dialog spoken by Ogden
 #: Source/textdat.cpp:123
@@ -7297,7 +7395,8 @@ msgid ""
 "Yes, Farnham has mumbled something about a hulking brute who wielded a "
 "fierce weapon. I believe he called him a butcher."
 msgstr ""
-"是的，法恩汉喃喃地说了一些关于一个笨重的畜生挥舞着凶器的事。我相信他叫他屠夫"
+"是的，法恩汉含糊的地说到一些关于一个笨重的畜生挥舞着恐怖武器的事。我确定他称"
+"他为屠夫。"
 
 #. TRANSLATORS: Quest dialog spoken by Pipin
 #: Source/textdat.cpp:125
@@ -7309,10 +7408,10 @@ msgid ""
 "festering with disease and even I found them almost impossible to treat. "
 "Beware if you plan to battle this fiend..."
 msgstr ""
-"借着光明，我知道这个邪恶的恶魔。当拉扎鲁斯率领的少数几名冲锋幸存者从大教堂爬"
-"出来时，许多人身上留下了他愤怒的伤疤。我不知道他以前是怎么切开受害者的，但这"
-"不可能是这个世界的。它留下的伤口溃烂与疾病，甚至我发现他们几乎不可能治疗。如"
-"果你打算和这个恶魔战斗，要小心"
+"圣光在上，我知道这恶魔一些事情。当拉扎鲁斯带领少数幸存者从大教堂中逃出来时，"
+"很多人身上都有着恐怖的伤口。我清楚，他用什么玩意儿在受害者身上割出这样的伤口"
+"的，但绝对不是来自这个世界。它留下的伤口全是溃烂与恶疾，即便是我也毫无办法去"
+"治疗。如果你打算跟这个恶魔战斗，当心……"
 
 #. TRANSLATORS: Quest dialog spoken by Gillian
 #: Source/textdat.cpp:127
@@ -7320,8 +7419,7 @@ msgid ""
 "When Farnham said something about a butcher killing people, I immediately "
 "discounted it. But since you brought it up, maybe it is true."
 msgstr ""
-"当法恩汉说起屠夫杀人的事时，我立刻打消了这个念头。但既然是你提出来的，也许是"
-"真的"
+"当法恩汉说起屠夫杀人的事时，我根本不信他。然而你的再次提到，那也许是真的。"
 
 #. TRANSLATORS: Quest dialog spoken by Griswold
 #: Source/textdat.cpp:129
@@ -7333,10 +7431,10 @@ msgid ""
 "I never saw that hideous beast again, but his blood-stained visage haunts me "
 "to this day."
 msgstr ""
-"我看到法恩汉所说的屠夫在我朋友的尸体上划出一条小路。他挥舞着一把斧头般大的砍"
-"刀，砍断四肢，砍倒站在那里的勇士。我被一群尖叫着的小恶魔从纷争中分离出来，不"
-"知怎的我找到了通向外面的楼梯。我再也没见过那可怕的野兽，但他那血迹斑斑的面容"
-"至今萦绕在我心头"
+"我亲眼看到法恩汉所说的“屠夫”，我那些被他杀死朋友，尸体铺成了路。他手中挥舞的"
+"切肉刀大的就像一把斧子，胆敢面对他的勇士都被剁成了尸块。在打斗中我被另一群尖"
+"啸的恶魔拦住，还好我碰巧找到了逃离的楼梯。之后我再也没见过那可怕的怪物，但他"
+"那血迹斑斑的面容让我至今心有余悸。"
 
 #. TRANSLATORS: Quest dialog spoken by Farnham (*sad face*)
 #: Source/textdat.cpp:131
@@ -7345,8 +7443,8 @@ msgid ""
 "couldn't save them. Trapped in a room with so many bodies... so many "
 "friends... NOOOOOOOOOO!"
 msgstr ""
-"大的大砍刀杀了我所有的朋友。阻止不了他，不得不逃跑，救不了他们。被困在一个有"
-"这么多尸体的房间里。。。这么多朋友。。。不，不"
+"大！大砍刀杀了我所有的伙伴。没法阻止他，必须逃跑，救不了他们。被关在一间全是"
+"尸体的房间……那么多的朋友……不，不！"
 
 #. TRANSLATORS: Quest dialog spoken by Adria
 #: Source/textdat.cpp:133
@@ -7355,8 +7453,8 @@ msgid ""
 "others. You have seen his handiwork in the drunkard Farnham. His destruction "
 "will do much to ensure the safety of this village."
 msgstr ""
-"屠夫是个虐待狂，喜欢别人的折磨和痛苦。你见过他在酒鬼法恩汉的作品。他的毁灭将"
-"对确保这个村庄的安全大有帮助"
+"“屠夫”是个彻彻底底的虐待狂，以别人的痛苦和折磨为乐。你已经看到他的杰作，让法"
+"恩汉一蹶不振就此成了醉鬼。消灭他能有效的确保村子安全。"
 
 #. TRANSLATORS: Quest dialog spoken by Wirt
 #: Source/textdat.cpp:135
@@ -7368,10 +7466,10 @@ msgid ""
 "I'll put it bluntly - kill him before he kills you and adds your corpse to "
 "his collection."
 msgstr ""
-"我知道的比你想的还要多。他的小朋友们抓住了我，设法在格里斯沃尔德把我从洞里拉"
-"出来之前抓住了我的腿。\n"
-" \n"
-"我直截了当地说——在他杀了你并把你的尸体加入他的收藏之前杀了他"
+"关于那个狰狞的恶魔，我知道的远比你想象的多。他的小伙伴抓到了我，在格里斯沃尔"
+"德赶来成功帮我逃出魔窟前，成功的卸掉了我的腿。\n"
+"\n"
+"我就直话直说了，在他杀了你，让你的尸体成为他收藏品前杀了他。"
 
 #. TRANSLATORS: Quest dialog spoken by Wounded Townsman (Dying)
 #: Source/textdat.cpp:137
@@ -7381,9 +7479,9 @@ msgid ""
 "killed by a demon he called the Butcher. Avenge us! Find this Butcher and "
 "slay him so that our souls may finally rest..."
 msgstr ""
-"请听我说。拉扎鲁斯大主教，他带我们到这里来寻找失踪的王子。那混蛋把我们引入陷"
-"阱！现在每个人都死了。。。被一个叫屠夫的恶魔杀死。为我们报仇！找到这个屠夫，"
-"杀了他，让我们的灵魂最终安息"
+"请听我说。大主教拉扎鲁斯，是他带领我们来这里寻找失踪的王子。结果那混蛋把我们"
+"引入了陷阱！现在所有人都死了……被一个叫做“屠夫”的恶魔杀死。为我们报仇！找到这"
+"个“屠夫”，杀了他，让我们的灵魂最终得到安息。"
 
 #. TRANSLATORS: Quest dialog spoken by Cain
 #: Source/textdat.cpp:140
@@ -7484,10 +7582,10 @@ msgid ""
 "suppose that your story could be true. If I were in your place, my friend, I "
 "would find a way to release him from his torture."
 msgstr ""
-"你声称和拉赫达南谈过？他一生是个伟大的英雄。拉赫达南是一个光荣而公正的人，多"
+"你声称和拉齐达南谈过？他一生是个伟大的英雄。拉齐达南是一个光荣而公正的人，多"
 "年来一直忠实地为国王服务。当然，你已经知道了。\n"
 " \n"
-"在那些被国王诅咒的人中，拉赫达南最不可能不战而屈身于黑暗，所以我想你的故事可"
+"在那些被国王诅咒的人中，拉齐达南最不可能不战而屈身于黑暗，所以我想你的故事可"
 "能是真的。如果我在你的位置，我的朋友，我会想办法把他从折磨中释放出来"
 
 #. TRANSLATORS: Quest dialog spoken by Ogden
@@ -7506,16 +7604,16 @@ msgid ""
 "drink it. As your healer, I strongly advise that should you find such an "
 "elixir, do as Lachdanan asks and DO NOT try to use it."
 msgstr ""
-"你说是“金色药剂”。我从来没有调制过那种颜色的药水，所以我不能告诉你如果你试着"
-"喝它会有什么影响。作为你的治疗者，我强烈建议，如果你找到这样一种长生不老药，"
-"按照拉赫达南的要求去做，不要试图使用它"
+"你是说一种金色的药剂。我从未调制过那种颜色的药水，所以我没办法告诉你如果你喝"
+"了它会怎样。作为一个治疗者，我强烈建议你去寻找那种药剂，照着拉齐达南要求的"
+"做，但你绝对不要喝了它。"
 
 #. TRANSLATORS: Quest dialog spoken by Gillian
 #: Source/textdat.cpp:162
 msgid ""
 "I've never heard of a Lachdanan before. I'm sorry, but I don't think that I "
 "can be of much help to you."
-msgstr "我以前从没听说过拉赫达南。对不起，我想我帮不了你什么忙"
+msgstr "我从来没听说过拉齐达南，抱歉我帮不了你。"
 
 #. TRANSLATORS: Quest dialog spoken by Ogden
 #: Source/textdat.cpp:164
@@ -7525,17 +7623,15 @@ msgid ""
 "and loyal in nature. The curse that fell upon the followers of King Leoric "
 "would fall especially hard upon him."
 msgstr ""
-"如果你遇到的是拉赫达南，那么我建议你帮助他。我和他打过几次交道，发现他生性诚"
-"实忠诚。落在国王李奥瑞克的追随者身上的诅咒尤其会落在他身上"
+"如果你真的遇到了拉齐达南，我希望你帮帮他。我和他打过几次交道，发现他生性诚实"
+"且富有荣誉感。李奥瑞克国王的追随者遭受的诅咒，在他身上会更加糟糕。"
 
 #. TRANSLATORS: Quest dialog spoken by Farnham
 #: Source/textdat.cpp:166
 msgid ""
 " Lachdanan is dead. Everybody knows that, and you can't fool me into "
 "thinking any other way. You can't talk to the dead. I know!"
-msgstr ""
-"拉赫达南死了。每个人都知道这一点，你不能骗我去想别的。你不能和死人说话。我知"
-"道"
+msgstr "拉齐达南已经死了。所有人都知道，你没法骗我。你不能和死人说话。我知道！"
 
 #. TRANSLATORS: Quest dialog spoken by Adria
 #: Source/textdat.cpp:168
@@ -7545,9 +7641,9 @@ msgid ""
 " \n"
 "I sense in him honor and great guilt. Aid him, and you aid all of Tristram."
 msgstr ""
-"你可能会遇到被困在迷宫里的人，比如拉赫达南。\n"
-" \n"
-"我从他身上感受到荣誉和巨大的内疚。帮帮他，你就帮帮崔斯特瑞姆"
+"你也许能遇到被困在迷宫里的人，拉齐达南只是其中之一。\n"
+"\n"
+"我从他身上感受到荣誉和巨大的内疚。帮助他就是帮助崔斯特姆。"
 
 #. TRANSLATORS: Quest dialog spoken by  Wirt
 #: Source/textdat.cpp:170
@@ -7557,9 +7653,9 @@ msgid ""
 "questions anymore. Oh, that isn't what happened? Then I guess you'll be "
 "buying something or you'll be on your way."
 msgstr ""
-"等等，让我猜猜。凯恩被一条巨大的裂缝吞没了，裂缝在他下面张开。他在地狱之火中"
-"被烧死了，再也回答不了你的问题了。哦，不是这样吗？那我猜你要买点东西了，要不"
-"就上路了"
+"等等，让我猜猜。一条巨大裂缝出现在凯恩脚下将他吞噬，地狱烈焰把他烧得个精光，"
+"以至于没法回答你问题了。哦，不是那样么？那我就只能认为你是想买点东西或是该上"
+"路了。"
 
 #. TRANSLATORS: Quest dialog spoken by Lachdanan (in despair)
 #: Source/textdat.cpp:172
@@ -7576,21 +7672,21 @@ msgid ""
 "it the last of my humanity as well. Please aid me and find the Elixir. I "
 "will repay your efforts - I swear upon my honor."
 msgstr ""
-"拜托，别杀我，听我说完。我曾经是李奥瑞克国王骑士团的队长，以正义和荣誉维护这"
-"片土地的法律。然后他的黑暗诅咒降临在我们身上，因为我们在他悲惨的死亡中扮演了"
-"角色。当我的骑士同伴们屈服于他们扭曲的命运时，我逃离了国王的墓室，寻找某种方"
-"法来摆脱诅咒。我失败了。。。\n"
-" \n"
-"我听说有一种“金色药剂”可以解除诅咒，让我的灵魂安息，但我一直找不到它。我的力"
-"量正在衰退，伴随着它，我最后的人性也在衰退。请帮助我找到长生不老药。我会报答"
-"你的努力-我以我的名誉起誓"
+"手下留情，别杀我，请听我把话说完。我曾经是李奥瑞克国王的骑士队长，以正义和荣"
+"誉捍卫着这王国的律法。后来他的黑暗诅咒降临在我们身上，只因我们在他的悲剧死亡"
+"中扮演的角色。当我的其他骑士同伴屈服于他们扭曲命运的时，我逃出了国王的墓室，"
+"寻找某种能解除我身上诅咒的方法。我……失败了……\n"
+"\n"
+"我听说有一种“金色药剂”可以解除诅咒，让我的灵魂安息，可惜我无法找到它。我的意"
+"志逐渐衰弱，我也会因此最终失去人性。请帮帮我，找到药剂。我以荣耀发誓一定会报"
+"答你的帮助。"
 
 #. TRANSLATORS: Quest dialog spoken by Lachdanan (in despair)
 #: Source/textdat.cpp:174
 msgid ""
 "You have not found the Golden Elixir. I fear that I am doomed for eternity. "
 "Please, keep trying..."
-msgstr "你还没有找到“金色药剂”。我害怕我注定要永生。请继续努力"
+msgstr "如果你还没找到“金色药剂”，我就将承受永恒的诅咒了。求你，继续寻找吧……"
 
 #. TRANSLATORS: Quest dialog spoken by Lachdanan (Quest End)
 #: Source/textdat.cpp:176
@@ -7601,9 +7697,9 @@ msgid ""
 "have little use for it. May it protect you against the dark powers below. Go "
 "with the Light, my friend..."
 msgstr ""
-"你救了我的灵魂脱离了诅咒，为此我欠你的债。如果有什么方法可以让我从坟墓那边回"
-"报你的话，我会找到的，但是现在，请你掌舵。在我即将踏上的旅途中，我对它毫无用"
-"处。愿它保护你不受黑暗势力的伤害。跟着光走，我的朋友"
+"你把我的灵魂从诅咒中拯救出来，为此我欠你一个人情。如果有办法让死后的我报答"
+"你，我一定会去做，但现在能做的——拿走我的头盔吧。我今后的旅途里，用不到它了。"
+"愿它能保护你免受地底黑暗力量的侵扰。圣光伴你同行，我的朋友……"
 
 #. TRANSLATORS: Quest dialog spoken by Cain
 #: Source/textdat.cpp:178
@@ -8435,9 +8531,9 @@ msgid ""
 "access to many strange and arcane artifacts and tomes of knowledge that even "
 "I have never seen before."
 msgstr ""
-"女巫艾德莉亚是特里斯特拉姆的一个异类。她是在大教堂被亵渎后不久到达的，而大多"
-"数人都在逃离。她在城镇边缘建了一间小屋，似乎是一夜之间建成的，她能接触到许多"
-"奇怪而神秘的文物和知识的大部头，连我都从未见过"
+"女巫艾德莉亚是崔斯特姆的一个异类。她是在大教堂被亵渎后不久到达的，而大多数人"
+"都在逃离。她在城镇边缘建了一间小屋，似乎是一夜之间建成的，她能接触到许多奇怪"
+"而神秘的文物和知识的大部头，连我都从未见过"
 
 #. TRANSLATORS: Neutral dialog spoken by Cain (Gossip)
 #: Source/textdat.cpp:321
@@ -8659,9 +8755,9 @@ msgid ""
 "many murders that happen in the surrounding countryside, or perhaps the "
 "wishes of his wife that keep him and his family where they are."
 msgstr ""
-"我真不明白奥格登为什么留在特里斯特拉姆。他有点紧张，但他是一个聪明而勤奋的"
-"人，无论他去哪里都会做得很好。我想可能是因为害怕周围农村发生的许多谋杀案，也"
-"可能是因为他妻子的愿望，他和他的家人一直呆在那里"
+"我真不明白奥格登为什么留在崔斯特姆。他有点紧张，但他是一个聪明而勤奋的人，无"
+"论他去哪里都会做得很好。我想可能是因为害怕周围农村发生的许多谋杀案，也可能是"
+"因为他妻子的愿望，他和他的家人一直呆在那里"
 
 #. TRANSLATORS: Neutral dialog spoken by Pipin (Gossip)
 #: Source/textdat.cpp:362
@@ -8710,9 +8806,9 @@ msgid ""
 "received praises from our King Leoric himself - may his soul rest in peace. "
 "Griswold is also a great hero; just ask Cain."
 msgstr ""
-"我们的铁匠是特里斯特拉姆人民的骄傲。他不仅是一个手艺大师，在他的行会中赢得了"
-"许多比赛，而且他还得到了我们国王李奥瑞克本人的赞扬——愿他的灵魂安息。格里斯沃"
-"尔德也是一位伟大的英雄；问问凯恩"
+"我们的铁匠是崔斯特姆人民的骄傲。他不仅是一个手艺大师，在他的行会中赢得了许多"
+"比赛，而且他还得到了我们国王李奥瑞克本人的赞扬——愿他的灵魂安息。格里斯沃尔德"
+"也是一位伟大的英雄；问问凯恩"
 
 #. TRANSLATORS: Neutral dialog spoken by Gillian (Gossip)
 #: Source/textdat.cpp:371
@@ -8720,7 +8816,7 @@ msgid ""
 "Cain has been the storyteller of Tristram for as long as I can remember. He "
 "knows so much, and can tell you just about anything about almost everything."
 msgstr ""
-"从我记事起，凯恩一直是崔斯特瑞姆的说书人。他知道的太多了，几乎什么都能告诉你"
+"从我记事起，凯恩一直是崔斯特姆的说书人。他知道的太多了，几乎什么都能告诉你"
 
 #. TRANSLATORS: Neutral dialog spoken by Gillian (Gossip)
 #: Source/textdat.cpp:373
@@ -8873,8 +8969,8 @@ msgid ""
 "left in Tristram - or anywhere else for that matter - who has a bad thing to "
 "say about the healer."
 msgstr ""
-"把别人的需要放在自己的需要之上的好人。你不会发现任何人留在崔斯特瑞姆-或任何其"
-"他地方的问题-谁有一个坏东西说的治疗者"
+"把别人的需要放在自己的需要之上的好人。你不会发现任何人留在崔斯特姆-或任何其他"
+"地方的问题-谁有一个坏东西说的治疗者"
 
 #. TRANSLATORS: Neutral dialog spoken by Griswold (Gossip)
 #: Source/textdat.cpp:400
@@ -9124,7 +9220,7 @@ msgid ""
 msgstr ""
 "手、心和心在完美的和谐中就能创造奇迹。治疗者佩金以一种连我都看不到的方式观察"
 "身体。他对长生不老药和药水的理解使他恢复病人和伤者的能力得到了放大。他和你在"
-"特里斯特拉姆一样是个伟大的盟友"
+"崔斯特姆一样是个伟大的盟友"
 
 #. TRANSLATORS: Neutral dialog spoken by Adria (Gossip)
 #: Source/textdat.cpp:446
@@ -9139,8 +9235,8 @@ msgid ""
 msgstr ""
 "未来有很多我们看不到的，但当它来临时，将是孩子们掌握着它。这个男孩的灵魂是黑"
 "暗的，但他对这个城镇和它的人民没有威胁。他与附近城镇的顽童和不为人知的行会的"
-"秘密交易使他能够接触到许多在特里斯特拉姆很难找到的设备。虽然他的方法可能会受"
-"到指责，但怀特可以为你对抗日益逼近的黑暗提供帮助"
+"秘密交易使他能够接触到许多在崔斯特姆很难找到的设备。虽然他的方法可能会受到指"
+"责，但怀特可以为你对抗日益逼近的黑暗提供帮助"
 
 #. TRANSLATORS: Neutral dialog spoken by Adria (Gossip)
 #: Source/textdat.cpp:448
@@ -9155,9 +9251,9 @@ msgid ""
 msgstr ""
 "土墙和茅草屋顶不是一个家。旅馆老板奥格登在这个镇上的作用比许多人所理解的要大"
 "得多。他为吉莉安和她的女族长提供庇护所，维持法恩汉留给他的生活，并为留在镇上"
-"的所有人提供一个锚，让他们回到特里斯特拉姆曾经的样子。他的小酒馆，以及在那里"
-"仍然可以找到的简单的乐趣，让我们看到了这里的人们所记得的生活。正是这段记忆，"
-"让他们对你的成功充满了希望"
+"的所有人提供一个锚，让他们回到崔斯特姆曾经的样子。他的小酒馆，以及在那里仍然"
+"可以找到的简单的乐趣，让我们看到了这里的人们所记得的生活。正是这段记忆，让他"
+"们对你的成功充满了希望"
 
 #. TRANSLATORS: Neutral dialog spoken by Wirt
 #: Source/textdat.cpp:450
@@ -9172,8 +9268,8 @@ msgid ""
 " \n"
 "Sometimes, only you will be able to find a purpose for some things."
 msgstr ""
-"并不是所有在特里斯特拉姆的人都有一个用途-或市场-你会发现在迷宫中的一切。连我"
-"都不相信。\n"
+"并不是所有在崔斯特姆的人都有一个用途-或市场-你会发现在迷宫中的一切。连我都不"
+"相信。\n"
 " \n"
 "有时候，只有你才能为某些事情找到目标"
 
@@ -9192,7 +9288,7 @@ msgid ""
 "Griswold, Pepin or that witch, Adria. I'm sure that they will snap up "
 "whatever you can bring them..."
 msgstr ""
-"如果你没注意到，我不会从崔斯特瑞买任何东西。我是一个进口优质商品的进口商。如"
+"如果你没注意到，我不会从崔斯特姆买任何东西。我是一个进口优质商品的进口商。如"
 "果你想兜售垃圾，你得去看看格里斯沃尔德，佩金或那个女巫，艾德莉亚。我相信他们"
 "会抢购你能带给他们的任何东西"
 
@@ -9217,7 +9313,7 @@ msgid ""
 "safe. Hmmm... maybe I'll take her with me when I go..."
 msgstr ""
 "如果我再大几岁，我会尽我所能给她带来财富，让我向你保证，我可以得到一些非常好"
-"的东西。吉莉安是一个美丽的女孩，她应该尽快离开特里斯特拉姆，只要它是安全的。"
+"的东西。吉莉安是一个美丽的女孩，她应该尽快离开崔斯特姆，只要它是安全的。"
 "嗯。。。也许我去的时候会带她一起去"
 
 #. TRANSLATORS: Neutral dialog spoken by Wirt (Gossip)
@@ -9517,14 +9613,14 @@ msgid ""
 " \n"
 "Perhaps I can tell you more if we speak again. Good luck."
 msgstr ""
-"谢天谢地你回来了\n"
-"自从你住在这里，我的朋友，一切都变了。一切都很平静，直到黑暗骑士来摧毁我们的"
-"村庄。许多人在原地被砍倒，拿起武器的人被杀或被拖走成为奴隶，甚至更糟。城市边"
-"缘的教堂被亵渎，被用来举行黑暗的仪式。夜晚回响的尖叫声是不人道的，但我们的一"
-"些市民可能还活着。沿着我的小酒馆和铁匠铺之间的小路去寻找教堂，拯救你能拯救的"
-"人。\n"
-" \n"
-"如果我们再谈的话，也许我可以告诉你更多。祝你好运"
+"谢天谢地，你终于回来了！\n"
+"我的朋友，你居住过的这里发生了巨大的变化。一切都很平静，直到黑暗骑士到来，摧"
+"毁了我们的村子。很多没有抵抗的人直接被砍杀，而那些拿起武器反抗的人也被屠杀或"
+"是被抓走成为奴隶，甚至更糟。城镇边的教堂已经被亵渎，用作黑暗仪式。回荡在叫声"
+"夜晚不是人可以忍受的，也许一些镇民还活着。这条我的旅店和这铁匠铺之间的路通向"
+"教堂，去拯救那些人吧。\n"
+"\n"
+"如果你想要知道更多事，就再和我谈谈，我也许能告诉你。祝你好运。"
 
 #. TRANSLATORS: Quest text spoken aloud from a book by player
 #: Source/textdat.cpp:525 Source/textdat.cpp:533
@@ -9565,8 +9661,8 @@ msgid ""
 "don't match our town at all.  I'd keep my mind on what lies below the "
 "cathedral and not what lies below our topsoil."
 msgstr ""
-"什么？！这是愚蠢的。特里斯特拉姆这里没有宝藏。让我看看！！啊，看这些画不准"
-"确。他们根本不符合我们的城市。我会把心思放在大教堂下面，而不是我们的表土下面"
+"什么？！这是愚蠢的。崔斯特姆这里没有宝藏。让我看看！！啊，看这些画不准确。他"
+"们根本不符合我们的城市。我会把心思放在大教堂下面，而不是我们的表土下面"
 
 #. TRANSLATORS: Quest text spoken by Pipin
 #: Source/textdat.cpp:545
@@ -10148,17 +10244,17 @@ msgid "Down to Crypt"
 msgstr "下到地穴"
 
 #: Source/trigs.cpp:412 Source/trigs.cpp:492 Source/trigs.cpp:539
-#: Source/trigs.cpp:630
+#: Source/trigs.cpp:634
 msgid "Up to level {:d}"
 msgstr "上到 {:d} 层"
 
 #: Source/trigs.cpp:414 Source/trigs.cpp:469 Source/trigs.cpp:521
-#: Source/trigs.cpp:596 Source/trigs.cpp:613 Source/trigs.cpp:660
+#: Source/trigs.cpp:600 Source/trigs.cpp:617 Source/trigs.cpp:664
 msgid "Up to town"
 msgstr "上到城镇"
 
-#: Source/trigs.cpp:425 Source/trigs.cpp:503 Source/trigs.cpp:552
-#: Source/trigs.cpp:577 Source/trigs.cpp:642
+#: Source/trigs.cpp:425 Source/trigs.cpp:503 Source/trigs.cpp:556
+#: Source/trigs.cpp:581 Source/trigs.cpp:646
 msgid "Down to level {:d}"
 msgstr "下到 {:d} 层"
 
@@ -10170,14 +10266,14 @@ msgstr "上到墓穴 {:d} 层"
 msgid "Down to Crypt level {:d}"
 msgstr "下到墓穴 {:d} 层"
 
-#: Source/trigs.cpp:564
+#: Source/trigs.cpp:568
 msgid "Up to Nest level {:d}"
 msgstr "上到巢穴 {:d} 层"
 
-#: Source/trigs.cpp:673
+#: Source/trigs.cpp:677
 msgid "Down to Diablo"
 msgstr "下到迪亚波罗"
 
-#: Source/trigs.cpp:706 Source/trigs.cpp:720 Source/trigs.cpp:734
+#: Source/trigs.cpp:710 Source/trigs.cpp:724 Source/trigs.cpp:738
 msgid "Back to Level {:d}"
 msgstr "返回到 {:d} 层"