diff --git a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_zh_CN.ts b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_zh_CN.ts
index 1ad14fc16..202624eb1 100644
--- a/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_zh_CN.ts
+++ b/ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_zh_CN.ts
@@ -5404,27 +5404,27 @@ The same value is used for all axes.
Changes on this page only take effect after board reset or power cycle
- 所有配置信息将在控制板重启后才生效
+ 所有配置信息将在控制板重启才生效Telemetry speed:
-
+ 管理端口速率:GPS speed:
-
+ 串口GPS波特率:ComUsbBridge speed:
-
+ USB转串口端口波特率:Select the speed here.
-
+ 选择速率。
@@ -5445,7 +5445,7 @@ The same value is used for all axes.
USB VCP Port
-
+
@@ -5933,7 +5933,7 @@ p, li { white-space: pre-wrap; }
Roll/Pitch/Yaw stick deadband
- 横滚/俯仰/方向 操纵杆死区
+ 横滚/俯仰/方向 操纵杆死区
@@ -5943,12 +5943,12 @@ p, li { white-space: pre-wrap; }
Back
-
+ 上一项Next
-
+ 下一项
@@ -6034,10 +6034,10 @@ In that case you have to configure your radio mixers so the whole range
from min to max is split into N equal intervals, and you may set arbitrary
channel value for each flight mode.
最后一句待定
- 遥控器上所有飞行模式切换开关总数。
+ 遥控器上所有飞行模式切换开关总数。
默认是3个。
对于大多数设置只需要2~3种飞行模式。
-你也可以设置6个,这样的话你可能需要将遥控器上调节旋钮的全程分成N等分。
+你也可以设置6个,这样的话你可能需要将遥控器上调节旋钮的全程分成若干等分,并为每个区间指定对应的数字范围。
@@ -6159,7 +6159,7 @@ Applies and Saves all settings to SD
Settings Bank
- 设置槽
+ 设置槽
@@ -6179,7 +6179,7 @@ Applies and Saves all settings to SD
<html><head/><body><p>Select which set of roll rates / max bank angles / PIDs you want active on this switch position.</p></body></html>
-
+ <html><head/><body><p>为每个飞行模式档位选择一组姿态稳定设置。.</p></body></html>
@@ -8263,12 +8263,12 @@ only when system is armed without disabling the module.
Form
- 界面
+ 界面Save to file
-
+ 保存到文件
@@ -8495,22 +8495,22 @@ only when system is armed without disabling the module.
Dialog
- 对话框
+ 对话框Latitude:
-
+ 纬度:Longitude:
-
+ 经度:Altitude:
-
+ 海拔:
@@ -8715,32 +8715,32 @@ only when system is armed without disabling the module.
Dialog
- 对话框
+ 对话框Save
- 保存
+ 保存Close
- 关闭
+ 关闭Connection Diagram
-
+ 连接示意图Save File
-
+ 保存文件Images (*.png *.xpm *.jpg)
-
+ 图形文件(*.png *.xpm *.jpg)
@@ -8748,77 +8748,77 @@ only when system is armed without disabling the module.
WizardPage
-
+ Upgrade now
-
+ 马上升级Upgrade
-
+ 升级Ready...
-
+ 准备就绪...Waiting for all OP boards to be disconnected.
-
+ 请断开连接着的OpenPilot控制板。Please connect the board to the USB port (don't use external supply).
-
+ 请将控制板用USB线连接到电脑(断开电调上连接的电池)。Board going into bootloader mode. Please wait.
-
+ 控制板进入bootloader模式,请稍等。Loading firmware.
-
+ 正在读取固件。Uploading firmware.
-
+ 烧写固件。Uploading description.
-
+ 写入描述信息。Booting the board. Please wait
-
+ 正在启动,请稍等Booting and erasing the board. Please wait
-
+ 正在重启并清除配置,请稍等Something went wrong.
-
+ 出错啦。 You will have to manually upgrade the board using the uploader plugin.
-
+ 请到Firmware应用中手动更新控制板固件。Board updated, please press 'Next' to continue.
-
+ 更新完毕,请点击“下一步”。
@@ -8830,12 +8830,21 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">It is necessary that your firmware and ground control software are the same version.</span></p>
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">When you are ready you can start the upgrade below by pushing the button. It is critical that nothing disturbs the board while the firmware is being written.</span></p>
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">It is recommended that you erase all settings on the board when upgrading firmware. Using saved settings for a previous version of the firmware </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">may result in undefined behaviour</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;"> and in worst case danger. It is possible to suppress the erase by deselecting the check box below.</span></p></body></html>
-
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
+<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">更新固件</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style="font-family:'MS Shell Dlg 2'; font-size:10pt;">请确保固件和当前运行的控制站(GCS)版本一一对应</span>。</p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">当设备准备好后,点击下面Upgrade按钮开始升级,整个过程中请勿断电。</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">由于继续使用旧固件系统下的设置<strong>可能会造成无法预料灾难性后果</strong>,强烈建议更新固件的同时清除原有设置信息。</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;"></span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">你可以取消勾选“清除所有设置”,保留原有配置,只升级固件。</span></p>
+</body></html>Erase all settings
-
+ 清除所有设置
@@ -8843,58 +8852,58 @@ p, li { white-space: pre-wrap; }
WizardPage
-
+ Connection device:
-
+ 设备及连接类型:Detected board type:
-
+ 控制板型号:Connect
-
+ 连接设备<Unknown>
-
+ 未知设备OpenPilot CopterControl
-
+ OpenPilot CopterControl 3D
-
+ OpenPilot Revolution
-
+ OpenPilot OPLink Radio Modem
-
+ OpenPilot DiscoveryF4
-
+ Disconnect
-
+ 断开设备
@@ -8906,7 +8915,15 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">To continue, the wizard needs to determine the configuration required for the type of OpenPilot controller you have. When connected, the wizard will attempt to automatically detect the type of board.</span></p>
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">If the board is already connected and successfully detected, the board type will already be displayed. You can </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">Disconnect</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;"> and select another device if you need to detect another board.</span></p>
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">If your board is not connected, please connect the board to a USB port on your computer and select the device from the list below. Then press </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">Connect</span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">.</span></p></body></html>
-
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
+<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">OpenPilot控制板</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style="font-family:'MS Shell Dlg 2'; font-size:10pt;">当设备正确连接以后,程序会自动识别控制板类型,确定下一步操作。</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">你可以点击“<strong>断开设备</strong>”,在下拉菜单中选择正确的连接类型和设备。</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">如果您的OpenPilot控制板尚未连接,请把它通过USB连接好,在下拉菜单中选择正确的设备型号,然后点击<strong>连接设备</strong>。</span></p>
+</body></html>
@@ -8927,37 +8944,38 @@ p, li { white-space: pre-wrap; }
WizardPage
-
+ PWM - One cable per channel
-
+ PWM - 每个通道独立用一根线
+ PWM - One cable per channelPWM
-
+ PPM - One cable for all channels
-
+ PPM - 所有通道共用一根线PPM
-
+ Futaba S-BUS
-
+ Spektrum Satellite
-
+
@@ -8968,17 +8986,24 @@ p, li { white-space: pre-wrap; }
<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">OpenPilot Input Signal Configuration</span></p>
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The OpenPilot controller supports many different types of input signals. Please select the type of input that matches your receiver configuration. If you are unsure, just leave the default option selected and continue the wizard.</span></p>
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Some input options require the OpenPilot controller to be rebooted before the changes can take place. If an option that requires a reboot is selected, you will be instructed to do so on the next page of this wizard.</span></p></body></html>
-
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
+<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">OpenPilot遥控器输入配置</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">OpenPilot控制板支持绝大多数遥控器,请选择对应的的遥控器类型。如果你不确定是什么类型,则可以保持默认设置并继续下一步操作。</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">某些遥控器类型选择后,需要OpenPilot控制板重启才能生效。当你选择了这样的遥控器类型后,点击下一步将会自动重启控制板。</span></p>
+</body></html>S.Bus
-
+ DSM Sat
-
+
@@ -9169,28 +9194,29 @@ p, li { white-space: pre-wrap; }
WizardPage
-
+ Write configuration to controller
-
+ 保存配置Save
- 保存
+ 保存Ready...
-
+ 准备就绪...An OpenPilot controller must be connected to your computer to save the configuration.
Please connect your OpenPilot controller to your computer and try again.
-
+ 系统未检测到任何OpenPilot设备。
+请再次确认OpenPilot控制板已经和电脑正确连接。
@@ -9290,47 +9316,48 @@ Please select the type of ground vehicle you want to create a configuration for
WizardPage
-
+ Tricopter, Quadcopter, Hexacopter
-
+ 三轴,四周,六轴Multirotor
-
+ 多轴飞行器CCPM Helicopters
-
+ CCPM直升机Helicopter
-
+ 直升机Airplane, Sloper, Jet
-
+ 不确定
+ 普通,牵引式, 喷气式Fixed wing
-
+ 固定翼飞行器Car, Boat, U-Boat
-
+ 车, 船,潜艇Surface
-
+ 陆地航模
@@ -9342,7 +9369,15 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">To continue, the wizard needs to know what type of vehicle the OpenPilot controller board is going to be used with. This step is crucial since much of the following configuration is unique per vehicle type.</span></p>
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">Go ahead and select the type of vehicle for which you want to create a configuration.</span></p>
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">The current version only provides functionality for Multirotors and Fixed-wing aircraft.</span></p></body></html>
-
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
+<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600;">航模类型选择</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">请选择正确的航模类型。务必确保您的选择和实际器械一致,因为你接下来的配置将会根据不同的模型有所区别。</span></p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">目前的OpenPilot GCS版本只支持多轴飞行器和固定翼飞机。</span></p>
+</body></html>
+
@@ -9600,32 +9635,32 @@ then close the dialog.
Form
- 界面
+ 界面Device Information
-
+ 设备信息TextLabel
- TextLabel
+ TextLabelCPU Serial:
-
+ CPU序号:Firmware Information
-
+ 固件信息BlRevision
-
+
@@ -9633,7 +9668,7 @@ then close the dialog.
Form
- 界面
+ 界面
@@ -9641,12 +9676,13 @@ then close the dialog.
to bootloader mode.
(Only enabled if telemetry link is established, either
through serial or USB)
-
+ 终止控制板上运行着的操作系统和控制程序,返回到bootloader模式(类似PC的BIOS)
+(请确保控制板已经通过串口或USB成功连接)Halt
-
+ 终止系统
@@ -9656,12 +9692,16 @@ Only useful if the system is halted
If telemetry is not running, select the link using the dropdown
menu on the right.
-
+ 启动系统。
+只有控制板处于bootloader模式(控制板上绿色LED常亮,蓝色LED慢速闪烁)才有用。
+
+从右边的下拉菜单中选择适当的连接方式。
+Boot
-
+ 启动系统
@@ -9671,24 +9711,25 @@ Only useful if the system is halted
If telemetry is not running, select the link using the dropdown
menu on the right.
-
+ Safe Boot
-
+ 安全模式Reset the system.
(Only enabled if telemetry link is established, either
through serial or USB)
-
+ 重启系统。
+(当设备通过串口或USB连接成功后才能发送该命令)Reset
- 重置
+ 重启系统
@@ -9696,12 +9737,13 @@ through serial or USB)
recover a system which does not boot.
Rescue is possible in USB mode only.
-
+ 手动恢复不能正确启动系统的控制板。
+只允许USB连接方式下使用此功能。Rescue
-
+ 系统恢复
@@ -9711,12 +9753,15 @@ method using this combo box.
You can use this to force a communication channel when doing
a "Boot" (button on the left). It is updated automatically when
halting a running board.
-
+ 如果管理端口尚未连接控制板,请从下拉菜单中选择一项正确的连接方式。
+
+你也可以在重启系统过程中(点击左边“重启系统”按钮)强制指定一种连接方式。
+执行“终止系统”后,该选项会自动更新为当前连接方式。Refresh the list of serial ports
-
+ 刷新接口列表
@@ -9726,7 +9771,7 @@ halting a running board.
Running
- 执行中
+ 系统运行中
@@ -9741,17 +9786,17 @@ halting a running board.
Erase Settings
-
+ 清除设置OK
- OK
+ 确定Progress
-
+ 进度
@@ -9761,7 +9806,7 @@ halting a running board.
Upgrade && Erase
-
+ 升级固件并清除设置
@@ -9771,7 +9816,7 @@ halting a running board.
Upgrade
-
+ 升级固件
@@ -10448,42 +10493,42 @@ Move the %1 stick.
OpenPilot Setup Wizard
-
+ OpenPilot设置向导Controller type:
-
+ 控制板: OpenPilot CopterControl
-
+ OpenPilot CopterControl 3D
-
+ OpenPilot Revolution
-
+ OpenPilot Nano
-
+ OpenPilot OPLink Radio Modem
-
+ OpenPilot DiscoveryF4 Development Board
-
+
@@ -10496,204 +10541,205 @@ Move the %1 stick.
Unknown
-
+ 未知设备Vehicle type:
-
+ 航模类型: Multirotor
-
+ 多轴飞行器Vehicle sub type:
-
+ 飞行器类型: Tricopter
-
+ 三轴Quadcopter X
-
+ X型四轴Quadcopter +
-
+ 十字型四轴Hexacopter
-
+ 六轴Hexacopter Coax (Y6)
-
+ 同轴型六轴这样翻译是否合适?
+ 同轴型六轴 (Y6)Hexacopter H
-
+ H型六轴Hexacopter X
-
+ X型六轴Octocopter
-
+ 八轴Octocopter Coax X
-
+ 同轴X型八轴Octocopter Coax +
-
+ 同轴十字型八轴Octocopter V
-
+ V型八轴Fixed wing
-
+ 固定翼Dual Aileron
-
+ 双副翼Aileron
-
+ 副翼Elevon
-
+ 升降副翼Helicopter
-
+ 直升机Surface vehicle
-
+ 陆地航模Car
-
+ 汽车Tank
-
+ 坦克Motorcycle
-
+ 摩托车Input type:
-
+ 遥控输入类型: PWM (One cable per channel)
-
+ PWM(每个通道独立用一根线)PPM (One cable for all channels)
-
+ PPM(所有通道共用一根线)Futaba S.Bus
-
+ Spektrum Satellite
-
+ Standard ESC (%1 Hz)
-
+ 标准电调(%1 Hz)Rapid ESC (%1 Hz)
-
+ 高速电调(%1 Hz)Speed Controller (ESC) type:
-
+ 电子调速器(ESC)类型: Servo type:
-
+ 伺服舵机类型: Analog Servos (50 Hz)
-
+ 模拟伺服舵机(50Hz)Digital Servos (333 Hz)
-
+ 数字伺服舵机(333Hz)GPS type:
-
+ GPS类型: OpenPilot Platinum
-
+ OpenPilot v8 or Generic UBLOX GPS
-
+ OpenPilot v8或通用UBLOX GPSGeneric NMEA GPS
-
+ 通用NMEA GPSNone
- 无
+ 无
@@ -10721,12 +10767,13 @@ Move the %1 stick.
Vehicle Setup Wizard
-
+ 航模设置向导Export Wizard Vehicle Template
-
+ 这样翻译合适吗?
+ 导出模型模板
@@ -10891,7 +10938,7 @@ Move the %1 stick.
Close
- 关闭
+ 关闭
@@ -14912,22 +14959,26 @@ Note: for the OpenPilot v8 GPS please select the U-Blox option.
Reboot
-
+ 重启<html><head/><body><p>Please wait. Your controller is rebooting.<br/>This can take up to a minute.</p></body></html>
-
+ <html><head/><body><p>正在重启,请稍等。<br/>整个过程大概需要一分钟。</p></body></html>Ok
-
+ 确定<font color='red'>Reboot failed!</font><p>Please perform a manual reboot by power cycling the board.<br>To power cycle the controller remove all batteries and the USB cable for at least 30 seconds.<br>After 30 seconds, plug in the board again and wait for it to connect, this can take a few seconds.<br>Then press Ok.</p>
-
+ <font color='red'>重启失败!</font>
+<p>请手动执行控制板重启。<br>
+首先请确保断开电池和USB连接线并持续等待30秒。<br>
+30秒后重新插上USB连接线,等待重新连接。<br>
+然后点击确定。</p>