Merge branch 'master' of github.com:ShareX/ShareX

almarshenwan · Nov 10, 2017 · 452a039 · 452a039
2 parents 7388cd3 + acb8428
commit 452a039
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx
@@ -684,4 +684,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
   <data name="ShapeManager_CreateToolbar_StartEditorFullscreen" xml:space="preserve">
     <value>Start editor fullscreen</value>
   </data>
+  <data name="ShapeManager_CreateToolbar_EditorBackgroundColor" xml:space="preserve">
+    <value>Editor background color...</value>
+  </data>
 </root>
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx b/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx
@@ -473,4 +473,7 @@
   <data name="ShapeManager_CreateToolbar_StartEditorFullscreen" xml:space="preserve">
     <value>Запускать редактор в полноэкранном режиме</value>
   </data>
+  <data name="ShapeManager_CreateToolbar_EditorBackgroundColor" xml:space="preserve">
+    <value>Цвет фона редактора...</value>
+  </data>
 </root>
diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
@@ -742,7 +742,7 @@ internal void CreateToolbar()
                 tsmiEditorModeFullscreen.Click += (sender, e) => Options.EditorModeFullscreen = tsmiEditorModeFullscreen.Checked;
                 tsddbOptions.DropDownItems.Add(tsmiEditorModeFullscreen);
 
-                tsmiEditorBackgroundColor = new ToolStripMenuItem("Editor background color...");
+                tsmiEditorBackgroundColor = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_EditorBackgroundColor);
                 tsmiEditorBackgroundColor.Click += (sender, e) =>
                 {
                     PauseForm();