diff --git a/ILSpy/ContextMenuEntry.cs b/ILSpy/ContextMenuEntry.cs
index 0bde81f81..f2a94ae09 100644
--- a/ILSpy/ContextMenuEntry.cs
+++ b/ILSpy/ContextMenuEntry.cs
@@ -219,7 +219,7 @@ namespace ICSharpCode.ILSpy
 							needSeparatorForCategory = false;
 						}
 						MenuItem menuItem = new MenuItem();
-						menuItem.Header = entryPair.Metadata.Header;
+						menuItem.Header = MainWindow.GetResourceString( entryPair.Metadata.Header);
 						menuItem.InputGestureText = entryPair.Metadata.InputGestureText;
 						if (!string.IsNullOrEmpty(entryPair.Metadata.Icon)) {
 							menuItem.Icon = new Image {
diff --git a/ILSpy/DebugSteps.xaml b/ILSpy/DebugSteps.xaml
index 669fce140..95e672623 100644
--- a/ILSpy/DebugSteps.xaml
+++ b/ILSpy/DebugSteps.xaml
@@ -4,14 +4,15 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:ICSharpCode.ILSpy"
+			 xmlns:properties="clr-namespace:ICSharpCode.ILSpy.Properties"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
 	<DockPanel>
 		<StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-			<CheckBox Margin="3" Content="UseFieldSugar" IsChecked="{Binding UseFieldSugar, Source={x:Static local:DebugSteps.Options}}" />
-			<CheckBox Margin="3" Content="UseLogicOperationSugar"  IsChecked="{Binding UseLogicOperationSugar, Source={x:Static local:DebugSteps.Options}}" />
-			<CheckBox Margin="3" Content="ShowILRanges"  IsChecked="{Binding ShowILRanges, Source={x:Static local:DebugSteps.Options}}" />
-			<CheckBox Margin="3" Content="ShowChildIndexInBlock"  IsChecked="{Binding ShowChildIndexInBlock, Source={x:Static local:DebugSteps.Options}}" />
+			<CheckBox Margin="3" Content="{x:Static properties:Resources.UseFieldSugar}" IsChecked="{Binding UseFieldSugar, Source={x:Static local:DebugSteps.Options}}" />
+			<CheckBox Margin="3" Content="{x:Static properties:Resources.UseLogicOperationSugar}"  IsChecked="{Binding UseLogicOperationSugar, Source={x:Static local:DebugSteps.Options}}" />
+			<CheckBox Margin="3" Content="{x:Static properties:Resources.ShowILRanges}"  IsChecked="{Binding ShowILRanges, Source={x:Static local:DebugSteps.Options}}" />
+			<CheckBox Margin="3" Content="{x:Static properties:Resources.ShowChildIndexInBlock}"  IsChecked="{Binding ShowChildIndexInBlock, Source={x:Static local:DebugSteps.Options}}" />
 		</StackPanel>
 		<TreeView Name="tree" MouseDoubleClick="ShowStateAfter_Click" KeyDown="tree_KeyDown">
 			<TreeView.ItemTemplate>
@@ -21,9 +22,9 @@
 			</TreeView.ItemTemplate>
 			<TreeView.ContextMenu>
 				<ContextMenu>
-					<MenuItem Header="Show state before this step" Click="ShowStateBefore_Click" InputGestureText="Shift+Enter" />
-					<MenuItem Header="Show state after this step" Click="ShowStateAfter_Click" InputGestureText="Enter" />
-					<MenuItem Header="Debug this step" Click="DebugStep_Click" />
+					<MenuItem Header="{x:Static properties:Resources.ShowStateBeforeThisStep}" Click="ShowStateBefore_Click" InputGestureText="Shift+Enter" />
+					<MenuItem Header="{x:Static properties:Resources.ShowStateAfterThisStep}" Click="ShowStateAfter_Click" InputGestureText="Enter" />
+					<MenuItem Header="{x:Static properties:Resources.DebugThisStep}" Click="DebugStep_Click" />
 				</ContextMenu>
 			</TreeView.ContextMenu>
 		</TreeView>
diff --git a/ILSpy/DebugSteps.xaml.cs b/ILSpy/DebugSteps.xaml.cs
index e5c1431e3..131530740 100644
--- a/ILSpy/DebugSteps.xaml.cs
+++ b/ILSpy/DebugSteps.xaml.cs
@@ -79,7 +79,7 @@ namespace ICSharpCode.ILSpy
 
 		public static void Show()
 		{
-			MainWindow.Instance.ShowInTopPane("Debug Steps", new DebugSteps());
+			MainWindow.Instance.ShowInTopPane(Properties.Resources.DebugSteps, new DebugSteps());
 		}
 
 		void IPane.Closed()
diff --git a/ILSpy/MainWindow.xaml.cs b/ILSpy/MainWindow.xaml.cs
index 21d285352..e502e72bc 100644
--- a/ILSpy/MainWindow.xaml.cs
+++ b/ILSpy/MainWindow.xaml.cs
@@ -182,7 +182,7 @@ namespace ICSharpCode.ILSpy
 			}
 		}
 
-		private static string GetResourceString(string key)
+		internal static string GetResourceString(string key)
 		{
 			var str = !string.IsNullOrEmpty(key)? Properties.Resources.ResourceManager.GetString(key):null;
 			return string.IsNullOrEmpty(key)||  string.IsNullOrEmpty(str) ? key :  str;
diff --git a/ILSpy/OpenFromGacDialog.xaml b/ILSpy/OpenFromGacDialog.xaml
index 240d86af4..3398075c1 100644
--- a/ILSpy/OpenFromGacDialog.xaml
+++ b/ILSpy/OpenFromGacDialog.xaml
@@ -40,8 +40,8 @@
 			</ListView.View>
 		</ListView>
 		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
-			<Button IsDefault="True" Margin="2,0" IsEnabled="False" Name="okButton" Click="OKButton_Click" Content="_Open"/>
-			<Button IsCancel="True" Margin="2,0" Content="Cancel"/>
+			<Button IsDefault="True" Margin="2,0" IsEnabled="False" Name="okButton" Click="OKButton_Click" Content="{x:Static properties:Resources.OpenListDialog__Open}"/>
+			<Button IsCancel="True" Margin="2,0" Content="{x:Static properties:Resources.Cancel}"/>
 		</StackPanel>
 		<ProgressBar Grid.Row="1" Height="10" HorizontalAlignment="Stretch" Name="gacReadingProgressBar" VerticalAlignment="Bottom" Visibility="Hidden" />
 	</Grid>
diff --git a/ILSpy/Options/DecompilerSettingsPanel.xaml.cs b/ILSpy/Options/DecompilerSettingsPanel.xaml.cs
index a0ad5dfcb..33b57b7e4 100644
--- a/ILSpy/Options/DecompilerSettingsPanel.xaml.cs
+++ b/ILSpy/Options/DecompilerSettingsPanel.xaml.cs
@@ -26,7 +26,7 @@ namespace ICSharpCode.ILSpy.Options
 	/// <summary>
 	/// Interaction logic for DecompilerSettingsPanel.xaml
 	/// </summary>
-	[ExportOptionPage(Title = "Decompiler", Order = 0)]
+	[ExportOptionPage(Title = nameof(Properties.Resources.Decompiler), Order = 0)]
 	partial class DecompilerSettingsPanel : UserControl, IOptionPage
 	{
 		public DecompilerSettingsPanel()
diff --git a/ILSpy/Options/DisplaySettingsPanel.xaml b/ILSpy/Options/DisplaySettingsPanel.xaml
index a60d9c02e..c96a5020c 100644
--- a/ILSpy/Options/DisplaySettingsPanel.xaml
+++ b/ILSpy/Options/DisplaySettingsPanel.xaml
@@ -23,7 +23,7 @@
 					<RowDefinition Height="Auto" />
 					<RowDefinition Height="50" />
 				</Grid.RowDefinitions>
-				<Label Margin="3,0" Content="Font:"/>
+				<Label Margin="3,0" Content="{x:Static properties:Resources.DisplaySettingsPanel_Font}"/>
 				<ComboBox x:Name="fontSelector" VerticalContentAlignment="Center" SelectedItem="{Binding SelectedFont}" Grid.Column="1">
 					<ComboBox.ItemTemplate>
 						<DataTemplate>
@@ -31,7 +31,7 @@
 						</DataTemplate>
 					</ComboBox.ItemTemplate>
 				</ComboBox>
-				<Label Grid.Column="2" Margin="3,0" Content="Size:"/>
+				<Label Grid.Column="2" Margin="3,0" Content="{x:Static properties:Resources.Size}"/>
 				<ComboBox Grid.Column="3" Text="{Binding SelectedFontSize, Converter={StaticResource fontSizeConv}}" IsEditable="True" Margin="3,0">
 					<ComboBoxItem>6</ComboBoxItem>
 					<ComboBoxItem>7</ComboBoxItem>
diff --git a/ILSpy/Options/DisplaySettingsPanel.xaml.cs b/ILSpy/Options/DisplaySettingsPanel.xaml.cs
index e9afecf1f..e9122a9bd 100644
--- a/ILSpy/Options/DisplaySettingsPanel.xaml.cs
+++ b/ILSpy/Options/DisplaySettingsPanel.xaml.cs
@@ -31,7 +31,7 @@ namespace ICSharpCode.ILSpy.Options
 	/// <summary>
 	/// Interaction logic for DisplaySettingsPanel.xaml
 	/// </summary>
-	[ExportOptionPage(Title = "Display", Order = 1)]
+	[ExportOptionPage(Title = nameof(Properties.Resources.Display), Order = 1)]
 	public partial class DisplaySettingsPanel : UserControl, IOptionPage
 	{
 		public DisplaySettingsPanel()
diff --git a/ILSpy/Options/MiscSettingsPanel.xaml.cs b/ILSpy/Options/MiscSettingsPanel.xaml.cs
index 538652633..86258b074 100644
--- a/ILSpy/Options/MiscSettingsPanel.xaml.cs
+++ b/ILSpy/Options/MiscSettingsPanel.xaml.cs
@@ -24,7 +24,7 @@ namespace ICSharpCode.ILSpy.Options
 	/// <summary>
 	/// Interaction logic for MiscSettingsPanel.xaml
 	/// </summary>
-	[ExportOptionPage(Title = "Misc", Order = 2)]
+	[ExportOptionPage(Title = nameof(Properties.Resources.Misc), Order = 2)]
 	public partial class MiscSettingsPanel : UserControl, IOptionPage
 	{
 		public MiscSettingsPanel()
diff --git a/ILSpy/Options/OptionsDialog.xaml b/ILSpy/Options/OptionsDialog.xaml
index 2b48287d0..c52fefe84 100644
--- a/ILSpy/Options/OptionsDialog.xaml
+++ b/ILSpy/Options/OptionsDialog.xaml
@@ -5,7 +5,7 @@
         Style="{DynamicResource DialogWindow}"
         WindowStartupLocation="CenterOwner"
         ResizeMode="CanResizeWithGrip"
-        Title="Options" Height="400" Width="500">
+        Title="{x:Static properties:Resources.Options}" Height="400" Width="500">
 	<Grid>
 		<Grid.RowDefinitions>
 			<RowDefinition
diff --git a/ILSpy/Options/OptionsDialog.xaml.cs b/ILSpy/Options/OptionsDialog.xaml.cs
index 6908ba37a..d4f5a6191 100644
--- a/ILSpy/Options/OptionsDialog.xaml.cs
+++ b/ILSpy/Options/OptionsDialog.xaml.cs
@@ -22,6 +22,7 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Xml.Linq;
+using ICSharpCode.ILSpy.Properties;
 
 namespace ICSharpCode.ILSpy.Options
 {
@@ -44,7 +45,7 @@ namespace ICSharpCode.ILSpy.Options
 			ILSpySettings settings = ILSpySettings.Load();
 			foreach (var optionPage in optionPages.OrderBy(p => p.Metadata.Order)) {
 				TabItem tabItem = new TabItem();
-				tabItem.Header = optionPage.Metadata.Title;
+				tabItem.Header = MainWindow.GetResourceString( optionPage.Metadata.Title);
 				tabItem.Content = optionPage.Value;
 				tabControl.Items.Add(tabItem);
 				
@@ -93,7 +94,7 @@ namespace ICSharpCode.ILSpy.Options
 		public int Order { get; set; }
 	}
 	
-	[ExportMainMenuCommand(Menu = "_View", Header = "_Options...", MenuCategory = "Options", MenuOrder = 999)]
+	[ExportMainMenuCommand(Menu = nameof(Resources._View), Header = nameof(Resources._Options),  MenuCategory = nameof(Resources.Options) ,MenuOrder = 999)]
 	sealed class ShowOptionsCommand : SimpleCommand
 	{
 		public override void Execute(object parameter)
diff --git a/ILSpy/Properties/Resources.Designer.cs b/ILSpy/Properties/Resources.Designer.cs
index b6e218988..a2c98a503 100644
--- a/ILSpy/Properties/Resources.Designer.cs
+++ b/ILSpy/Properties/Resources.Designer.cs
@@ -159,6 +159,15 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 _Options... 的本地化字符串。
+        /// </summary>
+        public static string _Options {
+            get {
+                return ResourceManager.GetString("_Options", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 _Reload 的本地化字符串。
         /// </summary>
@@ -420,6 +429,33 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Debug Steps 的本地化字符串。
+        /// </summary>
+        public static string DebugSteps {
+            get {
+                return ResourceManager.GetString("DebugSteps", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Debug this step 的本地化字符串。
+        /// </summary>
+        public static string DebugThisStep {
+            get {
+                return ResourceManager.GetString("DebugThisStep", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Decompiler 的本地化字符串。
+        /// </summary>
+        public static string Decompiler {
+            get {
+                return ResourceManager.GetString("Decompiler", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Decompiling... 的本地化字符串。
         /// </summary>
@@ -447,6 +483,15 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Display 的本地化字符串。
+        /// </summary>
+        public static string Display {
+            get {
+                return ResourceManager.GetString("Display", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Display Code 的本地化字符串。
         /// </summary>
@@ -456,6 +501,15 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Font: 的本地化字符串。
+        /// </summary>
+        public static string DisplaySettingsPanel_Font {
+            get {
+                return ResourceManager.GetString("DisplaySettingsPanel_Font", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Download 的本地化字符串。
         /// </summary>
@@ -618,6 +672,15 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Misc 的本地化字符串。
+        /// </summary>
+        public static string Misc {
+            get {
+                return ResourceManager.GetString("Misc", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Name 的本地化字符串。
         /// </summary>
@@ -726,6 +789,15 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Options 的本地化字符串。
+        /// </summary>
+        public static string Options {
+            get {
+                return ResourceManager.GetString("Options", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Other options 的本地化字符串。
         /// </summary>
@@ -906,6 +978,15 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 ShowChildIndexInBlock 的本地化字符串。
+        /// </summary>
+        public static string ShowChildIndexInBlock {
+            get {
+                return ResourceManager.GetString("ShowChildIndexInBlock", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Show XML documentation in decompiled code 的本地化字符串。
         /// </summary>
@@ -915,6 +996,15 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 ShowILRanges 的本地化字符串。
+        /// </summary>
+        public static string ShowILRanges {
+            get {
+                return ResourceManager.GetString("ShowILRanges", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Show info from debug symbols, if available 的本地化字符串。
         /// </summary>
@@ -951,6 +1041,33 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Show state after this step 的本地化字符串。
+        /// </summary>
+        public static string ShowStateAfterThisStep {
+            get {
+                return ResourceManager.GetString("ShowStateAfterThisStep", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Show state before this step 的本地化字符串。
+        /// </summary>
+        public static string ShowStateBeforeThisStep {
+            get {
+                return ResourceManager.GetString("ShowStateBeforeThisStep", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Size: 的本地化字符串。
+        /// </summary>
+        public static string Size {
+            get {
+                return ResourceManager.GetString("Size", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Sort assembly _list by name 的本地化字符串。
         /// </summary>
@@ -1032,6 +1149,24 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 UseFieldSugar 的本地化字符串。
+        /// </summary>
+        public static string UseFieldSugar {
+            get {
+                return ResourceManager.GetString("UseFieldSugar", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 UseLogicOperationSugar 的本地化字符串。
+        /// </summary>
+        public static string UseLogicOperationSugar {
+            get {
+                return ResourceManager.GetString("UseLogicOperationSugar", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 You are using the latest release. 的本地化字符串。
         /// </summary>
diff --git a/ILSpy/Properties/Resources.resx b/ILSpy/Properties/Resources.resx
index b726afe53..b4f150e94 100644
--- a/ILSpy/Properties/Resources.resx
+++ b/ILSpy/Properties/Resources.resx
@@ -471,4 +471,49 @@
   <data name="_Reset" xml:space="preserve">
     <value>_Reset</value>
   </data>
+  <data name="Options" xml:space="preserve">
+    <value>Options</value>
+  </data>
+  <data name="_Options" xml:space="preserve">
+    <value>_Options...</value>
+  </data>
+  <data name="Display" xml:space="preserve">
+    <value>Display</value>
+  </data>
+  <data name="Decompiler" xml:space="preserve">
+    <value>Decompiler</value>
+  </data>
+  <data name="Misc" xml:space="preserve">
+    <value>Misc</value>
+  </data>
+  <data name="DisplaySettingsPanel_Font" xml:space="preserve">
+    <value>Font:</value>
+  </data>
+  <data name="Size" xml:space="preserve">
+    <value>Size:</value>
+  </data>
+  <data name="DebugSteps" xml:space="preserve">
+    <value>Debug Steps</value>
+  </data>
+  <data name="UseFieldSugar" xml:space="preserve">
+    <value>UseFieldSugar</value>
+  </data>
+  <data name="UseLogicOperationSugar" xml:space="preserve">
+    <value>UseLogicOperationSugar</value>
+  </data>
+  <data name="ShowILRanges" xml:space="preserve">
+    <value>ShowILRanges</value>
+  </data>
+  <data name="ShowChildIndexInBlock" xml:space="preserve">
+    <value>ShowChildIndexInBlock</value>
+  </data>
+  <data name="ShowStateBeforeThisStep" xml:space="preserve">
+    <value>Show state before this step</value>
+  </data>
+  <data name="ShowStateAfterThisStep" xml:space="preserve">
+    <value>Show state after this step</value>
+  </data>
+  <data name="DebugThisStep" xml:space="preserve">
+    <value>Debug this step</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ILSpy/Properties/Resources.zh-Hans.resx b/ILSpy/Properties/Resources.zh-Hans.resx
index 290fcfb2d..0d5611984 100644
--- a/ILSpy/Properties/Resources.zh-Hans.resx
+++ b/ILSpy/Properties/Resources.zh-Hans.resx
@@ -373,13 +373,13 @@
     <value>引用名称</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>Version  </value>
+    <value>版本</value>
   </data>
   <data name="Culture" xml:space="preserve">
-    <value>Culture  </value>
+    <value>区域</value>
   </data>
   <data name="PublicToken" xml:space="preserve">
-    <value>Public Key Token  </value>
+    <value>公钥标记</value>
   </data>
   <data name="OpenList" xml:space="preserve">
     <value>打开列表</value>
@@ -445,7 +445,7 @@
     <value>找不到 ILSpy 的更新。</value>
   </data>
   <data name="ILSpyVersionAvailable" xml:space="preserve">
-    <value>新的 ILSpy 版本可用。</value>
+    <value>有新的 ILSpy 版本已经可用。</value>
   </data>
   <data name="StandBy" xml:space="preserve">
     <value>就绪...</value>
@@ -471,4 +471,49 @@
   <data name="WatermarkText" xml:space="preserve">
     <value>搜索 t:TypeName, m:Member 或c:Constant; 使用完全匹配 (=term), '不应包含' (-term) 或 '必须包含' (+term); 使用 /reg(ular)?Ex(pressions)?/或两者 - t:/Type(Name)?/...  </value>
   </data>
+  <data name="Options" xml:space="preserve">
+    <value>选项</value>
+  </data>
+  <data name="_Options" xml:space="preserve">
+    <value>选项(_O)...</value>
+  </data>
+  <data name="Display" xml:space="preserve">
+    <value>显示</value>
+  </data>
+  <data name="Decompiler" xml:space="preserve">
+    <value>反编译器</value>
+  </data>
+  <data name="Misc" xml:space="preserve">
+    <value>杂项</value>
+  </data>
+  <data name="DisplaySettingsPanel_Font" xml:space="preserve">
+    <value>字体:</value>
+  </data>
+  <data name="Size" xml:space="preserve">
+    <value>大小:</value>
+  </data>
+  <data name="DebugSteps" xml:space="preserve">
+    <value>调试步骤</value>
+  </data>
+  <data name="UseFieldSugar" xml:space="preserve">
+    <value>UseFieldSugar</value>
+  </data>
+  <data name="UseLogicOperationSugar" xml:space="preserve">
+    <value>UseLogicOperationSugar</value>
+  </data>
+  <data name="ShowILRanges" xml:space="preserve">
+    <value>ShowILRanges</value>
+  </data>
+  <data name="ShowChildIndexInBlock" xml:space="preserve">
+    <value>ShowChildIndexInBlock</value>
+  </data>
+  <data name="ShowStateBeforeThisStep" xml:space="preserve">
+    <value>在此步骤之前显示状态</value>
+  </data>
+  <data name="ShowStateAfterThisStep" xml:space="preserve">
+    <value>在此步骤之后显示状态</value>
+  </data>
+  <data name="DebugThisStep" xml:space="preserve">
+    <value>调试此步骤</value>
+  </data>
 </root>
\ No newline at end of file