diff --git a/Extensions/dnSpy.Analyzer/Properties/dnSpy.Analyzer.Resources.zh-CN.resx b/Extensions/dnSpy.Analyzer/Properties/dnSpy.Analyzer.Resources.zh-CN.resx
index 41f3439a0e..b5fee6ed78 100644
--- a/Extensions/dnSpy.Analyzer/Properties/dnSpy.Analyzer.Resources.zh-CN.resx
+++ b/Extensions/dnSpy.Analyzer/Properties/dnSpy.Analyzer.Resources.zh-CN.resx
@@ -161,7 +161,7 @@
   </data>
   <data name="SubtypesTreeNode" xml:space="preserve"> 
     <value>子类型</value> 
-   </data>
+  </data>
   <data name="InstantiatedByTreeNode" xml:space="preserve">
     <value>实例化于</value>
   </data>
diff --git a/Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.zh-CN.resx b/Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.zh-CN.resx
index e6d5d93f32..e81899f5cd 100644
--- a/Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.zh-CN.resx
+++ b/Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.zh-CN.resx
@@ -950,7 +950,8 @@
     <value>是否取消保存？</value>
   </data>
   <data name="AskCancelSaveCloseWindow" xml:space="preserve">
-    <value>保存操作已被取消。是否要关闭窗口？</value>
+    <value>保存操作已被取消。
+是否要关闭窗口？</value>
   </data>
   <data name="AskDeleteField" xml:space="preserve">
     <value>程序集中的部分代码可能会引用此字段。是否要删除此字段？</value>
@@ -1748,7 +1749,9 @@
     <value>所有文件已保存。</value>
   </data>
   <data name="SaveModules_Log_Exception" xml:space="preserve">
-    <value>发生了异常 {0}</value>
+    <value>发生了异常
+
+{0}</value>
   </data>
   <data name="SaveModules_Log_FileError" xml:space="preserve">
     <value>文件错误: {0}</value>
@@ -1819,7 +1822,8 @@
     <value>共享方法体(_B)</value>
   </data>
   <data name="SaveModule_ShareMethodBodies_ToolTip" xml:space="preserve">
-    <value>有相同代码的多个 .NET 方法将会共享方法体，输出文件会因此变小。</value>
+    <value>有相同代码的多个 .NET 方法将会共享方法体。
+输出文件会因此变小</value>
   </data>
   <data name="SaveModule_Title" xml:space="preserve">
     <value>保存模块</value>
@@ -1828,7 +1832,8 @@
     <value>混合模块(_M)</value>
   </data>
   <data name="SaveModule_UseMixedMode_ToolTip" xml:space="preserve">
-    <value>检查它是否为一个混合模式模块 (例如 C++/.NET )。单击此复选框时大多数选项将被重新初始化</value>
+    <value>检查它是否为一个混合模式模块 (例如 C++/.NET )。
+单击此复选框时大多数选项将被重新初始化</value>
   </data>
   <data name="SaveModule_WritePdb" xml:space="preserve">
     <value>保存 PDB 文件(_P)</value>
@@ -2301,6 +2306,12 @@
   <data name="ReplaceNopsInstrsCommand" xml:space="preserve">
     <value>用 NOP 替换(_R)</value>
   </data>
+  <data name="ReplaceMethodBodyWithStubCommand" xml:space="preserve">
+    <value>将方法体替换为存根...</value>
+  </data>
+  <data name="ReplaceMethodBodyWithStubCommand2" xml:space="preserve">
+    <value>将方法体替换为存根</value>
+  </data>
   <data name="Type_Flags_Accessibility" xml:space="preserve">
     <value>可访问性(_y)</value>
   </data>
@@ -2316,4 +2327,7 @@
   <data name="Type_Flags_Visibility" xml:space="preserve">
     <value>可见性(_Y)</value>
   </data>
+  <data name="CloseAllFrameworkAssembliesCommand" xml:space="preserve">
+    <value>关闭所有运行库框架程序集</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Extensions/dnSpy.BamlDecompiler/Properties/dnSpy.BamlDecompiler.Resources.zh-CN.resx b/Extensions/dnSpy.BamlDecompiler/Properties/dnSpy.BamlDecompiler.Resources.zh-CN.resx
index e0a6616c94..dad27e64ae 100644
--- a/Extensions/dnSpy.BamlDecompiler/Properties/dnSpy.BamlDecompiler.Resources.zh-CN.resx
+++ b/Extensions/dnSpy.BamlDecompiler/Properties/dnSpy.BamlDecompiler.Resources.zh-CN.resx
@@ -120,6 +120,9 @@
   <data name="AllFiles" xml:space="preserve">
     <value>所有文件</value>
   </data>
+  <data name="BAMLFile" xml:space="preserve">
+    <value>BAML 文件</value>
+  </data>
   <data name="BamlOptionDlgTab" xml:space="preserve">
     <value>BAML 反编译器</value>
   </data>
diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/Properties/dnSpy.Debugger.DotNet.CorDebug.Resources.zh-CN.resx b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/Properties/dnSpy.Debugger.DotNet.CorDebug.Resources.zh-CN.resx
index 34b18fdffb..00a9f00916 100644
--- a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/Properties/dnSpy.Debugger.DotNet.CorDebug.Resources.zh-CN.resx
+++ b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/Properties/dnSpy.Debugger.DotNet.CorDebug.Resources.zh-CN.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
+
     The primary goals of this format is to allow a simple XML format 
     that is mostly human readable. The generation and parsing of the 
     various data types are done through the TypeConverter classes 
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -123,12 +123,24 @@
   <data name="DbgAsm_BreakAt" xml:space="preserve">
     <value>中断于(_B)</value>
   </data>
+  <data name="DbgAsm_Environment" xml:space="preserve">
+    <value>环境变量</value>
+  </data>
   <data name="DbgAsm_Host" xml:space="preserve">
     <value>宿主程序(_H)</value>
   </data>
   <data name="DbgAsm_HostArgs" xml:space="preserve">
     <value>程序参数(_G)</value>
   </data>
+  <data name="DbgAsm_RuntimeVersion" xml:space="preserve">
+    <value>运行时版本(_R)</value>
+  </data>
+  <data name="DbgAsm_Autodetect" xml:space="preserve">
+    <value>自动识别</value>
+  </data>
+  <data name="DbgAsm_Timeout" xml:space="preserve">
+    <value>超时(_T)</value>
+  </data>
   <data name="DbgAsm_WorkingDir" xml:space="preserve">
     <value>工作目录(_W)</value>
   </data>
@@ -138,6 +150,9 @@
   <data name="DbgBreak_Dont" xml:space="preserve">
     <value>不要中断</value>
   </data>
+  <data name="DbgBreak_ModuleClassConstructorOrEntryPoint" xml:space="preserve">
+    <value>模块的 .cctor 或 入口点</value>
+  </data>
   <data name="DbgBreak_EntryPoint" xml:space="preserve">
     <value>入口点</value>
   </data>
diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.Mono/Properties/dnSpy.Debugger.DotNet.Mono.Resources.zh-CN.resx b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.Mono/Properties/dnSpy.Debugger.DotNet.Mono.Resources.zh-CN.resx
index d951de4d89..6f04f05e5b 100644
--- a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.Mono/Properties/dnSpy.Debugger.DotNet.Mono.Resources.zh-CN.resx
+++ b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.Mono/Properties/dnSpy.Debugger.DotNet.Mono.Resources.zh-CN.resx
@@ -132,6 +132,9 @@
   <data name="DbgAsm_Connect_To_Process" xml:space="preserve">
     <value>连接</value>
   </data>
+  <data name="DbgAsm_Environment" xml:space="preserve">
+    <value>环境变量</value>
+  </data>
   <data name="DbgAsm_IP_Address" xml:space="preserve">
     <value>IP 地址</value>
   </data>
@@ -249,4 +252,7 @@
   <data name="DebuggingUnityGamesText" xml:space="preserve">
     <value>调试 Unity 游戏 (Wiki)</value>
   </data>
+  <data name="MonoDebuggerConnectionMessage" xml:space="preserve">
+    <value>连接到: {0}, Mono 版本: {1}, 协议版本: {2}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet/Properties/dnSpy.Debugger.DotNet.Resources.zh-CN.resx b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet/Properties/dnSpy.Debugger.DotNet.Resources.zh-CN.resx
index e344fbc5ed..9bc4d1f67f 100644
--- a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet/Properties/dnSpy.Debugger.DotNet.Resources.zh-CN.resx
+++ b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet/Properties/dnSpy.Debugger.DotNet.Resources.zh-CN.resx
@@ -141,6 +141,9 @@
   <data name="DecompilerGeneratedVariablesCanNotBeEvaluated" xml:space="preserve">
     <value>反编译器生成的变量不能被求值</value>
   </data>
+  <data name="FailedToObtainValidInMemoryMetadataForModule" xml:space="preserve">
+    <value>未能获取模块的有效内存元数据!</value>
+  </data>
   <data name="GlyphToolTip_IL_offset_0" xml:space="preserve">
     <value>IL 偏移量 {0}</value>
   </data>
diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger/Properties/dnSpy.Debugger.Resources.zh-CN.resx b/Extensions/dnSpy.Debugger/dnSpy.Debugger/Properties/dnSpy.Debugger.Resources.zh-CN.resx
index 4b1fed1fe5..79101c399d 100644
--- a/Extensions/dnSpy.Debugger/dnSpy.Debugger/Properties/dnSpy.Debugger.Resources.zh-CN.resx
+++ b/Extensions/dnSpy.Debugger/dnSpy.Debugger/Properties/dnSpy.Debugger.Resources.zh-CN.resx
@@ -309,6 +309,9 @@
   <data name="DetachAllCommand" xml:space="preserve">
     <value>分离所有(_L)</value>
   </data>
+  <data name="DetachingWillCauseTerminationOfDebuggeeProcess" xml:space="preserve">
+    <value>分离将导致调试对象进程终止。是否继续？</value>
+  </data>
   <data name="DisableAllBreakpointsCommand" xml:space="preserve">
     <value>禁用所有断点(_N)</value>
   </data>
@@ -395,7 +398,9 @@
 错误: {1}</value>
   </data>
   <data name="Locals_Ask_TooManyItems" xml:space="preserve">
-    <value>该节点中的子元素数量已超过最大值 ({0} 个)，当展开时会限制显示的子元素数量。是否需要显示所有的内容？</value>
+    <value>该节点中的子元素数量已超过最大值 ({0} 个)，当展开时会限制显示的子元素数量。
+
+是否需要显示所有的内容？</value>
   </data>
   <data name="Locals_Error_CantEvaluateWhenThreadIsAtUnsafePoint" xml:space="preserve">
     <value>当线程位于不安全状态时无法对表达式进行求值。按步调试或运行直到触发断点。</value>
@@ -724,6 +729,12 @@
   <data name="Window_Threads" xml:space="preserve">
     <value>线程</value>
   </data>
+  <data name="Window_StaticFields" xml:space="preserve">
+    <value>静态字段</value>
+  </data>
+  <data name="StaticFieldsCommand" xml:space="preserve">
+    <value>静态字段(_S)</value>
+  </data>
   <data name="YesNo_No" xml:space="preserve">
     <value>否</value>
   </data>
@@ -940,6 +951,18 @@
   <data name="AddExceptionButton" xml:space="preserve">
     <value>添加</value>
   </data>
+  <data name="AddEnvironmentVariableButton" xml:space="preserve">
+    <value>添加</value>
+  </data>
+  <data name="AddEnvironmentVariablesMsgBoxTitle" xml:space="preserve">
+    <value>添加环境变量</value>
+  </data>
+  <data name="AddEnvironmentVariablesMsgBoxLabel" xml:space="preserve">
+    <value>环境变量</value>
+  </data>
+  <data name="AddManyEnvironmentVariablesButton" xml:space="preserve">
+    <value>添加多个</value>
+  </data>
   <data name="ExceptionDescription" xml:space="preserve">
     <value>异常说明</value>
   </data>
@@ -949,6 +972,9 @@
   <data name="EditConditions_Title" xml:space="preserve">
     <value>编辑条件</value>
   </data>
+  <data name="EditEnvironmentVariables_Title" xml:space="preserve">
+    <value>编辑环境变量</value>
+  </data>
   <data name="Button_AddCondition" xml:space="preserve">
     <value>添加条件(_A)</value>
   </data>
@@ -982,6 +1008,9 @@
   <data name="RemoveBreakpointCommand" xml:space="preserve">
     <value>移除断点</value>
   </data>
+  <data name="RemoveEnvironmentVariableButton" xml:space="preserve">
+    <value>删除</value>
+  </data>
   <data name="DisableBreakpointCommand3" xml:space="preserve">
     <value>禁用断点</value>
   </data>
@@ -1225,6 +1254,18 @@
   <data name="StartDebuggingCommand" xml:space="preserve">
     <value>开始调试</value>
   </data>
+  <data name="StartDebuggingWarning_UnknownBitness" xml:space="preserve">
+    <value>无法确定目标文件的位数。调试可能会导致非预期的或者不受控制的程序映像执行。
+
+是否继续？</value>
+  </data>
+  <data name="StartDebuggingWarning_IncorrectBitness" xml:space="preserve">
+    <value>目标文件的位数与当前版本的 dnSpy 不匹配。调试可能会导致非预期的或者不受控制的程序映像执行。
+
+建议使用 32 位 dnSpy 调试 32 位程序，使用 64 位 dnSpy 调试 64 位程序。
+
+是否继续？</value>
+  </data>
   <data name="Breakpoint_Tracepoint_BreakPrintMessage" xml:space="preserve">
     <value>中断并打印消息 '{0}'</value>
   </data>
@@ -1282,6 +1323,9 @@
   <data name="ResetBreakpointHitCountCommand" xml:space="preserve">
     <value>重置命中次数</value>
   </data>
+  <data name="ResetEnvironmentVariablesButton" xml:space="preserve">
+    <value>重置</value>
+  </data>
   <data name="HelpToolTip" xml:space="preserve">
     <value>帮助</value>
   </data>
@@ -1312,6 +1356,9 @@
   <data name="InsertTracepointCommand" xml:space="preserve">
     <value>插入跟踪点(_T)</value>
   </data>
+  <data name="InvalidInputString" xml:space="preserve">
+    <value>输入的内容无效</value>
+  </data>
   <data name="UnwindToThisFrameCommand" xml:space="preserve">
     <value>回溯到目标栈帧</value>
   </data>
@@ -1324,6 +1371,15 @@
   <data name="DbgSettings_EnableManagedDebuggingAssistants" xml:space="preserve">
     <value>启用托管调试助手 (MDA)</value>
   </data>
+  <data name="DbgSettings_EnableJustMyCodeDebugging" xml:space="preserve">
+    <value>启用"仅我的代码"</value>
+  </data>
+  <data name="DbgSettings_StepOverCodeInSystemModules" xml:space="preserve">
+    <value>跳过系统模块中的代码(系统自带程序集)</value>
+  </data>
+  <data name="DbgSettings_OnlyStepIntoCodeInPrimaryModule" xml:space="preserve">
+    <value>仅进入主模块中的代码</value>
+  </data>
   <data name="DebugStepProcessError" xml:space="preserve">
     <value>无法单步执行: {0}</value>
   </data>
@@ -1423,6 +1479,9 @@
   <data name="ExceptionMessage" xml:space="preserve">
     <value>信息: {0}</value>
   </data>
+  <data name="ExceptionHResult" xml:space="preserve">
+    <value>HResult: 0x{0:X8}</value>
+  </data>
   <data name="ExceptionName" xml:space="preserve">
     <value>异常: {0}</value>
   </data>
diff --git a/dnSpy/Roslyn/dnSpy.Roslyn/Properties/dnSpy.Roslyn.Resources.zh-CN.resx b/dnSpy/Roslyn/dnSpy.Roslyn/Properties/dnSpy.Roslyn.Resources.zh-CN.resx
index e0e240c20d..673937370b 100644
--- a/dnSpy/Roslyn/dnSpy.Roslyn/Properties/dnSpy.Roslyn.Resources.zh-CN.resx
+++ b/dnSpy/Roslyn/dnSpy.Roslyn/Properties/dnSpy.Roslyn.Resources.zh-CN.resx
@@ -133,16 +133,16 @@
     <value>优化代码</value>
   </data>
   <data name="CompilerSettings_OptionCompareBinary" xml:space="preserve">
-    <value>Option Compare Binary</value>
+    <value>Option Compare Binary (以二进制方式进行字符比较)</value>
   </data>
   <data name="CompilerSettings_OptionExplicit" xml:space="preserve">
-    <value>Option Explicit</value>
+    <value>Option Explicit (强制显式声明变量)</value>
   </data>
   <data name="CompilerSettings_OptionInfer" xml:space="preserve">
-    <value>Option Infer</value>
+    <value>Option Infer (允许编译器推断数据类型)</value>
   </data>
   <data name="CompilerSettings_OptionStrict" xml:space="preserve">
-    <value>Option Strict</value>
+    <value>Option Strict (保证数值变量精度)</value>
   </data>
   <data name="CompilerSettings_PreprocessorSymbols" xml:space="preserve">
     <value>条件编译符号</value>