💾 Feat: Merge pull request #152 from orzMaster/main

[Pull Request] Device：设备属性
Crequency · Oct 2, 2022 · 3a6445d · 3a6445d
2 parents 4eb25df + 1c85456
commit 3a6445d
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 101 deletions.
diff --git a/KitX Dashboard/Languages/en-us.axaml b/KitX Dashboard/Languages/en-us.axaml
@@ -1,6 +1,5 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <!-- Add Resources Here -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+ <!-- Add Resources Here -->
  <x:String x:Key="Text_MainWindow_Title">KitX Dashboard</x:String>
 
 
@@ -27,40 +26,40 @@
  <x:String x:Key="Text_Log_Fatal">Fatal</x:String>
 
 
- <!--GreetingStart-->
+ <!-- GreetingStart -->
 
- <!--MorningStart-->
+ <!-- MorningStart -->
  <x:String x:Key="Text_Greeting_Morning_1">Good Morning! ο(=•ω＜=)ρ⌒☆</x:String>
  <x:String x:Key="Text_Greeting_Morning_2">Have a good mood every day! OvO</x:String>
  <x:String x:Key="Text_Greeting_Morning_3">Today's event, today's end!</x:String>
  <x:String x:Key="Text_Greeting_Morning_4">Nice day begins~</x:String>
- <!--MorningEnd-->
+ <!-- MorningEnd -->
 
- <!--NoonStart-->
+ <!-- NoonStart -->
  <x:String x:Key="Text_Greeting_Noon_1">Good noon! o(〃＾▽＾〃)o</x:String>
  <x:String x:Key="Text_Greeting_Noon_2">It's noon, take a break~</x:String>
  <x:String x:Key="Text_Greeting_Noon_3">Today is also a full morning</x:String>
- <!--NoonEnd-->
+ <!-- NoonEnd -->
 
- <!--AfterNoonStart-->
+ <!-- AfterNoonStart -->
  <x:String x:Key="Text_Greeting_AfterNoon_1">Good afternoon! ヾ(≧▽≦*)o</x:String>
  <x:String x:Key="Text_Greeting_AfterNoon_2">Afternoon tea time!</x:String>
  <x:String x:Key="Text_Greeting_AfterNoon_3">What tasks are left unfinished today?</x:String>
- <!--AfterNoonEnd-->
+ <!-- AfterNoonEnd -->
 
- <!--EveningStart-->
+ <!-- EveningStart -->
  <x:String x:Key="Text_Greeting_Evening_1">Good evening! o(*￣▽￣*)ブ</x:String>
  <x:String x:Key="Text_Greeting_Evening_2">I'm going to have a nice meal tonight!</x:String>
- <!--EveningEnd-->
+ <!-- EveningEnd -->
 
- <!--NightStart-->
+ <!-- NightStart -->
  <x:String x:Key="Text_Greeting_Night_1">It's quiet at night! o(*￣▽￣*)ブ</x:String>
  <x:String x:Key="Text_Greeting_Night_2">It's late at night, rest early~</x:String>
  <x:String x:Key="Text_Greeting_Night_3">Tomorrow will be a good day!</x:String>
- <!--NightEnd-->
+ <!-- NightEnd -->
+
+ <!-- GreetingEnd -->
 
- <!--GreetingEnd-->
-
  <x:String x:Key="Text_MainWindow_NavigationView_Home">Home</x:String>
  <x:String x:Key="Text_MainWindow_NavigationView_Lib">Library</x:String>
  <x:String x:Key="Text_MainWindow_NavigationView_Market">Market</x:String>
@@ -117,12 +116,14 @@
 
  <x:String x:Key="Text_Device_No">No other devices in network.</x:String>
  <x:String x:Key="Text_Device_This">This Device</x:String>
+ <x:String x:Key="Text_Device_Type_Slave">Slave</x:String>
+ <x:String x:Key="Text_Device_Type_Master">Master</x:String>
  <x:String x:Key="Text_Device_Resources_CPU">CPU</x:String>
  <x:String x:Key="Text_Device_Resources_RAM">RAM</x:String>
  <x:String x:Key="Text_Device_Resources_NET">NET</x:String>
  <x:String x:Key="Text_Device_Tip_Detected">Devices Detected.</x:String>
  <x:String x:Key="Text_Device_PluginsCount">Enabled Plugins Count:</x:String>
- 
+
 
  <x:String x:Key="Text_Settings_General">General</x:String>
  <x:String x:Key="Text_Settings_General_LocalPluginsFileDirectory">Local Plugins Program Files Path</x:String>
@@ -131,7 +132,7 @@
  <x:String x:Key="Text_Settings_General_ShowAnnouncement">Show Announcements When Start</x:String>
  <x:String x:Key="Text_Settings_General_ShowAnnouncementNow">Show Announcements Now</x:String>
 
- 
+
  <x:String x:Key="Text_Settings_Personalise">Personalise</x:String>
  <x:String x:Key="Text_Settings_Personalise_DisplayLanguage">Display Language</x:String>
  <x:String x:Key="Text_Settings_Personalise_MicaEffect">Mica Effect</x:String>

diff --git a/KitX Dashboard/Languages/ja-jp.axaml b/KitX Dashboard/Languages/ja-jp.axaml
@@ -1,6 +1,5 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <!-- Add Resources Here -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+ <!-- Add Resources Here -->
  <x:String x:Key="Text_MainWindow_Title">KitX ダッシュボード</x:String>
 
 
@@ -27,39 +26,39 @@
  <x:String x:Key="Text_Log_Fatal">崩壊</x:String>
 
 
- <!--GreetingStart-->
+ <!-- GreetingStart -->
 
- <!--MorningStart-->
+ <!-- MorningStart -->
  <x:String x:Key="Text_Greeting_Morning_1">おはよう! ο(=•ω＜=)ρ⌒☆</x:String>
  <x:String x:Key="Text_Greeting_Morning_2">毎日良い気分を OvO</x:String>
  <x:String x:Key="Text_Greeting_Morning_3">今日のイベント、今日の終わり!</x:String>
  <x:String x:Key="Text_Greeting_Morning_4">良い一日が始まります~</x:String>
- <!--MorningEnd-->
+ <!-- MorningEnd -->
 
- <!--NoonStart-->
+ <!-- NoonStart -->
  <x:String x:Key="Text_Greeting_Noon_1">こんにちは! o(〃＾▽＾〃)o</x:String>
  <x:String x:Key="Text_Greeting_Noon_2">正午です、休憩してください~</x:String>
  <x:String x:Key="Text_Greeting_Noon_3">今日もおはようございます</x:String>
- <!--NoonEnd-->
+ <!-- NoonEnd -->
 
- <!--AfterNoonStart-->
+ <!-- AfterNoonStart -->
  <x:String x:Key="Text_Greeting_AfterNoon_1">こんにちは! ヾ(≧▽≦*)o</x:String>
  <x:String x:Key="Text_Greeting_AfterNoon_2">アフタヌーンティータイム!</x:String>
  <x:String x:Key="Text_Greeting_AfterNoon_3">今日、どのようなタスクが未完了のままになっていますか？</x:String>
- <!--AfterNoonEnd-->
+ <!-- AfterNoonEnd -->
 
- <!--EveningStart-->
+ <!-- EveningStart -->
  <x:String x:Key="Text_Greeting_Evening_1">こんばんは! o(*￣▽￣*)ブ</x:String>
  <x:String x:Key="Text_Greeting_Evening_2">今夜は美味しい食事をします!</x:String>
- <!--EveningEnd-->
+ <!-- EveningEnd -->
 
- <!--NightStart-->
+ <!-- NightStart -->
  <x:String x:Key="Text_Greeting_Night_1">夜は静かです! o(*￣▽￣*)ブ</x:String>
  <x:String x:Key="Text_Greeting_Night_2">夜遅く、早く休む</x:String>
  <x:String x:Key="Text_Greeting_Night_3">明日はいい日になる!</x:String>
- <!--NightEnd-->
+ <!-- NightEnd -->
 
- <!--GreetingEnd-->
+ <!-- GreetingEnd -->
 
  <x:String x:Key="Text_MainWindow_NavigationView_Home">表紙</x:String>
  <x:String x:Key="Text_MainWindow_NavigationView_Lib">庫</x:String>
@@ -117,21 +116,23 @@
 
  <x:String x:Key="Text_Device_No">ネットワーク上に他のデバイスがない</x:String>
  <x:String x:Key="Text_Device_This">この装置</x:String>
+ <x:String x:Key="Text_Device_Type_Slave">Slave</x:String>
+ <x:String x:Key="Text_Device_Type_Master">Master</x:String>
  <x:String x:Key="Text_Device_Resources_CPU">CPU</x:String>
  <x:String x:Key="Text_Device_Resources_RAM">メモリー</x:String>
  <x:String x:Key="Text_Device_Resources_NET">通信網</x:String>
  <x:String x:Key="Text_Device_Tip_Detected">台のデバイスが検出されました</x:String>
  <x:String x:Key="Text_Device_PluginsCount">利用可能なプラグインの数:</x:String>
 
- 
+
  <x:String x:Key="Text_Settings_General">ユニバーサル</x:String>
  <x:String x:Key="Text_Settings_General_LocalPluginsFileDirectory">ローカル プラグイン ディレクトリ</x:String>
  <x:String x:Key="Text_Settings_General_LocalPluginsDataDirectory">ローカル プラグイン データ ディレクトリ</x:String>
  <x:String x:Key="Text_Settings_General_DeveloperSetting">開発者向けオプション</x:String>
  <x:String x:Key="Text_Settings_General_ShowAnnouncement">起動時にアナウンスを表示</x:String>
  <x:String x:Key="Text_Settings_General_ShowAnnouncementNow">最新のお知らせを見る</x:String>
- 
- 
+
+
  <x:String x:Key="Text_Settings_Personalise">パーソナライズ</x:String>
  <x:String x:Key="Text_Settings_Personalise_DisplayLanguage">表示言語</x:String>
  <x:String x:Key="Text_Settings_Personalise_MicaEffect">Mica 効果</x:String>
@@ -145,7 +146,7 @@
  <x:String x:Key="Text_Settings_Personalise_Theme_HighContrast">ハイコントラスト</x:String>
  <x:String x:Key="Text_Settings_Personalise_Theme_Follow">システムに従ってください</x:String>
 
- 
+
  <x:String x:Key="Text_Settings_Performence">パフォーマンス</x:String>
  <x:String x:Key="Text_Settings_Performence_Web_Port">ポート</x:String>
  <x:String x:Key="Text_Settings_Performence_Web_MyIP_Filter">ネイティブ IP フィルタリング ルール</x:String>

diff --git a/KitX Dashboard/Languages/zh-cn.axaml b/KitX Dashboard/Languages/zh-cn.axaml
@@ -1,6 +1,5 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <!-- Add Resources Here -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+ <!-- Add Resources Here -->
  <x:String x:Key="Text_MainWindow_Title">KitX 仪表盘</x:String>
 
 
@@ -17,8 +16,8 @@
  <x:String x:Key="Text_Public_ShowMainWindow">显示主窗口</x:String>
  <x:String x:Key="Text_Public_Second">秒</x:String>
  <x:String x:Key="Text_Public_Tip">提示</x:String>
- 
- 
+
+
  <x:String x:Key="Text_Log_Verbose">详细</x:String>
  <x:String x:Key="Text_Log_Debug">调试</x:String>
  <x:String x:Key="Text_Log_Information">信息</x:String>
@@ -27,40 +26,40 @@
  <x:String x:Key="Text_Log_Fatal">崩溃</x:String>
 
 
- <!--GreetingStart-->
- 
- <!--MorningStart-->
+ <!-- GreetingStart -->
+
+ <!-- MorningStart -->
  <x:String x:Key="Text_Greeting_Morning_1">上午好! ο(=•ω＜=)ρ⌒☆</x:String>
  <x:String x:Key="Text_Greeting_Morning_2">每天都要有好心情哟 OvO</x:String>
  <x:String x:Key="Text_Greeting_Morning_3">今日事, 今日毕!</x:String>
  <x:String x:Key="Text_Greeting_Morning_4">美好的一天开始啦~</x:String>
- <!--MorningEnd-->
- 
- <!--NoonStart-->
+ <!-- MorningEnd -->
+
+ <!-- NoonStart -->
  <x:String x:Key="Text_Greeting_Noon_1">中午好! o(〃＾▽＾〃)o</x:String>
  <x:String x:Key="Text_Greeting_Noon_2">中午啦, 小憩一会儿吧~</x:String>
  <x:String x:Key="Text_Greeting_Noon_3">今天也是一个充实的上午呢</x:String>
- <!--NoonEnd-->
- 
- <!--AfterNoonStart-->
+ <!-- NoonEnd -->
+
+ <!-- AfterNoonStart -->
  <x:String x:Key="Text_Greeting_AfterNoon_1">下午好! ヾ(≧▽≦*)o</x:String>
  <x:String x:Key="Text_Greeting_AfterNoon_2">下午茶时间!</x:String>
  <x:String x:Key="Text_Greeting_AfterNoon_3">今天的任务还有哪些没完成呢</x:String>
- <!--AfterNoonEnd-->
- 
- <!--EveningStart-->
+ <!-- AfterNoonEnd -->
+
+ <!-- EveningStart -->
  <x:String x:Key="Text_Greeting_Evening_1">晚上好! o(*￣▽￣*)ブ</x:String>
  <x:String x:Key="Text_Greeting_Evening_2">今晚我要美美饱餐一顿!</x:String>
- <!--EveningEnd-->
- 
- <!--NightStart-->
+ <!-- EveningEnd -->
+
+ <!-- NightStart -->
  <x:String x:Key="Text_Greeting_Night_1">夜深人静呐! o(*￣▽￣*)ブ</x:String>
  <x:String x:Key="Text_Greeting_Night_2">夜深了, 早点休息吧</x:String>
  <x:String x:Key="Text_Greeting_Night_3">明天也会是美好的一天!</x:String>
- <!--NightEnd-->
- 
- <!--GreetingEnd-->
- 
+ <!-- NightEnd -->
+
+ <!-- GreetingEnd -->
+
  <x:String x:Key="Text_MainWindow_NavigationView_Home">首页</x:String>
  <x:String x:Key="Text_MainWindow_NavigationView_Lib">库</x:String>
  <x:String x:Key="Text_MainWindow_NavigationView_Market">市场</x:String>
@@ -69,36 +68,36 @@
  <x:String x:Key="Text_MainWindow_NavigationView_Devices">设备管理</x:String>
  <x:String x:Key="Text_MainWindow_NavigationView_Account">账户</x:String>
  <x:String x:Key="Text_MainWindow_NavigationView_Settings">设置</x:String>
- 
+
  <x:String x:Key="Text_MainWindow_HomePage_Recent">最近使用</x:String>
  <x:String x:Key="Text_MainWindow_HomePage_Count">统计</x:String>
  <x:String x:Key="Text_MainWindow_HomePage_ActivityLog">活动日志</x:String>
- 
+
  <x:String x:Key="Text_MainWindow_Recent_No">没有最近使用记录呢~</x:String>
- 
- 
+
+
  <x:String x:Key="Text_MainWindow_Count_No">尚未做出统计</x:String>
- 
- 
+
+
  <x:String x:Key="Text_MainWindow_ActivityLog_No">活动日志是空滴!</x:String>
 
 
  <x:String x:Key="Text_Lib_Search">搜索</x:String>
  <x:String x:Key="Text_Lib_Search_In_Local">在本地搜索</x:String>
  <x:String x:Key="Text_Lib_Tip_NoPlugin">还没有插件连接呢~</x:String>
  <x:String x:Key="Text_Lib_Tip_Connected">个插件已连接</x:String>
- 
- 
+
+
  <x:String x:Key="Text_Repo_No_Plugin">仓库中没有插件呢~</x:String>
  <x:String x:Key="Text_Repo_Search_In_Network">在局域网中搜索</x:String>
  <x:String x:Key="Text_Repo_Tip_Installed">个插件已安装</x:String>
- 
- 
+
+
  <x:String x:Key="Text_PluginBar_Launch">启动</x:String>
  <x:String x:Key="Text_PluginBar_Details">详细信息</x:String>
  <x:String x:Key="Text_PluginBar_Remove">移除</x:String>
  <x:String x:Key="Text_PluginBar_RemoveAndDelete">移除并删除</x:String>
- 
+
  <x:String x:Key="Text_PluginBar_Name">内部名称:</x:String>
  <x:String x:Key="Text_PluginBar_Version">版本:</x:String>
  <x:String x:Key="Text_PluginBar_DisplayName">显示名称:</x:String>
@@ -117,21 +116,23 @@
 
  <x:String x:Key="Text_Device_No">网络中没有其它设备</x:String>
  <x:String x:Key="Text_Device_This">此设备</x:String>
+ <x:String x:Key="Text_Device_Type_Slave">从控</x:String>
+ <x:String x:Key="Text_Device_Type_Master">主控</x:String>
  <x:String x:Key="Text_Device_Resources_CPU">CPU</x:String>
  <x:String x:Key="Text_Device_Resources_RAM">内存</x:String>
  <x:String x:Key="Text_Device_Resources_NET">网络</x:String>
  <x:String x:Key="Text_Device_Tip_Detected">个设备已发现</x:String>
  <x:String x:Key="Text_Device_PluginsCount">在线插件数量:</x:String>
- 
- 
+
+
  <x:String x:Key="Text_Settings_General">通用</x:String>
  <x:String x:Key="Text_Settings_General_LocalPluginsFileDirectory">本地插件程序目录</x:String>
  <x:String x:Key="Text_Settings_General_LocalPluginsDataDirectory">本地插件数据目录</x:String>
  <x:String x:Key="Text_Settings_General_DeveloperSetting">开发者选项</x:String>
  <x:String x:Key="Text_Settings_General_ShowAnnouncement">启动时显示公告</x:String>
  <x:String x:Key="Text_Settings_General_ShowAnnouncementNow">查看最新公告</x:String>
 
- 
+
  <x:String x:Key="Text_Settings_Personalise">个性化</x:String>
  <x:String x:Key="Text_Settings_Personalise_DisplayLanguage">显示语言</x:String>
  <x:String x:Key="Text_Settings_Personalise_MicaEffect">云母效果</x:String>
@@ -145,7 +146,7 @@
  <x:String x:Key="Text_Settings_Personalise_Theme_HighContrast">高对比度</x:String>
  <x:String x:Key="Text_Settings_Personalise_Theme_Follow">跟随系统</x:String>
 
- 
+
  <x:String x:Key="Text_Settings_Performence">性能</x:String>
  <x:String x:Key="Text_Settings_Performence_Web_Port">端口</x:String>
  <x:String x:Key="Text_Settings_Performence_Web_MyIP_Filter">本机IP过滤规则</x:String>
@@ -155,8 +156,8 @@
  <x:String x:Key="Text_Settings_Performence_LogFileMaxCount">日志文件数量限制</x:String>
  <x:String x:Key="Text_Settings_Performence_LogFileFlushInterval">日志文件缓存延时</x:String>
  <x:String x:Key="Text_Settings_Performence_LogFileLevel">日志等级</x:String>
- 
- 
+
+
  <x:String x:Key="Text_Settings_Update">更新</x:String>
  <x:String x:Key="Text_Settings_Update_Check">检查更新</x:String>
  <x:String x:Key="Text_Settings_Update_ComponentName">组件名称</x:String>
@@ -171,8 +172,8 @@
  <x:String x:Key="Text_Settings_About_Authors">制作人员</x:String>
  <x:String x:Key="Text_Settings_About_Links">友情链接</x:String>
  <x:String x:Key="Text_Settings_About_ThirdPartLicense">第三方许可</x:String>
- 
- 
+
+
  <x:String x:Key="Text_AnouncementWindow_Receive">收到</x:String>
  <x:String x:Key="Text_AnouncementWindow_ReceiveAll">收到全部</x:String>