Merge branch 'master' into add-NotifyIcon

This commit is contained in:
NaBian committed 2019-03-12 23:32:41 +08:00
commit 9ae19c9f85
156 files changed
+2866 -734

No files matched your search

+24 -3
View File
@@ -387,9 +387,6 @@
<data name="Slider" xml:space="preserve">
<value>滑块</value>
</data>
<data name="CircleProgressBar" xml:space="preserve">
<value>圆形进度条</value>
</data>
<data name="IsNotPhone" xml:space="preserve">
<value>不是手机号码</value>
</data>
@@ -503,5 +500,29 @@
</data>
<data name="NotifyIcon" xml:space="preserve">
<value>托盘图标</value>
<data>
<data name="Badge" xml:space="preserve">
<value>标记</value>
</data>
<data name="Gravatar" xml:space="preserve">
<value>头像</value>
</data>
<data name="ComingSoon" xml:space="preserve">
<value>敬请期待</value>
</data>
<data name="Comment" xml:space="preserve">
<value>评论</value>
</data>
<data name="Reply" xml:space="preserve">
<value>回复</value>
</data>
<data name="Dialog" xml:space="preserve">
<value>对话框</value>
</data>
<data name="TextDialog" xml:space="preserve">
<value>文本对话框</value>
</data>
<data name="PleaseWait" xml:space="preserve">
<value>请稍后...</value>
</data>
</root>