Merge pull request #8389 from Theosakamg/language_unit

Language Unit Translate
This commit is contained in:
Theo Arends 2020-05-08 11:03:36 +02:00 committed by GitHub
commit d70ce6a767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 159 additions and 45 deletions

View File

@ -690,20 +690,19 @@ const float kSpeedConversionFactor[] = {1, // none
// xdrv_02_webserver.ino // xdrv_02_webserver.ino
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
// {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr> // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
const char HTTP_SNS_TEMP[] PROGMEM = "{s}%s " D_TEMPERATURE "{m}%s&deg;%c{e}"; const char HTTP_SNS_TEMP[] PROGMEM = "{s}%s " D_TEMPERATURE "{m}%s " D_UNIT_DEGREE "%c{e}";
const char HTTP_SNS_HUM[] PROGMEM = "{s}%s " D_HUMIDITY "{m}%s%%{e}"; const char HTTP_SNS_HUM[] PROGMEM = "{s}%s " D_HUMIDITY "{m}%s " D_UNIT_PERCENT "{e}";
const char HTTP_SNS_DEW[] PROGMEM = "{s}%s " D_DEWPOINT "{m}%s&deg;%c{e}"; const char HTTP_SNS_DEW[] PROGMEM = "{s}%s " D_DEWPOINT "{m}%s " D_UNIT_DEGREE "%c{e}";
const char HTTP_SNS_PRESSURE[] PROGMEM = "{s}%s " D_PRESSURE "{m}%s %s{e}"; const char HTTP_SNS_PRESSURE[] PROGMEM = "{s}%s " D_PRESSURE "{m}%s " "%s{e}";
const char HTTP_SNS_SEAPRESSURE[] PROGMEM = "{s}%s " D_PRESSUREATSEALEVEL "{m}%s %s{e}"; const char HTTP_SNS_SEAPRESSURE[] PROGMEM = "{s}%s " D_PRESSUREATSEALEVEL "{m}%s " "%s{e}";
const char HTTP_SNS_ANALOG[] PROGMEM = "{s}%s " D_ANALOG_INPUT "%d{m}%d{e}"; const char HTTP_SNS_ANALOG[] PROGMEM = "{s}%s " D_ANALOG_INPUT "%d{m}%d" "{e}";
const char HTTP_SNS_ILLUMINANCE[] PROGMEM = "{s}%s " D_ILLUMINANCE "{m}%d " D_UNIT_LUX "{e}"; const char HTTP_SNS_ILLUMINANCE[] PROGMEM = "{s}%s " D_ILLUMINANCE "{m}%d " D_UNIT_LUX "{e}";
const char HTTP_SNS_CO2[] PROGMEM = "{s}%s " D_CO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"; const char HTTP_SNS_CO2[] PROGMEM = "{s}%s " D_CO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}";
const char HTTP_SNS_CO2EAVG[] PROGMEM = "{s}%s " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}"; const char HTTP_SNS_CO2EAVG[] PROGMEM = "{s}%s " D_ECO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}";
const char HTTP_SNS_GALLONS[] PROGMEM = "{s}%s " D_TOTAL_USAGE "{m}%s " D_UNIT_GALLONS " {e}"; const char HTTP_SNS_GALLONS[] PROGMEM = "{s}%s " D_TOTAL_USAGE "{m}%s " D_UNIT_GALLONS "{e}";
const char HTTP_SNS_GPM[] PROGMEM = "{s}%s " D_FLOW_RATE "{m}%s " D_UNIT_GALLONS_PER_MIN" {e}"; const char HTTP_SNS_GPM[] PROGMEM = "{s}%s " D_FLOW_RATE "{m}%s " D_UNIT_GALLONS_PER_MIN "{e}";
const char HTTP_SNS_MOISTURE[] PROGMEM = "{s}%s " D_MOISTURE "{m}%d %%{e}"; const char HTTP_SNS_MOISTURE[] PROGMEM = "{s}%s " D_MOISTURE "{m}%d " D_UNIT_PERCENT "{e}";
const char HTTP_SNS_RANGE[] PROGMEM = "{s}%s " D_RANGE "{m}%d{e}"; const char HTTP_SNS_RANGE[] PROGMEM = "{s}%s " D_RANGE "{m}%d" "{e}";
const char HTTP_SNS_VOLTAGE[] PROGMEM = "{s}" D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}"; const char HTTP_SNS_VOLTAGE[] PROGMEM = "{s}" D_VOLTAGE "{m}%s " D_UNIT_VOLT "{e}";
const char HTTP_SNS_CURRENT[] PROGMEM = "{s}" D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}"; const char HTTP_SNS_CURRENT[] PROGMEM = "{s}" D_CURRENT "{m}%s " D_UNIT_AMPERE "{e}";
const char HTTP_SNS_POWER[] PROGMEM = "{s}" D_POWERUSAGE "{m}%s " D_UNIT_WATT "{e}"; const char HTTP_SNS_POWER[] PROGMEM = "{s}" D_POWERUSAGE "{m}%s " D_UNIT_WATT "{e}";

View File

@ -690,13 +690,17 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "gal/min" #define D_UNIT_GALLONS_PER_MIN "gal/min"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h"
#define D_UNIT_KILOOHM "kΩ" #define D_UNIT_KILOOHM "kΩ"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "s" #define D_UNIT_SECOND "s"
#define D_UNIT_SECTORS "сектори" #define D_UNIT_SECTORS "сектори"

View File

@ -690,13 +690,17 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "hod" #define D_UNIT_HOUR "hod"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
#define D_UNIT_KILOOHM "kΩ" #define D_UNIT_KILOOHM "kΩ"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "sec" #define D_UNIT_SECOND "sec"
#define D_UNIT_SECTORS "sektory" #define D_UNIT_SECTORS "sektory"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "s" #define D_UNIT_SECOND "s"
#define D_UNIT_SECTORS "Sektoren" #define D_UNIT_SECTORS "Sektoren"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "sec" #define D_UNIT_SECOND "sec"
#define D_UNIT_SECTORS "sectors" #define D_UNIT_SECTORS "sectors"

View File

@ -690,13 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "&deg;K" #define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -714,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "sec" #define D_UNIT_SECOND "sec"
#define D_UNIT_SECTORS "sectors" #define D_UNIT_SECTORS "sectors"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "seg" #define D_UNIT_SECOND "seg"
#define D_UNIT_SECTORS "sectores" #define D_UNIT_SECTORS "sectores"

View File

@ -79,7 +79,7 @@
#define D_DATA "Donnée" #define D_DATA "Donnée"
#define D_DARKLIGHT "Sombre" #define D_DARKLIGHT "Sombre"
#define D_DEBUG "Debug" #define D_DEBUG "Debug"
#define D_DEWPOINT "Dew point" #define D_DEWPOINT "Point de rosée"
#define D_DISABLED "Désactivé" #define D_DISABLED "Désactivé"
#define D_DISTANCE "Distance" #define D_DISTANCE "Distance"
#define D_DNS_SERVER "Serveur DNS" #define D_DNS_SERVER "Serveur DNS"
@ -138,7 +138,7 @@
#define D_PROGRAM_SIZE "Taille programme" #define D_PROGRAM_SIZE "Taille programme"
#define D_PROJECT "Projet" #define D_PROJECT "Projet"
#define D_RAIN "Pluie" #define D_RAIN "Pluie"
#define D_RANGE "Range" #define D_RANGE "Intervalle"
#define D_RECEIVED "Reçu" #define D_RECEIVED "Reçu"
#define D_RESTART "Redémarrage" #define D_RESTART "Redémarrage"
#define D_RESTARTING "Redémarre" #define D_RESTARTING "Redémarre"
@ -189,8 +189,8 @@
// tasmota.ino // tasmota.ino
#define D_WARNING_MINIMAL_VERSION "ATTENTION Cette version ne supporte pas les réglages persistants" #define D_WARNING_MINIMAL_VERSION "ATTENTION Cette version ne supporte pas les réglages persistants"
#define D_LEVEL_10 "level 1-0" #define D_LEVEL_10 "niveau 1-0"
#define D_LEVEL_01 "level 0-1" #define D_LEVEL_01 "niveau 0-1"
#define D_SERIAL_LOGGING_DISABLED "Journalisation série désactivée" #define D_SERIAL_LOGGING_DISABLED "Journalisation série désactivée"
#define D_SYSLOG_LOGGING_REENABLED "Jounalisation SysLog réactivée" #define D_SYSLOG_LOGGING_REENABLED "Jounalisation SysLog réactivée"
@ -402,7 +402,7 @@
#define D_DOMOTICZ_TEMP_HUM "Temp,Hum" #define D_DOMOTICZ_TEMP_HUM "Temp,Hum"
#define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro" #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro"
#define D_DOMOTICZ_POWER_ENERGY "Puissance,Énergie" #define D_DOMOTICZ_POWER_ENERGY "Puissance,Énergie"
#define D_DOMOTICZ_ILLUMINANCE "Illuminance" #define D_DOMOTICZ_ILLUMINANCE "Éclairement"
#define D_DOMOTICZ_COUNT "Compteur/PM1" #define D_DOMOTICZ_COUNT "Compteur/PM1"
#define D_DOMOTICZ_VOLTAGE "Tension/PM2,5" #define D_DOMOTICZ_VOLTAGE "Tension/PM2,5"
#define D_DOMOTICZ_CURRENT "Courant/PM10" #define D_DOMOTICZ_CURRENT "Courant/PM10"
@ -536,8 +536,8 @@
#define D_Spannung_L3 "Voltage L3" #define D_Spannung_L3 "Voltage L3"
#define D_METERNR "Meter_number" #define D_METERNR "Meter_number"
#define D_METERSID "Service ID" #define D_METERSID "Service ID"
#define D_GasIN "Counter" #define D_GasIN "Compteur"
#define D_H2oIN "Counter" #define D_H2oIN "Compteur"
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Current L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
@ -663,8 +663,8 @@
#define D_SENSOR_SLAVE_TX "Esclave TX" #define D_SENSOR_SLAVE_TX "Esclave TX"
#define D_SENSOR_SLAVE_RX "Esclave RX" #define D_SENSOR_SLAVE_RX "Esclave RX"
#define D_SENSOR_SLAVE_RESET "Esclave Rst" #define D_SENSOR_SLAVE_RESET "Esclave Rst"
#define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX" #define D_SENSOR_HM10_RX "HM10 RX"
#define D_SENSOR_HM10_TX "HM10 TX" #define D_SENSOR_HM10_TX "HM10 TX"
#define D_SENSOR_LE01MR_RX "LE-01MR Rx" #define D_SENSOR_LE01MR_RX "LE-01MR Rx"
@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "gal/mn" #define D_UNIT_GALLONS_PER_MIN "gal/mn"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h"
@ -709,10 +713,11 @@
#define D_UNIT_MILLIMETER "mm" #define D_UNIT_MILLIMETER "mm"
#define D_UNIT_MILLIMETER_MERCURY "mmHg" #define D_UNIT_MILLIMETER_MERCURY "mmHg"
#define D_UNIT_MILLISECOND "ms" #define D_UNIT_MILLISECOND "ms"
#define D_UNIT_MINUTE "mn" #define D_UNIT_MINUTE "min" // https://fr.wikipedia.org/wiki/Minute_(temps)#Symbole%20et%20d%C3%A9finition
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "s" #define D_UNIT_SECOND "s"
#define D_UNIT_SECTORS "secteurs" #define D_UNIT_SECTORS "secteurs"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "sec" #define D_UNIT_SECOND "sec"
#define D_UNIT_SECTORS "sectors" #define D_UNIT_SECTORS "sectors"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "s" #define D_UNIT_SECOND "s"
#define D_UNIT_SECTORS "szektorok" #define D_UNIT_SECTORS "szektorok"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "o" #define D_UNIT_HOUR "o"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "sec" #define D_UNIT_SECOND "sec"
#define D_UNIT_SECTORS "settori" #define D_UNIT_SECTORS "settori"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "시" #define D_UNIT_HOUR "시"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "초" #define D_UNIT_SECOND "초"
#define D_UNIT_SECTORS "섹터" #define D_UNIT_SECTORS "섹터"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "sec" #define D_UNIT_SECOND "sec"
#define D_UNIT_SECTORS "sectoren" #define D_UNIT_SECTORS "sectoren"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "Godz" #define D_UNIT_HOUR "Godz"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "sec" #define D_UNIT_SECOND "sec"
#define D_UNIT_SECTORS "sektory" #define D_UNIT_SECTORS "sektory"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "H" #define D_UNIT_HOUR "H"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "s" #define D_UNIT_SECOND "s"
#define D_UNIT_SECTORS "setores" #define D_UNIT_SECTORS "setores"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "sec" #define D_UNIT_SECOND "sec"
#define D_UNIT_SECTORS "setores" #define D_UNIT_SECTORS "setores"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "sec" #define D_UNIT_SECOND "sec"
#define D_UNIT_SECTORS "sectors" #define D_UNIT_SECTORS "sectors"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "А" #define D_UNIT_AMPERE "А"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "Ч" #define D_UNIT_HOUR "Ч"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "гПа" #define D_UNIT_PRESSURE "гПа"
#define D_UNIT_SECOND "сек" #define D_UNIT_SECOND "сек"
#define D_UNIT_SECTORS "секторов" #define D_UNIT_SECTORS "секторов"

View File

@ -690,13 +690,17 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "hod" #define D_UNIT_HOUR "hod"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
#define D_UNIT_KILOOHM "kΩ" #define D_UNIT_KILOOHM "kΩ"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "sek" #define D_UNIT_SECOND "sek"
#define D_UNIT_SECTORS "sektory" #define D_UNIT_SECTORS "sektory"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "Tim" #define D_UNIT_HOUR "Tim"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "ink" #define D_UNIT_INCREMENTS "ink"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "sek" #define D_UNIT_SECOND "sek"
#define D_UNIT_SECTORS "sektorer" #define D_UNIT_SECTORS "sektorer"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "A" #define D_UNIT_AMPERE "A"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "h" #define D_UNIT_HOUR "h"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "ppd" #define D_UNIT_PARTS_PER_DECILITER "ppd"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "hPa" #define D_UNIT_PRESSURE "hPa"
#define D_UNIT_SECOND "sec" #define D_UNIT_SECOND "sec"
#define D_UNIT_SECTORS "sectors" #define D_UNIT_SECTORS "sectors"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "А" #define D_UNIT_AMPERE "А"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cм" #define D_UNIT_CENTIMETER "cм"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Гц" #define D_UNIT_HERTZ "Гц"
#define D_UNIT_HOUR "г" #define D_UNIT_HOUR "г"
#define D_UNIT_GALLONS "гал" #define D_UNIT_GALLONS "гал"
#define D_UNIT_GALLONS_PER_MIN "гал/хв" #define D_UNIT_GALLONS_PER_MIN "гал/хв"
#define D_UNIT_INCREMENTS "інк" #define D_UNIT_INCREMENTS "інк"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "кг" #define D_UNIT_KILOGRAM "кг"
#define D_UNIT_KILOMETER_PER_HOUR "км/г" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "км/г" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "млрд⁻¹" #define D_UNIT_PARTS_PER_BILLION "млрд⁻¹"
#define D_UNIT_PARTS_PER_DECILITER "децилітр⁻¹" #define D_UNIT_PARTS_PER_DECILITER "децилітр⁻¹"
#define D_UNIT_PARTS_PER_MILLION "млн⁻¹" #define D_UNIT_PARTS_PER_MILLION "млн⁻¹"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "гПа" #define D_UNIT_PRESSURE "гПа"
#define D_UNIT_SECOND "сек" #define D_UNIT_SECOND "сек"
#define D_UNIT_SECTORS "секторів" #define D_UNIT_SECTORS "секторів"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "安" #define D_UNIT_AMPERE "安"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "厘米" #define D_UNIT_CENTIMETER "厘米"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "赫兹" #define D_UNIT_HERTZ "赫兹"
#define D_UNIT_HOUR "时" #define D_UNIT_HOUR "时"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "千克" #define D_UNIT_KILOGRAM "千克"
#define D_UNIT_KILOMETER_PER_HOUR "公里/时" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "公里/时" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "每分升" #define D_UNIT_PARTS_PER_DECILITER "每分升"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "百帕" #define D_UNIT_PRESSURE "百帕"
#define D_UNIT_SECOND "秒" #define D_UNIT_SECOND "秒"
#define D_UNIT_SECTORS "扇区" #define D_UNIT_SECTORS "扇区"

View File

@ -690,12 +690,16 @@
// Units // Units
#define D_UNIT_AMPERE "安" #define D_UNIT_AMPERE "安"
#define D_UNIT_CELSIUS "C"
#define D_UNIT_CENTIMETER "cm" #define D_UNIT_CENTIMETER "cm"
#define D_UNIT_DEGREE "°"
#define D_UNIT_FAHRENHEIT "F"
#define D_UNIT_HERTZ "Hz" #define D_UNIT_HERTZ "Hz"
#define D_UNIT_HOUR "時" #define D_UNIT_HOUR "時"
#define D_UNIT_GALLONS "gal" #define D_UNIT_GALLONS "gal"
#define D_UNIT_GALLONS_PER_MIN "g/m" #define D_UNIT_GALLONS_PER_MIN "g/m"
#define D_UNIT_INCREMENTS "inc" #define D_UNIT_INCREMENTS "inc"
#define D_UNIT_KELVIN "K"
#define D_UNIT_KILOMETER "km" #define D_UNIT_KILOMETER "km"
#define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOGRAM "kg"
#define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h"
@ -713,6 +717,7 @@
#define D_UNIT_PARTS_PER_BILLION "ppb" #define D_UNIT_PARTS_PER_BILLION "ppb"
#define D_UNIT_PARTS_PER_DECILITER "每分升" #define D_UNIT_PARTS_PER_DECILITER "每分升"
#define D_UNIT_PARTS_PER_MILLION "ppm" #define D_UNIT_PARTS_PER_MILLION "ppm"
#define D_UNIT_PERCENT "%%"
#define D_UNIT_PRESSURE "百帕" #define D_UNIT_PRESSURE "百帕"
#define D_UNIT_SECOND "秒" #define D_UNIT_SECOND "秒"
#define D_UNIT_SECTORS "扇區" #define D_UNIT_SECTORS "扇區"

View File

@ -620,7 +620,8 @@ float ConvertTempToCelsius(float c)
char TempUnit(void) char TempUnit(void)
{ {
return (Settings.flag.temperature_conversion) ? 'F' : 'C'; // SetOption8 - Switch between Celsius or Fahrenheit // SetOption8 - Switch between Celsius or Fahrenheit
return (Settings.flag.temperature_conversion) ? D_UNIT_FAHRENHEIT : D_UNIT_CELSIUS;
} }
float ConvertHumidity(float h) float ConvertHumidity(float h)