Merge branch 'dev'

Resources/Strings.en-US.xaml

@@ -26,7 +26,7 @@
     <system:String x:Key="Deformation4">settings</system:String>
     <system:String x:Key="Deformation5">Real-time traffic</system:String>
     <system:String x:Key="Deformation6">Record air resistance</system:String>
-    <system:String x:Key="Report">报表</system:String>
+    <system:String x:Key="Report">Report</system:String>
 
     <system:String x:Key="Deformation test results">Test stopped</system:String>
 
@@ -122,7 +122,30 @@
     <system:String x:Key="test27">Manual interface</system:String>
     <system:String x:Key="test28">Recorded scene</system:String>
     <system:String x:Key="test29">Process Record</system:String>
+    <!--报表1-->
+    <system:String x:Key="FlowReport">Traffic Pressure Report</system:String>
+    <system:String x:Key="FlowReport1">Exhaust flow rate (L/min)</system:String>
+    <system:String x:Key="FlowReport2">Delete</system:String>
 
+    <!--报表2-->
+    <system:String x:Key="TestReport">Air resistance test report</system:String>
+    <system:String x:Key="TestReport1">Air resistance(hpa)</system:String>
+    <system:String x:Key="TestReport2">Traffic(L/min)</system:String>
+
+    <!--报表3-->
+    <system:String x:Key="FxReport">Asphyxiation Prevention Test Report</system:String>
+    <system:String x:Key="FxReport1">Valve opening pressure(pa)</system:String>
+    <system:String x:Key="FxReport2">Closing valve pressure(pa)</system:String>
+
+
+    <!--报表4-->
+    <system:String x:Key="FxNReport">Single Fault Air Resistance Test Report</system:String>
+    <system:String x:Key="FxNReport1">Exhalation resistance(pa)</system:String>
+    <system:String x:Key="FxNReport2">Exhalation resistance(pa)</system:String>
+    <!--报表5-->
+    <system:String x:Key="FiveReport">Initial CO2 concentration (% )</system:String>
+    <system:String x:Key="FiveReport1">Final CO2 concentration (% )</system:String>
+    <system:String x:Key="FiveReport2">Relative increase in CO2 concentration (%)</system:String>
     <system:String x:Key="testReport">CO2 Rebreathing Test Report</system:String>
     <system:String x:Key="testReport1">Start time</system:String>
     <system:String x:Key="testReport111">Termination time</system:String>
@@ -170,7 +193,13 @@
     <system:String x:Key="Manual22">Inhalation calibration</system:String>
     <system:String x:Key="Manual23">Pressure calibration</system:String>
     <system:String x:Key="Manual24">Basic parameter settings</system:String>
+    <!--流量时时监控-->
 
+    <system:String x:Key="WatchData">Real-time traffic monitoring system</system:String>
+    <system:String x:Key="WatchData1">Real-time traffic monitoring line graph</system:String>
+    <system:String x:Key="WatchData2">Start monitoring</system:String>
+    <system:String x:Key="WatchData3">Stop monitoring</system:String>
+    <system:String x:Key="WatchData4">Clear data</system:String>
 
 
     <system:String x:Key="Workstation curve description">Workstation curve description:</system:String>

Resources/Strings.zh-CN.xaml

@@ -122,6 +122,30 @@
     <system:String x:Key="test27">手动界面</system:String>
     <system:String x:Key="test28">记录画面</system:String>
     <system:String x:Key="test29">过程记录</system:String>
+    <!--报表1-->
+    <system:String x:Key="FlowReport">流量压力报表</system:String>
+    <system:String x:Key="FlowReport1">排气流流量L/min</system:String>
+    <system:String x:Key="FlowReport2">删除</system:String>
+
+    <!--报表2-->
+    <system:String x:Key="TestReport">气阻测试报表</system:String>
+    <system:String x:Key="TestReport1">气阻hpa</system:String>
+    <system:String x:Key="TestReport2">流量L/min</system:String>
+
+    <!--报表3-->
+    <system:String x:Key="FxReport">防窒息测试报表</system:String>
+    <system:String x:Key="FxReport1">开阀压力pa</system:String>
+    <system:String x:Key="FxReport2">关阀压力pa</system:String>
+
+
+    <!--报表4-->
+    <system:String x:Key="FxNReport">单一故障气阻测试报表</system:String>
+    <system:String x:Key="FxNReport1">呼气阻力pa</system:String>
+    <system:String x:Key="FxNReport2">吸气阻力pa</system:String>
+    <!--报表5-->
+    <system:String x:Key="FiveReport">开始CO2浓度（%）</system:String>
+    <system:String x:Key="FiveReport1">终CO2浓度（%）</system:String>
+    <system:String x:Key="FiveReport2">CO2浓度相对增加（%）</system:String>
 
     <system:String x:Key="testReport">CO2重复呼吸测试报表</system:String>
     <system:String x:Key="testReport1">起始时间</system:String>
@@ -170,9 +194,13 @@
     <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="WatchData">实时流量监测系统</system:String>
+    <system:String x:Key="WatchData1">流量实时监测折线图</system:String>
+    <system:String x:Key="WatchData2">开始监测</system:String>
+    <system:String x:Key="WatchData3">停止监测</system:String>
+    <system:String x:Key="WatchData4">清空数据</system:String>
 
 
     <system:String x:Key="PositionToPressure">定位移测压力</system:String>