解决冲突

#	Resources/Strings.zh-CN.xaml
#	Window6.xaml
#	Window6.xaml.cs
This commit is contained in:
2026-05-09 10:57:16 +08:00
5 changed files with 159 additions and 44 deletions

View File

@@ -142,6 +142,39 @@
<!--手动界面-->
<system:String x:Key="Manual">手动界面</system:String>
<system:String x:Key="Manual1">手动速度(mm/min)</system:String>
<system:String x:Key="Manual2">离线</system:String>
<system:String x:Key="Manual3">设置</system:String>
<system:String x:Key="Manual4">潮气量系数</system:String>
<system:String x:Key="Manual5">呼气流量系数</system:String>
<system:String x:Key="Manual6">吸气流量系数</system:String>
<system:String x:Key="Manual7">压力系数</system:String>
<system:String x:Key="Manual8">实时监测参数</system:String>
<system:String x:Key="Manual9">位置</system:String>
<system:String x:Key="Manual10">压力</system:String>
<system:String x:Key="Manual11">呼气流量</system:String>
<system:String x:Key="Manual12">吸气流量</system:String>
<system:String x:Key="Manual13">呼上</system:String>
<system:String x:Key="Manual14">呼下</system:String>
<system:String x:Key="Manual15">吸上</system:String>
<system:String x:Key="Manual16">吸下</system:String>
<system:String x:Key="Manual17">手动吸</system:String>
<system:String x:Key="Manual171">手动呼</system:String>
<system:String x:Key="Manual18">复位</system:String>
<system:String x:Key="Manual19">控制操作</system:String>
<system:String x:Key="Manual191">测试界面</system:String>
<system:String x:Key="Manual20">校准操作</system:String>
<system:String x:Key="Manual21">呼气校准</system:String>
<system:String x:Key="Manual22">吸气校准</system:String>
<system:String x:Key="Manual23">压力校准</system:String>
<system:String x:Key="Manual24">基础参数设置</system:String>
<system:String x:Key="PositionToPressure">定位移测压力</system:String>
<system:String x:Key="PressureToDisplacement">定压力测位移</system:String>
<system:String x:Key="PeakTest">峰值测试</system:String>