Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	OpenStoreUpgrade.dnn
  • Loading branch information
leedavi committed Mar 18, 2022
2 parents 05a6248 + 3165e76 commit 4af26cc
Show file tree
Hide file tree
Showing 36 changed files with 7,208 additions and 115 deletions.
171 changes: 171 additions & 0 deletions App_LocalResources/AddressAdminSettings.ascx.uk-UA.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
<?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="ControlTitle_settings.Text" xml:space="preserve">
<value>Параметри адміністратора адреси</value>
</data>
<data name="lblbasicsettings.Text" xml:space="preserve">
<value>Загальне</value>
</data>
<data name="lbllistbody.Help" xml:space="preserve">
<value>Шаблон, який буде використовуватися як тіло адреси, повторюється для кожної адреси.</value>
</data>
<data name="lbllistbody.Text" xml:space="preserve">
<value>Тіло адреси : </value>
</data>
<data name="lbllistfooter.Help" xml:space="preserve">
<value>Шаблон, який буде використовуватися як нижній колонтитул адреси.</value>
</data>
<data name="lbllistfooter.Text" xml:space="preserve">
<value>Нижній колонтитул адреси : </value>
</data>
<data name="lbllistheader.Help" xml:space="preserve">
<value>Шаблон, який буде використовуватися як заголовок адреси.</value>
</data>
<data name="lbllistheader.Text" xml:space="preserve">
<value>Заголовок адреси : </value>
</data>
<data name="lbltheme.Help" xml:space="preserve">
<value>Ім'я теми, яка використовуватиметься для цього списку адрес.</value>
</data>
<data name="lbltheme.Text" xml:space="preserve">
<value>Тема : </value>
</data>
<data name="lblinputform.Help" xml:space="preserve">
<value>Шаблон, який буде використовуватися як форма введення даних для адреси.</value>
</data>
<data name="lblinputform.Text" xml:space="preserve">
<value>Шаблон форми вводу : </value>
</data>
<data name="emailmanageropt.data" xml:space="preserve">
<value>Лише для змінення адреси за промовчанням;на всіх змінах адреси</value>
</data>
<data name="lblemailmanager.Help" xml:space="preserve">
<value>Диспетчер електронної пошти щодо зміни адреси</value>
</data>
<data name="lblemailmanager.Text" xml:space="preserve">
<value>Диспетчер електронної пошти : </value>
</data>
<data name="lblemailtemplate.Help" xml:space="preserve">
<value>Повідомлення електронної пошти, яке буде надіслано після оновлення адреси.</value>
</data>
<data name="lblemailtemplate.Text" xml:space="preserve">
<value>Шаблон електронної пошти : </value>
</data>
</root>
Loading

0 comments on commit 4af26cc

Please sign in to comment.