Merge pull request #3073 from L1Q/master

Translation improvements and updates
This commit is contained in:
Jaex 2018-01-13 16:50:35 +03:00 committed by GitHub
commit f9ea56b120
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 693 additions and 20 deletions

View file

@ -1797,6 +1797,51 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Bicubic.
/// </summary>
internal static string ImageEditorInterpolationMode_Bicubic {
get {
return ResourceManager.GetString("ImageEditorInterpolationMode_Bicubic", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Bilinear.
/// </summary>
internal static string ImageEditorInterpolationMode_Bilinear {
get {
return ResourceManager.GetString("ImageEditorInterpolationMode_Bilinear", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to High quality bicubic.
/// </summary>
internal static string ImageEditorInterpolationMode_HighQualityBicubic {
get {
return ResourceManager.GetString("ImageEditorInterpolationMode_HighQualityBicubic", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to High quality bilinear.
/// </summary>
internal static string ImageEditorInterpolationMode_HighQualityBilinear {
get {
return ResourceManager.GetString("ImageEditorInterpolationMode_HighQualityBilinear", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Nearest neighbor.
/// </summary>
internal static string ImageEditorInterpolationMode_NearestNeighbor {
get {
return ResourceManager.GetString("ImageEditorInterpolationMode_NearestNeighbor", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Auto size.
/// </summary>

View file

@ -1124,4 +1124,19 @@ Would you like to download it?</value>
<data name="ImageEditorStartMode_AutoSize" xml:space="preserve">
<value>Auto size</value>
</data>
<data name="ImageEditorInterpolationMode_HighQualityBicubic" xml:space="preserve">
<value>High quality bicubic</value>
</data>
<data name="ImageEditorInterpolationMode_Bicubic" xml:space="preserve">
<value>Bicubic</value>
</data>
<data name="ImageEditorInterpolationMode_HighQualityBilinear" xml:space="preserve">
<value>High quality bilinear</value>
</data>
<data name="ImageEditorInterpolationMode_Bilinear" xml:space="preserve">
<value>Bilinear</value>
</data>
<data name="ImageEditorInterpolationMode_NearestNeighbor" xml:space="preserve">
<value>Nearest neighbor</value>
</data>
</root>

View file

@ -1120,4 +1120,22 @@
<data name="ImageEditorStartMode_Fullscreen" xml:space="preserve">
<value>Полноэкранный</value>
</data>
<data name="ImageEditorStartMode_AutoSize" xml:space="preserve">
<value>Авторазмер</value>
</data>
<data name="ImageEditorInterpolationMode_NearestNeighbor" xml:space="preserve">
<value>Ступенчатая</value>
</data>
<data name="ImageEditorInterpolationMode_Bicubic" xml:space="preserve">
<value>Бикубическая</value>
</data>
<data name="ImageEditorInterpolationMode_HighQualityBicubic" xml:space="preserve">
<value>Бикубическая (высококачественная)</value>
</data>
<data name="ImageEditorInterpolationMode_HighQualityBilinear" xml:space="preserve">
<value>Билинейная (высококачественная)</value>
</data>
<data name="ImageEditorInterpolationMode_Bilinear" xml:space="preserve">
<value>Билинейная</value>
</data>
</root>

View file

@ -265,7 +265,7 @@ public enum ImageEditorStartMode // Localized
Fullscreen
}
public enum ImageEditorInterpolationMode
public enum ImageEditorInterpolationMode // Localized
{
HighQualityBicubic,
Bicubic,

View file

@ -24,6 +24,7 @@
#endregion License Information (GPL v3)
using ShareX.HelpersLib;
using ShareX.ScreenCaptureLib.Properties;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -82,7 +83,7 @@ private void btnLoadImageFromClipboard_Click(object sender, EventArgs e)
}
else
{
MessageBox.Show("Clipboard does not contains an image.", "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
MessageBox.Show(Resources.EditorStartupForm_ClipboardDoesNotContainAnImage, "ShareX", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}

View file

@ -0,0 +1,135 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
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>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="$this.Text" xml:space="preserve">
<value>ShareX - Редактор изображений</value>
</data>
<data name="btnOpenImageFile.Text" xml:space="preserve">
<value>Открыть файл изображения...</value>
</data>
<data name="btnCreateNewImage.Text" xml:space="preserve">
<value>Создать новое изображение...</value>
</data>
<data name="btnLoadImageFromClipboard.Text" xml:space="preserve">
<value>Загрузить из буфера обмена</value>
</data>
<data name="btnCancel.Text" xml:space="preserve">
<value>Отменить</value>
</data>
</root>

View file

@ -61,7 +61,7 @@ public ImageSizeForm(Size size, ImageEditorInterpolationMode interpolationMode)
nudWidth.TextChanged += NudWidth_TextChanged;
nudHeight.TextChanged += NudHeight_TextChanged;
cbResampling.Items.AddRange(Helpers.GetEnumNamesProper<ImageEditorInterpolationMode>());
cbResampling.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<ImageEditorInterpolationMode>());
cbResampling.SelectedIndex = (int)InterpolationMode;
ignoreValueChanged = false;

View file

@ -141,4 +141,7 @@
<data name="lblHeightPixels.Text" xml:space="preserve">
<value>пикселей</value>
</data>
<data name="lblResampling.Text" xml:space="preserve">
<value>Масштабирование:</value>
</data>
</root>

View file

@ -0,0 +1,147 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
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>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="$this.Text" xml:space="preserve">
<value>ShareX - Новое изображение</value>
</data>
<data name="btnCancel.Text" xml:space="preserve">
<value>Отменить</value>
</data>
<data name="cbTransparent.Text" xml:space="preserve">
<value>Прозрачный</value>
</data>
<data name="gbBackgroundColor.Text" xml:space="preserve">
<value>Цвет фона</value>
</data>
<data name="btnChangeColor.Text" xml:space="preserve">
<value>Изменить цвет...</value>
</data>
<data name="lblHeightPixels.Text" xml:space="preserve">
<value>пикселей</value>
</data>
<data name="lblWidthPixels.Text" xml:space="preserve">
<value>пикселей</value>
</data>
<data name="lblHeight.Text" xml:space="preserve">
<value>Высота:</value>
</data>
<data name="lblWidth.Text" xml:space="preserve">
<value>Ширина:</value>
</data>
</root>

View file

@ -339,6 +339,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Clipboard does not contain an image..
/// </summary>
internal static string EditorStartupForm_ClipboardDoesNotContainAnImage {
get {
return ResourceManager.GetString("EditorStartupForm_ClipboardDoesNotContainAnImage", resourceCulture);
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -1511,6 +1520,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Auto close editor on task.
/// </summary>
internal static string ShapeManager_CreateToolbar_AutoCloseEditorOnTask {
get {
return ResourceManager.GetString("ShapeManager_CreateToolbar_AutoCloseEditorOnTask", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Auto crop image....
/// </summary>
@ -1583,6 +1601,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Crop image....
/// </summary>
internal static string ShapeManager_CreateToolbar_CropImage {
get {
return ResourceManager.GetString("ShapeManager_CreateToolbar_CropImage", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Delete.
/// </summary>
@ -1655,6 +1682,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Font size:.
/// </summary>
internal static string ShapeManager_CreateToolbar_FontSize {
get {
return ResourceManager.GetString("ShapeManager_CreateToolbar_FontSize", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Image.
/// </summary>
@ -1673,6 +1709,33 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Insert image file....
/// </summary>
internal static string ShapeManager_CreateToolbar_InsertImageFile {
get {
return ResourceManager.GetString("ShapeManager_CreateToolbar_InsertImageFile", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Insert image from screen....
/// </summary>
internal static string ShapeManager_CreateToolbar_InsertImageFromScreen {
get {
return ResourceManager.GetString("ShapeManager_CreateToolbar_InsertImageFromScreen", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Interpolation mode.
/// </summary>
internal static string ShapeManager_CreateToolbar_InterpolationMode {
get {
return ResourceManager.GetString("ShapeManager_CreateToolbar_InterpolationMode", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Capture last region.
/// </summary>
@ -1682,6 +1745,24 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to New image....
/// </summary>
internal static string ShapeManager_CreateToolbar_NewImage {
get {
return ResourceManager.GetString("ShapeManager_CreateToolbar_NewImage", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Open image file....
/// </summary>
internal static string ShapeManager_CreateToolbar_OpenImageFile {
get {
return ResourceManager.GetString("ShapeManager_CreateToolbar_OpenImageFile", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Paste image/text.
/// </summary>
@ -1799,6 +1880,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Use letters.
/// </summary>
internal static string ShapeManager_CreateToolbar_UseLetters {
get {
return ResourceManager.GetString("ShapeManager_CreateToolbar_UseLetters", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Cursor type:.
/// </summary>

View file

@ -699,4 +699,34 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<data name="image_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="EditorStartupForm_ClipboardDoesNotContainAnImage" xml:space="preserve">
<value>Clipboard does not contain an image.</value>
</data>
<data name="ShapeManager_CreateToolbar_NewImage" xml:space="preserve">
<value>New image...</value>
</data>
<data name="ShapeManager_CreateToolbar_OpenImageFile" xml:space="preserve">
<value>Open image file...</value>
</data>
<data name="ShapeManager_CreateToolbar_InsertImageFile" xml:space="preserve">
<value>Insert image file...</value>
</data>
<data name="ShapeManager_CreateToolbar_InsertImageFromScreen" xml:space="preserve">
<value>Insert image from screen...</value>
</data>
<data name="ShapeManager_CreateToolbar_CropImage" xml:space="preserve">
<value>Crop image...</value>
</data>
<data name="ShapeManager_CreateToolbar_AutoCloseEditorOnTask" xml:space="preserve">
<value>Auto close editor on task</value>
</data>
<data name="ShapeManager_CreateToolbar_FontSize" xml:space="preserve">
<value>Font size:</value>
</data>
<data name="ShapeManager_CreateToolbar_UseLetters" xml:space="preserve">
<value>Use letters</value>
</data>
<data name="ShapeManager_CreateToolbar_InterpolationMode" xml:space="preserve">
<value>Interpolation mode</value>
</data>
</root>

View file

@ -482,4 +482,40 @@
<data name="RegionCaptureForm_TipYouCanPanImageByHoldingMouseMiddleButtonAndDragging" xml:space="preserve">
<value>Заметка: Изображение можно перемещать, удерживая среднюю кнопку мыши.</value>
</data>
<data name="EditorStartupForm_ClipboardDoesNotContainAnImage" xml:space="preserve">
<value>Буфер обмена не содержит изображений.</value>
</data>
<data name="ShapeManager_CreateToolbar_PasteImageText" xml:space="preserve">
<value>Вставить картинку/текст</value>
</data>
<data name="ShapeManager_CreateToolbar_AutoCropImage" xml:space="preserve">
<value>Автокадрирование...</value>
</data>
<data name="ShapeManager_CreateToolbar_NewImage" xml:space="preserve">
<value>Новое изображение...</value>
</data>
<data name="ShapeManager_CreateToolbar_OpenImageFile" xml:space="preserve">
<value>Открыть файл изображения...</value>
</data>
<data name="ShapeManager_CreateToolbar_InsertImageFile" xml:space="preserve">
<value>Вставить файл изображения...</value>
</data>
<data name="ShapeManager_CreateToolbar_InsertImageFromScreen" xml:space="preserve">
<value>Вставить картинку с экрана...</value>
</data>
<data name="ShapeManager_CreateToolbar_CropImage" xml:space="preserve">
<value>Кадрировать...</value>
</data>
<data name="ShapeManager_CreateToolbar_AutoCloseEditorOnTask" xml:space="preserve">
<value>Закрывать редактор по задаче</value>
</data>
<data name="ShapeManager_CreateToolbar_FontSize" xml:space="preserve">
<value>Размер шрифта:</value>
</data>
<data name="ShapeManager_CreateToolbar_UseLetters" xml:space="preserve">
<value>Использовать буквы</value>
</data>
<data name="ShapeManager_CreateToolbar_InterpolationMode" xml:space="preserve">
<value>Режим интерполяции</value>
</data>
</root>

View file

@ -475,7 +475,7 @@ internal void CreateToolbar()
};
tsddbShapeOptions.DropDownItems.Add(tslnudCornerRadius);
tscbImageInterpolationMode = new ToolStripLabeledComboBox("Interpolation mode");
tscbImageInterpolationMode = new ToolStripLabeledComboBox(Resources.ShapeManager_CreateToolbar_InterpolationMode);
tscbImageInterpolationMode.Content.AddRange(Helpers.GetLocalizedEnumDescriptions<ImageEditorInterpolationMode>());
tscbImageInterpolationMode.Content.SelectedIndexChanged += (sender, e) =>
{
@ -535,7 +535,7 @@ internal void CreateToolbar()
};
tsddbShapeOptions.DropDownItems.Add(tsmiArrowHeadsBothSide);
tslnudStepFontSize = new ToolStripLabeledNumericUpDown("Font size:");
tslnudStepFontSize = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateToolbar_FontSize);
tslnudStepFontSize.Content.Minimum = 10;
tslnudStepFontSize.Content.Maximum = 100;
tslnudStepFontSize.Content.ValueChanged = (sender, e) =>
@ -545,7 +545,7 @@ internal void CreateToolbar()
};
tsddbShapeOptions.DropDownItems.Add(tslnudStepFontSize);
tsmiStepUseLetters = new ToolStripMenuItem("Use letters");
tsmiStepUseLetters = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_UseLetters);
tsmiStepUseLetters.Checked = false;
tsmiStepUseLetters.CheckOnClick = true;
tsmiStepUseLetters.Click += (sender, e) =>
@ -640,22 +640,22 @@ internal void CreateToolbar()
tsddbImage.Image = Resources.image__pencil;
tsMain.Items.Add(tsddbImage);
ToolStripMenuItem tsmiNewImage = new ToolStripMenuItem("New image...");
ToolStripMenuItem tsmiNewImage = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_NewImage);
tsmiNewImage.Image = Resources.image_empty;
tsmiNewImage.Click += (sender, e) => NewImage();
tsddbImage.DropDownItems.Add(tsmiNewImage);
ToolStripMenuItem tsmiOpenImage = new ToolStripMenuItem("Open image file...");
ToolStripMenuItem tsmiOpenImage = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_OpenImageFile);
tsmiOpenImage.Image = Resources.folder_open_image;
tsmiOpenImage.Click += (sender, e) => OpenImageFile();
tsddbImage.DropDownItems.Add(tsmiOpenImage);
ToolStripMenuItem tsmiInsertImageFile = new ToolStripMenuItem("Insert image file...");
ToolStripMenuItem tsmiInsertImageFile = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_InsertImageFile);
tsmiInsertImageFile.Image = Resources.image__plus;
tsmiInsertImageFile.Click += (sender, e) => InsertImageFile();
tsddbImage.DropDownItems.Add(tsmiInsertImageFile);
ToolStripMenuItem tsmiInsertImageFromScreen = new ToolStripMenuItem("Insert image from screen...");
ToolStripMenuItem tsmiInsertImageFromScreen = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_InsertImageFromScreen);
tsmiInsertImageFromScreen.Image = Resources.camera;
tsmiInsertImageFromScreen.Click += (sender, e) => InsertImageFromScreen();
tsddbImage.DropDownItems.Add(tsmiInsertImageFromScreen);
@ -672,7 +672,7 @@ internal void CreateToolbar()
tsmiCanvasSize.Click += (sender, e) => ChangeCanvasSize();
tsddbImage.DropDownItems.Add(tsmiCanvasSize);
ToolStripMenuItem tsmiCropImage = new ToolStripMenuItem("Crop image...");
ToolStripMenuItem tsmiCropImage = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_CropImage);
tsmiCropImage.Image = Resources.image_crop;
tsmiCropImage.Click += (sender, e) => AddCropTool();
tsddbImage.DropDownItems.Add(tsmiCropImage);
@ -795,7 +795,7 @@ internal void CreateToolbar()
(sender, e) => Options.ImageEditorStartMode = (ImageEditorStartMode)tscbImageEditorStartMode.Content.SelectedIndex;
tsddbOptions.DropDownItems.Add(tscbImageEditorStartMode);
ToolStripMenuItem tsmiAutoCloseEditorOnTask = new ToolStripMenuItem("Auto close editor on task");
ToolStripMenuItem tsmiAutoCloseEditorOnTask = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_AutoCloseEditorOnTask);
tsmiAutoCloseEditorOnTask.Checked = Options.AutoCloseEditorOnTask;
tsmiAutoCloseEditorOnTask.CheckOnClick = true;
tsmiAutoCloseEditorOnTask.Click += (sender, e) => Options.AutoCloseEditorOnTask = tsmiAutoCloseEditorOnTask.Checked;

View file

@ -305,6 +305,9 @@
<EmbeddedResource Include="Forms\EditorStartupForm.resx">
<DependentUpon>EditorStartupForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\EditorStartupForm.ru.resx">
<DependentUpon>EditorStartupForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\FFmpegOptionsForm.it-IT.resx">
<DependentUpon>FFmpegOptionsForm.cs</DependentUpon>
</EmbeddedResource>
@ -320,6 +323,9 @@
<EmbeddedResource Include="Forms\ImageSizeForm.ru.resx">
<DependentUpon>ImageSizeForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\NewImageForm.ru.resx">
<DependentUpon>NewImageForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\ScrollingCaptureForm.de.resx">
<DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
</EmbeddedResource>

View file

@ -86,13 +86,13 @@ private void InitializeComponent()
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.llAttribution);
this.Controls.Add(this.lblResult);
this.Controls.Add(this.txtResult);
this.Controls.Add(this.lblLanguage);
this.Controls.Add(this.cbLanguages);
this.Controls.Add(this.pbProgress);
this.Controls.Add(this.btnStartOCR);
this.Controls.Add(this.llAttribution);
this.Name = "OCRSpaceForm";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.Shown += new System.EventHandler(this.OCRSpaceResultForm_Shown);

View file

@ -138,7 +138,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;cbLanguages.ZOrder" xml:space="preserve">
<value>4</value>
<value>3</value>
</data>
<data name="lblLanguage.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -165,7 +165,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lblLanguage.ZOrder" xml:space="preserve">
<value>3</value>
<value>2</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="txtResult.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@ -196,7 +196,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;txtResult.ZOrder" xml:space="preserve">
<value>2</value>
<value>1</value>
</data>
<data name="lblResult.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -223,7 +223,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lblResult.ZOrder" xml:space="preserve">
<value>1</value>
<value>0</value>
</data>
<data name="llAttribution.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
@ -253,7 +253,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;llAttribution.ZOrder" xml:space="preserve">
<value>0</value>
<value>6</value>
</data>
<data name="btnStartOCR.Location" type="System.Drawing.Point, System.Drawing">
<value>168, 22</value>
@ -277,7 +277,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnStartOCR.ZOrder" xml:space="preserve">
<value>6</value>
<value>5</value>
</data>
<data name="pbProgress.Location" type="System.Drawing.Point, System.Drawing">
<value>168, 22</value>
@ -301,7 +301,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pbProgress.ZOrder" xml:space="preserve">
<value>5</value>
<value>4</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>

View file

@ -0,0 +1,135 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
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>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="$this.Text" xml:space="preserve">
<value>ShareX - Оптическое распознавание символов</value>
</data>
<data name="lblLanguage.Text" xml:space="preserve">
<value>Язык:</value>
</data>
<data name="lblResult.Text" xml:space="preserve">
<value>Результат:</value>
</data>
<data name="llAttribution.Text" xml:space="preserve">
<value>Работает через API OCR.Space</value>
</data>
<data name="btnStartOCR.Text" xml:space="preserve">
<value>Начать распознавание</value>
</data>
</root>

View file

@ -1193,4 +1193,7 @@ store.book[0].title</value>
<data name="btnLithiioFetchAPIKey.Text" xml:space="preserve">
<value>Получить ключ API...</value>
</data>
<data name="gbAmazonS3Advanced.Text" xml:space="preserve">
<value>Дополнительно</value>
</data>
</root>

View file

@ -603,6 +603,9 @@
<EmbeddedResource Include="Forms\OCRSpaceForm.resx">
<DependentUpon>OCRSpaceForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\OCRSpaceForm.ru.resx">
<DependentUpon>OCRSpaceForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\PuushLoginForm.resx">
<DependentUpon>PuushLoginForm.cs</DependentUpon>
</EmbeddedResource>

View file

@ -717,4 +717,10 @@
<data name="tsmiImagePreviewBottom.Text" xml:space="preserve">
<value>Внизу</value>
</data>
<data name="tsmiShowCursor.Text" xml:space="preserve">
<value>Показывать курсор</value>
</data>
<data name="tsmiTrayShowCursor.Text" xml:space="preserve">
<value>Показывать курсор</value>
</data>
</root>