Merge branch 'master' into refactor-intermediate-models

This commit is contained in:
BuildFeed Bot 2018-04-28 17:40:23 +01:00
commit abe102b5ed
No known key found for this signature in database
GPG Key ID: 3757685ADD91E0A1
2 changed files with 14 additions and 2 deletions

View File

@ -159,6 +159,9 @@
<data name="Common_Admin" xml:space="preserve">
<value>管理員</value>
</data>
<data name="Common_Blog" xml:space="preserve">
<value>博客</value>
</data>
<data name="Common_ChangePassword" xml:space="preserve">
<value>變更密碼</value>
</data>
@ -201,6 +204,9 @@
<data name="Common_ThemeLight" xml:space="preserve">
<value>淺色</value>
</data>
<data name="Common_ThemeWinter" xml:space="preserve">
<value>冬季</value>
</data>
<data name="Common_TitlePage" xml:space="preserve">
<value>|第 {0} 頁</value>
</data>
@ -236,6 +242,9 @@
<data name="Front_Comments" xml:space="preserve">
<value>留言</value>
</data>
<data name="Front_CurrentAnalog" xml:space="preserve">
<value>目前 HoloLens 版本</value>
</data>
<data name="Front_CurrentCanary" xml:space="preserve">
<value>目前內部開發版本</value>
</data>
@ -522,4 +531,4 @@
<data name="Support_ThanksRegister" xml:space="preserve">
<value>感謝您的註冊</value>
</data>
</root>
</root>

View File

@ -242,6 +242,9 @@
<data name="Front_Comments" xml:space="preserve">
<value>评论</value>
</data>
<data name="Front_CurrentAnalog" xml:space="preserve">
<value>当前 HoloLens 版本</value>
</data>
<data name="Front_CurrentCanary" xml:space="preserve">
<value>当前内部版本</value>
</data>
@ -528,4 +531,4 @@
<value>周</value>
</data>
</root>
</root>