Merge pull request #1048 from wise0704/Korean

Meychi · Meychi · commit 25cac1899b1b · 2016-01-29T12:46:16.000+02:00
Korean Locale
diff --git a/External/Plugins/AS3Context/PluginMain.cs b/External/Plugins/AS3Context/PluginMain.cs
@@ -372,7 +372,7 @@ private void CreateMenuItems()
 
             viewButton = new ToolStripButton(pluginIcon);
             viewButton.Name = "ShowProfiler";
-            viewButton.ToolTipText = TextHelper.GetString("Label.ViewMenuItem").Replace("&", "");
+            viewButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.ViewMenuItem");
             PluginBase.MainForm.RegisterSecondaryItem("ViewMenu.ShowProfiler", viewButton);
             viewButton.Click += OpenPanel;
         }
diff --git a/External/Plugins/ASCompletion/CustomControls/ModelsExplorer.cs b/External/Plugins/ASCompletion/CustomControls/ModelsExplorer.cs
@@ -153,7 +153,7 @@ private void InitializeLocalization()
             this.filterLabel.Text = TextHelper.GetString("Info.FindType");
             this.searchButton.ToolTipText = TextHelper.GetString("ToolTip.Search");
             this.refreshButton.ToolTipText = TextHelper.GetString("ToolTip.Refresh");
-            this.rebuildButton.ToolTipText = TextHelper.GetString("Label.RebuildClasspathCache").Replace("&", "");
+            this.rebuildButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.RebuildClasspathCache");
             this.editToolStripMenuItem.Text = TextHelper.GetString("Label.ModelEdit");
             this.exploreToolStripMenuItem.Text = TextHelper.GetString("Label.ModelExplore");
             this.convertToolStripMenuItem.Text = TextHelper.GetString("Label.ModelConvert");
diff --git a/External/Plugins/ASCompletion/PluginMain.cs b/External/Plugins/ASCompletion/PluginMain.cs
@@ -691,7 +691,7 @@ private void CreateMenuItems()
                 image = pluginUI.GetIcon(PluginUI.ICON_CHECK_SYNTAX);
                 button = new ToolStripButton(image);
                 button.Name = "CheckSyntax";
-                button.ToolTipText = TextHelper.GetString("Label.CheckSyntax").Replace("&", "");
+                button.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.CheckSyntax");
                 button.Click += new EventHandler(CheckSyntax);
                 PluginBase.MainForm.RegisterSecondaryItem("FlashToolsMenu.CheckSyntax", button);
                 toolStrip.Items.Add(button);
diff --git a/External/Plugins/AirProperties/PluginMain.cs b/External/Plugins/AirProperties/PluginMain.cs
@@ -193,7 +193,7 @@ private void AddToolBarItems(ToolStrip toolStrip)
         {
             this.pmMenuButton = new ToolStripButton();
             this.pmMenuButton.Image = GetImage("blockdevice_small.png");
-            this.pmMenuButton.Text = TextHelper.GetString("Label.ProjectMenuItem").Replace("&", "").Replace("...", "");
+            this.pmMenuButton.Text = TextHelper.GetStringWithoutMnemonicsOrEllipsis("Label.ProjectMenuItem");
             this.pmMenuButton.DisplayStyle = ToolStripItemDisplayStyle.Image;
             this.pmMenuButton.Click += new EventHandler(this.OpenWizard);
             PluginBase.MainForm.RegisterSecondaryItem("ProjectMenu.AirApplicationProperties", this.pmMenuButton);
diff --git a/External/Plugins/CodeRefactor/Controls/BatchProcessDialog.cs b/External/Plugins/CodeRefactor/Controls/BatchProcessDialog.cs
@@ -148,8 +148,8 @@ private void InitializeDefaults()
             this.operationComboBox.Items.AddRange(new Object[] 
             {
                 TextHelper.GetString("Info.FormatCode"),
-                TextHelper.GetString("Label.OrganizeImports").Replace("&", ""),
-                TextHelper.GetString("Label.TruncateImports").Replace("&", ""),
+                TextHelper.GetStringWithoutMnemonics("Label.OrganizeImports"),
+                TextHelper.GetStringWithoutMnemonics("Label.TruncateImports"),
                 TextHelper.GetString("Info.ConsistentEOLs"),
             });
             this.Text = TextHelper.GetString("Title.BatchProcessDialog");
diff --git a/External/Plugins/CodeRefactor/RefactorItem.cs b/External/Plugins/CodeRefactor/RefactorItem.cs
@@ -23,8 +23,8 @@ public static void AddItemToList(ToolStripItem item, List<ICompletionListItem> l
         public RefactorItem(ToolStripItem item)
         {
             this.item = item;
-            label = Regex.Replace(item.Text, "[&.]", string.Empty);
-            description = TextHelper.GetString("Label.Refactor").Replace("&", string.Empty);
+            label = TextHelper.RemoveMnemonicsAndEllipsis(item.Text);
+            description = TextHelper.GetStringWithoutMnemonics("Label.Refactor");
             icon = (Bitmap) (item.Image ?? PluginBase.MainForm.FindImage("452")); //452 or 473
         }
 
diff --git a/External/Plugins/FlashDebugger/Controls/ViewerForm.cs b/External/Plugins/FlashDebugger/Controls/ViewerForm.cs
@@ -33,7 +33,7 @@ private void InitializeLocalization()
             this.WordWrapcheckBox.Text = TextHelper.GetString("Label.WordWrap");
             this.CopyValuebutton.Text = TextHelper.GetString("Label.CopyValue");
             this.CopyExpbutton.Text = TextHelper.GetString("Label.CopyExp");
-            this.Text = " " + TextHelper.GetString("Label.Viewer").Replace("&", "");
+            this.Text = " " + TextHelper.GetStringWithoutMnemonics("Label.Viewer");
         }
 
         private void ViewerForm_FormClosing(object sender, FormClosingEventArgs e)
diff --git a/External/Plugins/LayoutManager/PluginUI.cs b/External/Plugins/LayoutManager/PluginUI.cs
@@ -206,10 +206,10 @@ private void InitializeContextMenu()
         /// </summary>
         private void InitializeTexts()
         {
-            this.loadStripButton.ToolTipText = TextHelper.GetString("Label.LoadLayout").Replace("&", "");
-            this.deleteStripButton.ToolTipText = TextHelper.GetString("Label.DeleteLayout").Replace("&", "");
-            this.settingStripButton.ToolTipText = TextHelper.GetString("Label.ShowSettings").Replace("&", "");
-            this.saveStripButton.ToolTipText = TextHelper.GetString("Label.SaveCurrent").Replace("&", "");
+            this.loadStripButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.LoadLayout");
+            this.deleteStripButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.DeleteLayout");
+            this.settingStripButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.ShowSettings");
+            this.saveStripButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.SaveCurrent");
         }
 
         /// <summary>
diff --git a/External/Plugins/MacroManager/PluginMain.cs b/External/Plugins/MacroManager/PluginMain.cs
@@ -228,7 +228,7 @@ public void RefreshMacroToolBarItems()
                 {
                     ToolStripButton macroButton = new ToolStripButton();
                     macroButton.Click += new EventHandler(this.MacroMenuItemClick);
-                    macroButton.ToolTipText = macro.Label.Replace("&", "");
+                    macroButton.ToolTipText = TextHelper.RemoveMnemonics(macro.Label);
                     macroButton.Tag = macro;
                     if (!String.IsNullOrEmpty(macro.Image))
                     {
diff --git a/External/Plugins/ProjectManager/Actions/FileActions.cs b/External/Plugins/ProjectManager/Actions/FileActions.cs
@@ -231,7 +231,7 @@ public void AddFolder(string inDirectory)
         {
             try
             {
-                string label = TextHelper.GetString("Label.NewFolder").Replace("&", "").Replace("...", "");
+                string label = TextHelper.GetStringWithoutMnemonicsOrEllipsis("Label.NewFolder");
                 string path = Path.Combine(inDirectory, label);
 
                 int i = 2;
diff --git a/External/Plugins/ProjectManager/Controls/FDMenus.cs b/External/Plugins/ProjectManager/Controls/FDMenus.cs
@@ -57,13 +57,13 @@ public FDMenus(IMainForm mainForm)
 
             BuildProject = new ToolStripButton(Icons.Gear.Img);
             BuildProject.Name = "BuildProject";
-            BuildProject.ToolTipText = TextHelper.GetString("Label.BuildProject").Replace("&", "");
+            BuildProject.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.BuildProject");
             PluginBase.MainForm.RegisterSecondaryItem("ProjectMenu.BuildProject", BuildProject);
             toolBar.Items.Add(BuildProject);
 
             TestMovie = new ToolStripButton(Icons.GreenCheck.Img);
             TestMovie.Name = "TestMovie";
-            TestMovie.ToolTipText = TextHelper.GetString("Label.TestMovie").Replace("&", "");
+            TestMovie.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.TestMovie");
             PluginBase.MainForm.RegisterSecondaryItem("ProjectMenu.TestMovie", TestMovie);
             toolBar.Items.Add(TestMovie);
 
diff --git a/External/Plugins/ProjectManager/Controls/PropertiesDialog.cs b/External/Plugins/ProjectManager/Controls/PropertiesDialog.cs
@@ -884,7 +884,7 @@ private void InitializeLocalization()
             this.label2.Text = TextHelper.GetString("Info.ProjectClasspaths");
             this.outputTypeLabel.Text = TextHelper.GetString("Info.OutputType");
             this.outputBrowseButton.Text = TextHelper.GetString("Label.Browse");
-            this.groupBox3.Text = TextHelper.GetString("Label.ProjectClasspaths").Replace("...", "");
+            this.groupBox3.Text = TextHelper.GetStringWithoutEllipsis("Label.ProjectClasspaths");
             this.groupBox5.Text = TextHelper.GetString("Info.PostBuildCmdLine");
             this.dimensionsLabel.Text = TextHelper.GetString("Label.Dimensions");
             this.label3.Text = String.Format(TextHelper.GetString("Info.GlobalClasspaths"), "\n");
diff --git a/External/Plugins/ProjectManager/Controls/RecentProjectsMenu.cs b/External/Plugins/ProjectManager/Controls/RecentProjectsMenu.cs
@@ -24,7 +24,7 @@ public class RecentProjectsMenu : ToolStripMenuItem
         public RecentProjectsMenu() : base(TextHelper.GetString("Label.RecentProjects"))
         {
             ToolbarSelector = new ToolStripDropDownButton();
-            ToolbarSelector.Text = TextHelper.GetString("Label.RecentProjects").Replace("&", "");
+            ToolbarSelector.Text = TextHelper.GetStringWithoutMnemonics("Label.RecentProjects");
             ToolbarSelector.DisplayStyle = ToolStripItemDisplayStyle.Image;
             ToolbarSelector.Image = Icons.Project.Img;
             ToolbarSelector.Enabled = false;
diff --git a/External/Plugins/ProjectManager/Controls/TreeView/WatcherNode.cs b/External/Plugins/ProjectManager/Controls/TreeView/WatcherNode.cs
@@ -185,7 +185,7 @@ private void Update()
                 Tree.PathToSelect = null;
                 node.EnsureVisible();
                 // if you created a new folder, then label edit it!
-                string label = TextHelper.GetString("Label.NewFolder").Replace("&", "").Replace("...", "");
+                string label = TextHelper.GetStringWithoutMnemonicsOrEllipsis("Label.NewFolder");
                 if (node.Text.StartsWith(label))
                 {
                     node.BeginEdit();
diff --git a/External/Plugins/ProjectManager/PluginMain.cs b/External/Plugins/ProjectManager/PluginMain.cs
@@ -1012,7 +1012,7 @@ public void UpdateUIStatus(ProjectManagerUIStatus status)
                 case ProjectManagerUIStatus.NotBuilding:
                     DisabledForBuild = false;
                     menuButton.ToolTipText = menuItem.Text = contextMenuItem.Text =
-                        TextHelper.GetString("Label.BuildProject").Replace("&", "");
+                        TextHelper.GetStringWithoutMnemonics("Label.BuildProject");
                     PluginBase.MainForm.ApplySecondaryShortcut(menuButton);
                     menuButton.Image = menuItem.Image = contextMenuItem.Image = Icons.Gear.Img;
                     break;
diff --git a/FlashDevelop/Bin/Debug/StartPage/javascript/localization.js b/FlashDevelop/Bin/Debug/StartPage/javascript/localization.js
@@ -152,3 +152,33 @@ locale["zh_CN.projectTypeUnknown"] = "未知";
 locale["zh_CN.tooltipTextModified"] = "修改:";
 locale["zh_CN.tooltipTextCreated"] = "创建:";
 locale["zh_CN.tooltipTextType"] = "类型:";
+
+/**
+* Locale strings for Korean.
+*/
+locale["ko_KR.mainLinkHome"] = "홈";
+locale["ko_KR.mainLinkDocs"] = "도큐멘테이션";
+locale["ko_KR.mainLinkNotes"] = "릴리스 노트";
+locale["ko_KR.mainLinkAbout"] = "소개";
+locale["ko_KR.createNewProject"] = "새 프로젝트...";
+locale["ko_KR.openProjectDialog"] = "프로젝트 열기...";
+locale["ko_KR.recentProjectsTitle"] = "최근 프로젝트";
+locale["ko_KR.loadingRecentProjects"] = "최근 프로젝트 로드중...";
+locale["ko_KR.recentProjectsNotFound"] = "최근 프로젝트를 찾을 수 없습니다.";
+locale["ko_KR.versionInfoTitle"] = "최신 버전";
+locale["ko_KR.loadingVersionInfo"] = "버전 정보 로드...";
+locale["ko_KR.versionInfoNotAvailable"] = "버전 정보를 사용할 수 없습니다.";
+locale["ko_KR.yourVersionIsOutOfDate"] = "현재 버전이 ({0}) 최신이 아닙니다.";
+locale["ko_KR.downloadVersionHere"] = "다운로드!";
+locale["ko_KR.loadingRssFeed"] = "RSS 피드 로드중...";
+locale["ko_KR.rssFeedNotAvailable"] = "RSS 피드를 사용할 수 없습니다.";
+locale["ko_KR.projectTypeFDP"] = "확인할 수 없습니다";
+locale["ko_KR.projectTypeAS2"] = "ActionScript 2 프로젝트";
+locale["ko_KR.projectTypeAS3"] = "ActionScript 3 프로젝트";
+locale["ko_KR.projectTypeGeneric"] = "일반 프로젝트";
+locale["ko_KR.projectTypeHaXe"] = "Haxe 프로젝트";
+locale["ko_KR.projectTypeLoom"] = "Loom 프로젝트";
+locale["ko_KR.projectTypeUnknown"] = "알수없음";
+locale["ko_KR.tooltipTextModified"] = "변경:";
+locale["ko_KR.tooltipTextCreated"] = "생성:";
+locale["ko_KR.tooltipTextType"] = "유형:";
diff --git a/FlashDevelop/Dialogs/FRInDocDialog.cs b/FlashDevelop/Dialogs/FRInDocDialog.cs
@@ -367,8 +367,8 @@ private void ApplyLocalizedTexts()
             this.findPrevButton.Text = TextHelper.GetString("Label.FindPrevious");
             this.bookmarkAllButton.Text = TextHelper.GetString("Label.BookmarkAll");
             this.replaceAllButton.Text = TextHelper.GetString("Label.ReplaceAll");
-            this.replaceButton.Text = TextHelper.GetString("Label.Replace").Replace("...", "");
-            this.closeButton.Text = TextHelper.GetString("Label.Close").Replace("&", "");
+            this.replaceButton.Text = TextHelper.GetStringWithoutEllipsis("Label.Replace");
+            this.closeButton.Text = TextHelper.GetStringWithoutMnemonics("Label.Close");
             this.lookComboBox.Items[0] = TextHelper.GetString("Info.FullSourceCode");
             this.lookComboBox.Items[1] = TextHelper.GetString("Info.CurrentSelection");
             this.lookComboBox.Items[2] = TextHelper.GetString("Info.CodeAndStrings");
diff --git a/FlashDevelop/Dialogs/FRInFilesDialog.cs b/FlashDevelop/Dialogs/FRInFilesDialog.cs
@@ -492,7 +492,7 @@ private void ApplyLocalizedTexts()
             this.replaceLabel.Text = TextHelper.GetString("Info.ReplaceWith");
             this.findButton.Text = TextHelper.GetString("Label.Find");
             this.cancelButton.Text = TextHelper.GetString("Label.Cancel");
-            this.replaceButton.Text = TextHelper.GetString("Label.Replace").Replace("...", "");
+            this.replaceButton.Text = TextHelper.GetStringWithoutEllipsis("Label.Replace");
             this.lineHeader.Text = TextHelper.GetString("Info.LineHeader");
             this.descHeader.Text = TextHelper.GetString("Info.DescHeader");
             this.pathHeader.Text = TextHelper.GetString("Info.PathHeader");
diff --git a/FlashDevelop/Dialogs/ShortcutDialog.cs b/FlashDevelop/Dialogs/ShortcutDialog.cs
@@ -236,7 +236,7 @@ private void ApplyLocalizedTexts()
             this.infoLabel.Text = TextHelper.GetString("Info.ShortcutEditInfo");
             this.closeButton.Text = TextHelper.GetString("Label.Close");
             this.viewCustom.Text = TextHelper.GetString("Label.ViewCustom");
-            this.searchLabel.Text = TextHelper.GetString("Label.Search").Replace("&", "") + ":";
+            this.searchLabel.Text = TextHelper.GetStringWithoutMnemonics("Label.Search") + ":";
             this.Text = " " + TextHelper.GetString("Title.Shortcuts");
         }
 
diff --git a/FlashDevelop/Managers/ButtonManager.cs b/FlashDevelop/Managers/ButtonManager.cs
@@ -326,7 +326,7 @@ public static String GetActiveEncodingName()
                     }
                     else
                     {
-                        String name = TextHelper.GetString("Label.8Bits").Replace("&", "");
+                        String name = TextHelper.GetStringWithoutMnemonics("Label.8Bits");
                         return name + " (" + info.Charset + ")";
                     }
                 }
@@ -360,7 +360,7 @@ public static String GetActiveEncodingName()
         /// </summary>
         public static String GetLabelAsPlainText(String name, Boolean unicode, Boolean hasBOM)
         {
-            String label = TextHelper.GetString(name).Replace("&", "");
+            String label = TextHelper.GetStringWithoutMnemonics(name);
             if (unicode) label = "Unicode (" + label.ToLower() + ")";
             return hasBOM ? label + " (BOM)" : label;
         }
diff --git a/FlashDevelop/Managers/StripBarManager.cs b/FlashDevelop/Managers/StripBarManager.cs
@@ -254,8 +254,7 @@ private static String GetSyntaxMenuXml()
         /// </summary>
         private static String GetStrippedString(String text, Boolean removeWhite)
         {
-            text = text.Replace("&", "");
-            text = text.Replace("...", "");
+            text = TextHelper.RemoveMnemonicsAndEllipsis(text);
             if (removeWhite)
             {
                 text = text.Replace(" ", "");
diff --git a/PluginCore/PluginCore.csproj b/PluginCore/PluginCore.csproj
@@ -566,6 +566,9 @@
     <EmbeddedResource Include="PluginCore\Resources\de_DE.resX">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="PluginCore\Resources\ko_KR.resX">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="PluginCore\Resources\en_US.resX">
       <SubType>Designer</SubType>
     </EmbeddedResource>
diff --git a/PluginCore/PluginCore/Localization/LocaleVersion.cs b/PluginCore/PluginCore/Localization/LocaleVersion.cs
@@ -1,22 +1,48 @@
 namespace PluginCore.Localization
 {
-    public enum LocaleVersion
+    public enum LocaleVersion : sbyte
     {
+        /// <summary>
+        /// English - UNITED STATES (US)
+        /// </summary>
         [StringValue("en_US")]
         en_US = 0,
 
+        /// <summary>
+        /// Japanese - JAPAN (JP)
+        /// </summary>
         [StringValue("ja_JP")]
         ja_JP = 1,
 
+        /// <summary>
+        /// German - GERMANY (DE)
+        /// </summary>
         [StringValue("de_DE")]
         de_DE = 2,
 
+        /// <summary>
+        /// Basque - SPAIN (ES)
+        /// </summary>
         [StringValue("eu_ES")]
         eu_ES = 3,
 
+        /// <summary>
+        /// Chinese - CHINA (CN)
+        /// </summary>
         [StringValue("zh_CN")]
-        zh_CN = 4
+        zh_CN = 4,
 
+        /// <summary>
+        /// Korean - KOREA, REPUBLIC OF (KR)
+        /// </summary>
+        [StringValue("ko_KR")]
+        ko_KR = 5,
+
+        /// <summary>
+        /// Represents an invalid locale.
+        /// </summary>
+        [System.ComponentModel.Browsable(false)]
+        Invalid = -1
     }
 
 }
diff --git a/PluginCore/PluginCore/Localization/TextHelper.cs b/PluginCore/PluginCore/Localization/TextHelper.cs
diff --git a/PluginCore/PluginCore/Resources/en_US.resX b/PluginCore/PluginCore/Resources/en_US.resX
diff --git a/PluginCore/PluginCore/Resources/ko_KR.resX b/PluginCore/PluginCore/Resources/ko_KR.resX

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ private void CreateMenuItems()`
`372`	`372`
`373`	`373`	`viewButton = new ToolStripButton(pluginIcon);`
`374`	`374`	`viewButton.Name = "ShowProfiler";`
`375`		`- viewButton.ToolTipText = TextHelper.GetString("Label.ViewMenuItem").Replace("&", "");`
	`375`	`+ viewButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.ViewMenuItem");`
`376`	`376`	`PluginBase.MainForm.RegisterSecondaryItem("ViewMenu.ShowProfiler", viewButton);`
`377`	`377`	`viewButton.Click += OpenPanel;`
`378`	`378`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ private void AddToolBarItems(ToolStrip toolStrip)`
`193`	`193`	`{`
`194`	`194`	`this.pmMenuButton = new ToolStripButton();`
`195`	`195`	`this.pmMenuButton.Image = GetImage("blockdevice_small.png");`
`196`		`- this.pmMenuButton.Text = TextHelper.GetString("Label.ProjectMenuItem").Replace("&", "").Replace("...", "");`
	`196`	`+ this.pmMenuButton.Text = TextHelper.GetStringWithoutMnemonicsOrEllipsis("Label.ProjectMenuItem");`
`197`	`197`	`this.pmMenuButton.DisplayStyle = ToolStripItemDisplayStyle.Image;`
`198`	`198`	`this.pmMenuButton.Click += new EventHandler(this.OpenWizard);`
`199`	`199`	`PluginBase.MainForm.RegisterSecondaryItem("ProjectMenu.AirApplicationProperties", this.pmMenuButton);`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ public static void AddItemToList(ToolStripItem item, List<ICompletionListItem> l`
`23`	`23`	`public RefactorItem(ToolStripItem item)`
`24`	`24`	`{`
`25`	`25`	`this.item = item;`
`26`		`- label = Regex.Replace(item.Text, "[&.]", string.Empty);`
`27`		`- description = TextHelper.GetString("Label.Refactor").Replace("&", string.Empty);`
	`26`	`+ label = TextHelper.RemoveMnemonicsAndEllipsis(item.Text);`
	`27`	`+ description = TextHelper.GetStringWithoutMnemonics("Label.Refactor");`
`28`	`28`	`icon = (Bitmap) (item.Image ?? PluginBase.MainForm.FindImage("452")); //452 or 473`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ private void InitializeLocalization()`
`33`	`33`	`this.WordWrapcheckBox.Text = TextHelper.GetString("Label.WordWrap");`
`34`	`34`	`this.CopyValuebutton.Text = TextHelper.GetString("Label.CopyValue");`
`35`	`35`	`this.CopyExpbutton.Text = TextHelper.GetString("Label.CopyExp");`
`36`		`- this.Text = " " + TextHelper.GetString("Label.Viewer").Replace("&", "");`
	`36`	`+ this.Text = " " + TextHelper.GetStringWithoutMnemonics("Label.Viewer");`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`private void ViewerForm_FormClosing(object sender, FormClosingEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -206,10 +206,10 @@ private void InitializeContextMenu()`
`206`	`206`	`/// </summary>`
`207`	`207`	`private void InitializeTexts()`
`208`	`208`	`{`
`209`		`- this.loadStripButton.ToolTipText = TextHelper.GetString("Label.LoadLayout").Replace("&", "");`
`210`		`- this.deleteStripButton.ToolTipText = TextHelper.GetString("Label.DeleteLayout").Replace("&", "");`
`211`		`- this.settingStripButton.ToolTipText = TextHelper.GetString("Label.ShowSettings").Replace("&", "");`
`212`		`- this.saveStripButton.ToolTipText = TextHelper.GetString("Label.SaveCurrent").Replace("&", "");`
	`209`	`+ this.loadStripButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.LoadLayout");`
	`210`	`+ this.deleteStripButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.DeleteLayout");`
	`211`	`+ this.settingStripButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.ShowSettings");`
	`212`	`+ this.saveStripButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.SaveCurrent");`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ public void RefreshMacroToolBarItems()`
`228`	`228`	`{`
`229`	`229`	`ToolStripButton macroButton = new ToolStripButton();`
`230`	`230`	`macroButton.Click += new EventHandler(this.MacroMenuItemClick);`
`231`		`- macroButton.ToolTipText = macro.Label.Replace("&", "");`
	`231`	`+ macroButton.ToolTipText = TextHelper.RemoveMnemonics(macro.Label);`
`232`	`232`	`macroButton.Tag = macro;`
`233`	`233`	`if (!String.IsNullOrEmpty(macro.Image))`
`234`	`234`	`{`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ public void AddFolder(string inDirectory)`
`231`	`231`	`{`
`232`	`232`	`try`
`233`	`233`	`{`
`234`		`- string label = TextHelper.GetString("Label.NewFolder").Replace("&", "").Replace("...", "");`
	`234`	`+ string label = TextHelper.GetStringWithoutMnemonicsOrEllipsis("Label.NewFolder");`
`235`	`235`	`string path = Path.Combine(inDirectory, label);`
`236`	`236`
`237`	`237`	`int i = 2;`