piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #2794

Browse Source 
French translations
This commit is contained in:
Andre Bernet
2015-08-28 12:49:40 +02:00
parent 5a049857f5
commit 3920cc6919
16 changed files with 1605 additions and 1353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/opentx/opentxeeprom.cpp
+2 -2
View File
@@ -2831,7 +2831,7 @@ class SensorField: public TransformedField {
_param = ((uint8_t)sensor.sources[0]) + ((uint8_t)sensor.sources[1] << 8) + ((uint8_t)sensor.sources[2] << 16) + ((uint8_t)sensor.sources[3] << 24);
else if (sensor.formula == SensorData::TELEM_FORMULA_DIST)
_param = (sensor.gps) + (sensor.alt << 8);
else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION)
else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION || sensor.formula == SensorData::TELEM_FORMULA_TOTALIZE)
_param = (sensor.amps);
}
}
@@ -2854,7 +2854,7 @@ class SensorField: public TransformedField {
sensor.sources[i] = _sources[i];
else if (sensor.formula == SensorData::TELEM_FORMULA_DIST)
(sensor.gps = _sources[0], sensor.alt = _sources[1]);
else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION)
else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION || sensor.formula == SensorData::TELEM_FORMULA_TOTALIZE)
sensor.amps = _sources[0];
}
eepromImportDebug() << QString("imported %1").arg(internalField.getName());
companion/src/modeledit/telemetry.cpp
+5 -3
View File
@@ -533,6 +533,7 @@ void TelemetrySensorPanel::update()
bool cellsFieldsDisplayed = false;
bool consFieldsDisplayed = false;
bool ratioFieldsDisplayed = false;
bool totalizeFieldsDisplayed = false;
bool sources12FieldsDisplayed = false;
bool sources34FieldsDisplayed = false;
@@ -556,6 +557,7 @@ void TelemetrySensorPanel::update()
consFieldsDisplayed = (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION);
sources12FieldsDisplayed = (sensor.formula <= SensorData::TELEM_FORMULA_MULTIPLY);
sources34FieldsDisplayed = (sensor.formula < SensorData::TELEM_FORMULA_MULTIPLY);
totalizeFieldsDisplayed = (sensor.formula == SensorData::TELEM_FORMULA_TOTALIZE);
updateSourcesComboBox(ui->source1, true);
updateSourcesComboBox(ui->source2, true);
updateSourcesComboBox(ui->source3, true);
@@ -595,15 +597,15 @@ void TelemetrySensorPanel::update()
ui->offsetLabel->setVisible(ratioFieldsDisplayed && sensor.unit != SensorData::UNIT_RPMS);
ui->multiplierLabel->setVisible(sensor.unit == SensorData::UNIT_RPMS);
ui->offset->setVisible(ratioFieldsDisplayed);
ui->precLabel->setVisible(isConfigurable);
ui->precLabel->setVisible(isConfigurable && sensor.unit != SensorData::UNIT_FAHRENHEIT);
ui->prec->setVisible(isConfigurable && sensor.unit != SensorData::UNIT_FAHRENHEIT);
ui->unit->setVisible((sensor.type == SensorData::TELEM_TYPE_CALCULATED && (sensor.formula == SensorData::TELEM_FORMULA_DIST)) || isConfigurable);
ui->gpsSensorLabel->setVisible(gpsFieldsDisplayed);
ui->gpsSensor->setVisible(gpsFieldsDisplayed);
ui->altSensorLabel->setVisible(gpsFieldsDisplayed);
ui->altSensor->setVisible(gpsFieldsDisplayed);
ui->ampsSensorLabel->setVisible(consFieldsDisplayed);
ui->ampsSensor->setVisible(consFieldsDisplayed);
ui->ampsSensorLabel->setVisible(consFieldsDisplayed || totalizeFieldsDisplayed);
ui->ampsSensor->setVisible(consFieldsDisplayed || totalizeFieldsDisplayed);
ui->cellsSensorLabel->setVisible(cellsFieldsDisplayed);
ui->cellsSensor->setVisible(cellsFieldsDisplayed);
ui->cellsIndex->setVisible(cellsFieldsDisplayed);
companion/src/modeledit/telemetry_sensor.ui
+21 -21
View File
@@ -272,7 +272,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Amps Sensor :</string>
<string>Sensor :</string>
</property>
</widget>
</item>
@@ -366,82 +366,82 @@
</item>
<item>
<property name="text">
<string>Voltage (V)</string>
<string>V</string>
</property>
</item>
<item>
<property name="text">
<string>Current (A)</string>
<string>A</string>
</property>
</item>
<item>
<property name="text">
<string>Current (mA)</string>
<string>mA</string>
</property>
</item>
<item>
<property name="text">
<string>Speed (kts)</string>
<string>kt</string>
</property>
</item>
<item>
<property name="text">
<string>Speed (m/s)</string>
<string>m/s</string>
</property>
</item>
<item>
<property name="text">
<string>Speed (ft/s)</string>
<string>ft/s</string>
</property>
</item>
<item>
<property name="text">
<string>Speed (km/h)</string>
<string>km/h</string>
</property>
</item>
<item>
<property name="text">
<string>Speed (miles/h)</string>
<string>mph</string>
</property>
</item>
<item>
<property name="text">
<string>Meters (m)</string>
<string>m</string>
</property>
</item>
<item>
<property name="text">
<string>Feet (ft)</string>
<string>ft</string>
</property>
</item>
<item>
<property name="text">
<string>Temp (°C)</string>
<string>°C</string>
</property>
</item>
<item>
<property name="text">
<string>Temp (°F)</string>
<string>°F</string>
</property>
</item>
<item>
<property name="text">
<string>Percentage (%)</string>
<string>%</string>
</property>
</item>
<item>
<property name="text">
<string>Energy (mAh)</string>
<string>mAh</string>
</property>
</item>
<item>
<property name="text">
<string>Power (W)</string>
<string>W</string>
</property>
</item>
<item>
<property name="text">
<string>RF Power (dBm)</string>
<string>dBm</string>
</property>
</item>
<item>
@@ -451,22 +451,22 @@
</item>
<item>
<property name="text">
<string>Acceleration (g)</string>
<string>g</string>
</property>
</item>
<item>
<property name="text">
<string>Heading (°)</string>
<string>°</string>
</property>
</item>
<item>
<property name="text">
<string>Volume (mL)</string>
<string>mL</string>
</property>
</item>
<item>
<property name="text">
<string>Volume (US fl.Oz.)</string>
<string>US fl.Oz.</string>
</property>
</item>
</widget>
companion/src/translations/companion_fr.ts
+1565 -1315
View File
File diff suppressed because it is too large Load Diff
radio/src/gui/Taranis/menu_model_telemetry.cpp
+1 -1
View File
@@ -344,7 +344,7 @@ void menuModelSensor(uint8_t event)
lcd_putsLeft(y, STR_CURRENTSENSOR);
putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->consumption.source ? MIXSRC_FIRST_TELEM+3*(sensor->consumption.source-1) : 0, attr);
if (attr) {
sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isCurrentSensor);
sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isTelemetryFieldAvailable);
}
break;
}
radio/src/translations/cz.h.txt
+1 -1
View File
@@ -1074,7 +1074,7 @@
#define TR_ALTSENSOR "Senzor výšky"
#define TR_CELLSENSOR "Senzor článků"
#define TR_GPSSENSOR "GPS senzor"
#define TR_CURRENTSENSOR "Sensor proudu"
#define TR_CURRENTSENSOR "Sensor"
#define TR_AUTOOFFSET "Auto ofset"
#define TR_ONLYPOSITIVE "Jen kladné"
#define TR_FILTER "Filtr"
radio/src/translations/de.h.txt
+1 -1
View File
@@ -1078,7 +1078,7 @@
#define TR_ALTSENSOR "Höhen Sensor"
#define TR_CELLSENSOR "Zellen Sensor"
#define TR_GPSSENSOR "GPS Sensor"
#define TR_CURRENTSENSOR "Strom Sensor"
#define TR_CURRENTSENSOR "Sensor"
#define TR_AUTOOFFSET "Auto Offset"
#define TR_ONLYPOSITIVE "Nur Positiv"
#define TR_FILTER "Filter aktiv"
radio/src/translations/en.h.txt
+1 -1
View File
@@ -1073,7 +1073,7 @@
#define TR_ALTSENSOR "Alt sensor"
#define TR_CELLSENSOR "Cell sensor"
#define TR_GPSSENSOR "GPS sensor"
#define TR_CURRENTSENSOR "Curr. sensor"
#define TR_CURRENTSENSOR "Sensor"
#define TR_AUTOOFFSET "Auto Offset"
#define TR_ONLYPOSITIVE "Positive"
#define TR_FILTER "Filter"
radio/src/translations/es.h.txt
+1 -1
View File
@@ -1028,7 +1028,7 @@
#define TR_ALTSENSOR "Alt sensor"
#define TR_CELLSENSOR "Cell sensor"
#define TR_GPSSENSOR "GPS sensor"
#define TR_CURRENTSENSOR "Current sensor"
#define TR_CURRENTSENSOR "Sensor"
#define TR_AUTOOFFSET "Auto Offset"
#define TR_ONLYPOSITIVE "Positive"
#define TR_FILTER "Filter"
radio/src/translations/fi.h.txt
+1 -1
View File
@@ -1028,7 +1028,7 @@
#define TR_ALTSENSOR "Alt sensor"
#define TR_CELLSENSOR "Cell sensor"
#define TR_GPSSENSOR "GPS sensor"
#define TR_CURRENTSENSOR "Current sensor"
#define TR_CURRENTSENSOR "Sensor"
#define TR_AUTOOFFSET "Auto Offset"
#define TR_ONLYPOSITIVE "Positive"
#define TR_FILTER "Filter"
radio/src/translations/fr.h.txt
+1 -1
View File
@@ -1065,7 +1065,7 @@
#define TR_ALTSENSOR "Capteur Alt"
#define TR_CELLSENSOR "Capteur Elém"
#define TR_GPSSENSOR "Capteur GPS"
#define TR_CURRENTSENSOR "Capt courant"
#define TR_CURRENTSENSOR "Capteur"
#define TR_AUTOOFFSET "Offset auto"
#define TR_ONLYPOSITIVE "Positive"
#define TR_FILTER "Filtrage"
radio/src/translations/it.h.txt
+1 -1
View File
@@ -1076,7 +1076,7 @@
#define TR_ALTSENSOR "Sensore Alt"
#define TR_CELLSENSOR "Sensore Cell"
#define TR_GPSSENSOR "Sensore GPS"
#define TR_CURRENTSENSOR "Sensore Currente"
#define TR_CURRENTSENSOR "Sensore"
#define TR_AUTOOFFSET "Auto Offset"
#define TR_ONLYPOSITIVE "Positivo"
#define TR_FILTER "Filtro"
radio/src/translations/nl.h.txt
+1 -1
View File
@@ -1084,7 +1084,7 @@
#define TR_ALTSENSOR "Hoogte Sensor"
#define TR_CELLSENSOR "Cellen Sensor"
#define TR_GPSSENSOR "GPS Sensor"
#define TR_CURRENTSENSOR "Stroomsensor"
#define TR_CURRENTSENSOR "Sensor"
#define TR_AUTOOFFSET "Auto Offset"
#define TR_ONLYPOSITIVE "Geen Negatief"
#define TR_FILTER "Filter aktief"
radio/src/translations/pl.h.txt
+1 -1
View File
@@ -1077,7 +1077,7 @@
#define TR_ALTSENSOR "Alt sensor"
#define TR_CELLSENSOR "Cell sensor"
#define TR_GPSSENSOR "GPS sensor"
#define TR_CURRENTSENSOR "Curr. sensor"
#define TR_CURRENTSENSOR "Sensor"
#define TR_AUTOOFFSET "Auto Ofset"
#define TR_ONLYPOSITIVE "Dodatni"
#define TR_FILTER "Filtr"
radio/src/translations/pt.h.txt
+1 -1
View File
@@ -1028,7 +1028,7 @@
#define TR_ALTSENSOR "Alt sensor"
#define TR_CELLSENSOR "Cell sensor"
#define TR_GPSSENSOR "GPS sensor"
#define TR_CURRENTSENSOR "Current sensor"
#define TR_CURRENTSENSOR "Sensor"
#define TR_AUTOOFFSET "Auto Offset"
#define TR_ONLYPOSITIVE "Positive"
#define TR_FILTER "Filter"
radio/src/translations/se.h.txt
+1 -1
View File
@@ -1028,7 +1028,7 @@
#define TR_ALTSENSOR "Alt sensor"
#define TR_CELLSENSOR "Cell sensor"
#define TR_GPSSENSOR "GPS sensor"
#define TR_CURRENTSENSOR "Current sensor"
#define TR_CURRENTSENSOR "Sensor"
#define TR_AUTOOFFSET "Auto Offset"
#define TR_ONLYPOSITIVE "Positive"
#define TR_FILTER "Filter"