CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-04 22:21:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Jaex 2017-11-11 01:21:24 +03:00
parent 7388cd3ee2 acb8428271
commit 452a039392
4 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs generated
View file

@ -1571,6 +1571,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Editor background color....
/// </summary>
internal static string ShapeManager_CreateToolbar_EditorBackgroundColor {
get {
return ResourceManager.GetString("ShapeManager_CreateToolbar_EditorBackgroundColor", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Flip horizontal.
/// </summary>

3
ShareX.ScreenCaptureLib/Properties/Resources.resx
View file

@ -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>

3
ShareX.ScreenCaptureLib/Properties/Resources.ru.resx
View file

@ -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>

2
ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
View file

@ -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();