Merge branch 'master' into pr/84
This commit is contained in:
commit
c757ebac53
166 files changed
+4558
-1259
No files matched your search
@@ -13,5 +13,5 @@ using System.Windows;
|
||||
[assembly: AssemblyCulture("")]
|
||||
[assembly: ComVisible(false)]
|
||||
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
|
||||
[assembly: AssemblyVersion("1.5.5")]
|
||||
[assembly: AssemblyVersion("2.0.0")]
|
||||
#endif
|
||||
@@ -609,4 +609,16 @@
|
||||
<data name="Project" xml:space="preserve">
|
||||
<value>Project</value>
|
||||
</data>
|
||||
<data name="RangeSlider" xml:space="preserve">
|
||||
<value>RangeSlider</value>
|
||||
</data>
|
||||
<data name="RelativePanel" xml:space="preserve">
|
||||
<value>RelativePanel</value>
|
||||
</data>
|
||||
<data name="On" xml:space="preserve">
|
||||
<value>On</value>
|
||||
</data>
|
||||
<data name="Off" xml:space="preserve">
|
||||
<value>Off</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -609,4 +609,16 @@
|
||||
<data name="Project" xml:space="preserve">
|
||||
<value>项目</value>
|
||||
</data>
|
||||
<data name="RangeSlider" xml:space="preserve">
|
||||
<value>范围滑块</value>
|
||||
</data>
|
||||
<data name="RelativePanel" xml:space="preserve">
|
||||
<value>相对布局</value>
|
||||
</data>
|
||||
<data name="On" xml:space="preserve">
|
||||
<value>开</value>
|
||||
</data>
|
||||
<data name="Off" xml:space="preserve">
|
||||
<value>关</value>
|
||||
</data>
|
||||
</root>
|
||||
Reference in new issue
Block a user