Skip to content

Q
qgroundcontrol
Unverified Commit be5cc436 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #6040 from mavlink/localizationUpdate 

Localization update
parents 0cffebcb 2d86dae5
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 15 deletions
localization/qgc.ts
View file @ be5cc436
......@@ -6358,39 +6358,39 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MissionManager/MissionController.cc" line="640"/>
<location filename="../src/MissionManager/MissionController.cc" line="638"/>
<source>Mission item %1 is not an object</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MissionManager/MissionController.cc" line="710"/>
<location filename="../src/MissionManager/MissionController.cc" line="708"/>
<source>Unsupported complex item type: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MissionManager/MissionController.cc" line="713"/>
<location filename="../src/MissionManager/MissionController.cc" line="711"/>
<source>Unknown item type: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MissionManager/MissionController.cc" line="736"/>
<location filename="../src/MissionManager/MissionController.cc" line="734"/>
<source>Could not find doJumpId: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MissionManager/MissionController.cc" line="805"/>
<location filename="../src/MissionManager/MissionController.cc" line="803"/>
<source>The mission file is corrupted.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MissionManager/MissionController.cc" line="810"/>
<location filename="../src/MissionManager/MissionController.cc" line="808"/>
<source>The mission file is not compatible with this version of %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MissionManager/MissionController.cc" line="849"/>
<location filename="../src/MissionManager/MissionController.cc" line="864"/>
<location filename="../src/MissionManager/MissionController.cc" line="888"/>
<location filename="../src/MissionManager/MissionController.cc" line="847"/>
<location filename="../src/MissionManager/MissionController.cc" line="862"/>
<location filename="../src/MissionManager/MissionController.cc" line="886"/>
<source>Mission: %1</source>
<translation type="unfinished"></translation>
</message>
......@@ -11968,6 +11968,11 @@ Click Ok to start calibration.</source>
<source>AutoLoad%1.%2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/Vehicle/Vehicle.cc" line="1068"/>
<source>%1 low battery: %2 percent remaining</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/Vehicle/Vehicle.cc" line="1872"/>
<source>Mission transfer failed. Retry transfer. Error: %1</source>
......@@ -11983,6 +11988,16 @@ Click Ok to start calibration.</source>
<source>Rally Point transfer failed. Retry transfer. Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/Vehicle/Vehicle.cc" line="2079"/>
<source>%1 communication lost</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/Vehicle/Vehicle.cc" line="2097"/>
<source>%1 communication regained</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/Vehicle/Vehicle.cc" line="2164"/>
<source>Generic micro air vehicle</source>
......@@ -12115,6 +12130,26 @@ Click Ok to start calibration.</source>
<source>Onboard ADSB peripheral</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/Vehicle/Vehicle.cc" line="2200"/>
<source>vehicle %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/Vehicle/Vehicle.cc" line="2208"/>
<source>%1 %2 flight mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/Vehicle/Vehicle.cc" line="2214"/>
<source>armed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/Vehicle/Vehicle.cc" line="2214"/>
<source>disarmed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/Vehicle/Vehicle.cc" line="2433"/>
<source>Vehicle did not respond to command: %1</source>
......
src/Vehicle/Vehicle.cc
View file @ be5cc436
......@@ -1065,7 +1065,7 @@ void Vehicle::_handleSysStatus(mavlink_message_t& message)
if (sysStatus.battery_remaining > 0) {
if (sysStatus.battery_remaining < _settingsManager->appSettings()->batteryPercentRemainingAnnounce()->rawValue().toInt() &&
sysStatus.battery_remaining < _lastAnnouncedLowBatteryPercent) {
_say(QString("%1 low battery: %2 percent remaining").arg(_vehicleIdSpeech()).arg(sysStatus.battery_remaining));
_say(QString(tr("%1 low battery: %2 percent remaining")).arg(_vehicleIdSpeech()).arg(sysStatus.battery_remaining));
}
_lastAnnouncedLowBatteryPercent = sysStatus.battery_remaining;
}
......@@ -2076,7 +2076,7 @@ void Vehicle::_connectionLostTimeout(void)
_heardFrom = false;
_maxProtoVersion = 0;
emit connectionLostChanged(true);
_say(QString("%1 communication lost").arg(_vehicleIdSpeech()));
_say(QString(tr("%1 communication lost")).arg(_vehicleIdSpeech()));
if (_autoDisconnect) {
// Reset link state
......@@ -2094,7 +2094,7 @@ void Vehicle::_connectionActive(void)
if (_connectionLost) {
_connectionLost = false;
emit connectionLostChanged(false);
_say(QString("%1 communication regained").arg(_vehicleIdSpeech()));
_say(QString(tr("%1 communication regained")).arg(_vehicleIdSpeech()));
// Re-negotiate protocol version for the link
sendMavCommand(MAV_COMP_ID_ALL, // Don't know default component id yet.
......@@ -2197,7 +2197,7 @@ QString Vehicle::vehicleTypeName() const {
QString Vehicle::_vehicleIdSpeech(void)
{
if (_toolbox->multiVehicleManager()->vehicles()->count() > 1) {
return QString("vehicle %1").arg(id());
return QString(tr("vehicle %1")).arg(id());
} else {
return QString();
}
......@@ -2205,13 +2205,13 @@ QString Vehicle::_vehicleIdSpeech(void)
void Vehicle::_handleFlightModeChanged(const QString& flightMode)
{
_say(QString("%1 %2 flight mode").arg(_vehicleIdSpeech()).arg(flightMode));
_say(QString(tr("%1 %2 flight mode")).arg(_vehicleIdSpeech()).arg(flightMode));
emit guidedModeChanged(_firmwarePlugin->isGuidedMode(this));
}
void Vehicle::_announceArmedChanged(bool armed)
{
_say(QString("%1 %2").arg(_vehicleIdSpeech()).arg(armed ? QStringLiteral("armed") : QStringLiteral("disarmed")));
_say(QString("%1 %2").arg(_vehicleIdSpeech()).arg(armed ? QString(tr("armed")) : QString(tr("disarmed"))));
}
void Vehicle::_setFlying(bool flying)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment