CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-24 01:00:27 +12:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6674 from L1Q/develop

Browse source 
Improve translation support, update russian
This commit is contained in:
Jaex 2023-01-09 02:45:07 +03:00 committed by GitHub
parent b7834b8494 d5dd3d0411
commit b254bd2baf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 325 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.HistoryLib/HistoryItemManager_ContextMenu.cs
View file

@ -439,7 +439,7 @@ private void InitializeComponent()
tsmiPinToScreen.Name = "tsmiPinToScreen";
tsmiPinToScreen.ShortcutKeyDisplayString = "Ctrl+P";
tsmiPinToScreen.Size = new Size(127, 22);
tsmiPinToScreen.Text = "Pin to screen"; // TODO: Translate
tsmiPinToScreen.Text = Resources.PinToScreen;
tsmiPinToScreen.Click += tsmiPinToScreen_Click;
//
// tsmiShowMoreInfo

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

@ -492,6 +492,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Pin to screen.
/// </summary>
internal static string PinToScreen {
get {
return ResourceManager.GetString("PinToScreen", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Process names:.
/// </summary>

5
ShareX.HistoryLib/Properties/Resources.resx
View file

@ -265,4 +265,7 @@
<data name="HistoryStats" xml:space="preserve">
<value>History stats</value>
</data>
</root>
<data name="PinToScreen" xml:space="preserve">
<value>Pin to screen</value>
</data>
</root>

5
ShareX.HistoryLib/Properties/Resources.ru.resx
View file

@ -237,4 +237,7 @@
<data name="HistoryStats" xml:space="preserve">
<value>Статистика истории</value>
</data>
</root>
<data name="PinToScreen" xml:space="preserve">
<value>Закрепить на экране</value>
</data>
</root>

6
ShareX.MediaLib/Forms/ImageCombinerForm.ru.resx
View file

@ -159,4 +159,10 @@
<data name="cbAutoFillBackground.Text" xml:space="preserve">
<value>Заполнить фон автомитически</value>
</data>
<data name="lblWrapAfterImages.Text" xml:space="preserve">
<value>изображений</value>
</data>
<data name="lblWrapAfter.Text" xml:space="preserve">
<value>Переносить после:</value>
</data>
</root>

6
ShareX.UploadersLib/Controls/OAuthLoopbackControl.cs
View file

@ -79,8 +79,7 @@ private void UpdateStatus()
{
if (Connected)
{
// TODO: Translate
btnConnect.Text = "Disconnect";
btnConnect.Text = Resources.Disconnect;
if (UserInfo != null && !string.IsNullOrEmpty(UserInfo.name))
{
lblStatusValue.Text = string.Format(Resources.LoggedInAs0, UserInfo.name);
@ -93,8 +92,7 @@ private void UpdateStatus()
}
else
{
// TODO: Translate
btnConnect.Text = "Connect...";
btnConnect.Text = Resources.Connect;
lblStatusValue.Text = Resources.OAuthControl_Status_NotLoggedIn;
lblStatusValue.ForeColor = Color.FromArgb(220, 0, 0);
}

126
ShareX.UploadersLib/Controls/OAuthLoopbackControl.ru.resx Normal file
View file

@ -0,0 +1,126 @@
<?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="lblStatus.Text" xml:space="preserve">
<value>Состояние:</value>
</data>
<data name="btnConnect.Text" xml:space="preserve">
<value>Подключить...</value>
</data>
</root>

129
ShareX.UploadersLib/OAuth/OAuthListenerForm.ru.resx Normal file
View file

@ -0,0 +1,129 @@
<?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="label1.Text" xml:space="preserve">
<value>Ожидается завершение авторизации в вашем браузере...</value>
</data>
<data name="btnCancel.Text" xml:space="preserve">
<value>Отменить</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>ShareX - Авторизация</value>
</data>
</root>

18
ShareX.UploadersLib/Properties/Resources.Designer.cs generated
View file

@ -139,6 +139,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Connect....
/// </summary>
internal static string Connect {
get {
return ResourceManager.GetString("Connect", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to &quot;File form name&quot; must be configured..
/// </summary>
@ -166,6 +175,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Disconnect.
/// </summary>
internal static string Disconnect {
get {
return ResourceManager.GetString("Disconnect", resourceCulture);
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

6
ShareX.UploadersLib/Properties/Resources.resx
View file

@ -449,4 +449,10 @@ Created folders:</value>
<data name="OAuthCallbackPage" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\oauthcallbackpage.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="Disconnect" xml:space="preserve">
<value>Disconnect</value>
</data>
<data name="Connect" xml:space="preserve">
<value>Connect...</value>
</data>
</root>

6
ShareX.UploadersLib/Properties/Resources.ru.resx
View file

@ -280,4 +280,10 @@
<data name="URL" xml:space="preserve">
<value>Ссылка</value>
</data>
<data name="Disconnect" xml:space="preserve">
<value>Отключить</value>
</data>
<data name="Connect" xml:space="preserve">
<value>Подключить...</value>
</data>
</root>

6
ShareX.UploadersLib/ShareX.UploadersLib.csproj
View file

@ -526,6 +526,9 @@
<EmbeddedResource Include="Controls\OAuthLoopbackControl.resx">
<DependentUpon>OAuthLoopbackControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Controls\OAuthLoopbackControl.ru.resx">
<DependentUpon>OAuthLoopbackControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\CustomUploaderSettingsForm.de.resx">
<DependentUpon>CustomUploaderSettingsForm.cs</DependentUpon>
</EmbeddedResource>
@ -1114,6 +1117,9 @@
<EmbeddedResource Include="OAuth\OAuthListenerForm.resx">
<DependentUpon>OAuthListenerForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="OAuth\OAuthListenerForm.ru.resx">
<DependentUpon>OAuthListenerForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.de.resx">
<SubType>Designer</SubType>
</EmbeddedResource>

8
ShareX/Controls/TaskThumbnailPanel.ru.resx
View file

@ -120,4 +120,12 @@
<data name="lblError.Text" xml:space="preserve">
<value>Ошибка</value>
</data>
<data name="lblCombineHorizontal.Text" xml:space="preserve">
<value>Объединить изображения
(Горизонтально)</value>
</data>
<data name="lblCombineVertical.Text" xml:space="preserve">
<value>Объединить изображения
(Вертикально)</value>
</data>
</root>