Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ghost1372 committed Apr 24, 2020
2 parents 106c6a0 + 1268938 commit 74d17f0
Show file tree
Hide file tree
Showing 12 changed files with 1,055 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Flag\ru.png">
<Link>Resources\Img\Flag\ru.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Flag\tr.png">
<Link>Resources\Img\Flag\tr.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon-white.ico">
<Link>Resources\Img\icon-white.ico</Link>
</Resource>
Expand Down Expand Up @@ -500,6 +503,9 @@
</Resource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.tr.resx">
<Link>Properties\Langs\Lang.tr.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.en.resx">
<Link>Properties\Langs\Lang.en.resx</Link>
</EmbeddedResource>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.tr.resx">
<Link>Properties\Langs\Lang.tr.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.en.resx">
<Link>Properties\Langs\Lang.en.resx</Link>
</EmbeddedResource>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,9 @@
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Flag\ru.png">
<Link>Resources\Img\Flag\ru.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Flag\tr.png">
<Link>Resources\Img\Flag\tr.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon-white.ico">
<Link>Resources\Img\icon-white.ico</Link>
Expand Down Expand Up @@ -421,6 +424,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.tr.resx">
<Link>Properties\Langs\Lang.tr.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.en.resx">
<Link>Properties\Langs\Lang.en.resx</Link>
</EmbeddedResource>
Expand Down
3 changes: 3 additions & 0 deletions src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.tr.resx">
<Link>Properties\Langs\Lang.tr.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.en.resx">
<Link>Properties\Langs\Lang.en.resx</Link>
</EmbeddedResource>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Flag\ru.png">
<Link>Resources\Img\Flag\ru.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\Flag\tr.png">
<Link>Resources\Img\Flag\tr.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon-white.ico">
<Link>Resources\Img\icon-white.ico</Link>
Expand Down Expand Up @@ -489,6 +492,9 @@
</Resource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.tr.resx">
<Link>Properties\Langs\Lang.tr.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.en.resx">
<Link>Properties\Langs\Lang.en.resx</Link>
</EmbeddedResource>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.tr.resx">
<Link>Properties\Langs\Lang.tr.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.en.resx">
<Link>Properties\Langs\Lang.en.resx</Link>
</EmbeddedResource>
Expand Down
12 changes: 6 additions & 6 deletions src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@
<value>SplitButton</value>
</data>
<data name="Tools" xml:space="preserve">
<value>Tools</value>
<value>ابزار</value>
</data>
<data name="HatchBrushGenerator" xml:space="preserve">
<value>HatchBrushGenerator</value>
Expand Down Expand Up @@ -694,19 +694,19 @@
<value>Effects</value>
</data>
<data name="Website" xml:space="preserve">
<value>Website</value>
<value>سایت</value>
</data>
<data name="Vsix" xml:space="preserve">
<value>Vsix</value>
</data>
<data name="Doc_en" xml:space="preserve">
<value>English document</value>
<value>مستندات انگلیسی</value>
</data>
<data name="Doc_cn" xml:space="preserve">
<value>Chinese document</value>
<value>مستندات چینی</value>
</data>
<data name="Demo" xml:space="preserve">
<value>Demo</value>
<value>دمو</value>
</data>
<data name="PinBox" xml:space="preserve">
<value>PinBox</value>
Expand Down Expand Up @@ -736,7 +736,7 @@
<value>Frame</value>
</data>
<data name="PracticalDemos" xml:space="preserve">
<value>Practical demos</value>
<value>دموی عملی</value>
</data>
<data name="StartScreenshot" xml:space="preserve">
<value>Start screenshot</value>
Expand Down
Loading

0 comments on commit 74d17f0

Please sign in to comment.