Merge commit 'd8170c932b448ba6888e702746b5ae22632062d8' into sim

This commit is contained in:
milek7
2022-01-05 01:02:56 +01:00
76 changed files with 9277 additions and 5749 deletions

View File

@@ -176,8 +176,27 @@ std::string locale::label_cab_control(std::string const &Label)
{ "jointctrl:", STRN("master controller") },
{ "scndctrl:", STRN("second controller") },
{ "shuntmodepower:", STRN("shunt mode power") },
{ "tempomat_sw:", STRN("tempomat") },
{ "tempomat_sw:", STRN("cruise control") },
{ "tempomatoff_sw:", STRN("cruise control") },
{ "speedinc_bt:", STRN("cruise control (speed)") },
{ "speeddec_bt:", STRN("cruise control (speed)") },
{ "speedctrlpowerinc_bt:", STRN("cruise control (power)") },
{ "speedctrlpowerdec_bt:", STRN("cruise control (power)") },
{ "speedbutton0:", STRN("cruise control (speed)") },
{ "speedbutton1:", STRN("cruise control (speed)") },
{ "speedbutton2:", STRN("cruise control (speed)") },
{ "speedbutton3:", STRN("cruise control (speed)") },
{ "speedbutton4:", STRN("cruise control (speed)") },
{ "speedbutton5:", STRN("cruise control (speed)") },
{ "speedbutton6:", STRN("cruise control (speed)") },
{ "speedbutton7:", STRN("cruise control (speed)") },
{ "speedbutton8:", STRN("cruise control (speed)") },
{ "speedbutton9:", STRN("cruise control (speed)") },
{ "distancecounter_sw:", STRN("distance counter") },
{ "dirkey:", STRN("reverser") },
{ "dirbackward_bt:", STRN("reverser") },
{ "dirforward_bt:", STRN("reverser") },
{ "dirneutral_bt:", STRN("reverser") },
{ "brakectrl:", STRN("train brake") },
{ "localbrake:", STRN("independent brake") },
{ "manualbrake:", STRN("manual brake") },
@@ -250,6 +269,9 @@ std::string locale::label_cab_control(std::string const &Label)
{ "radiotest_sw:", STRN("radiostop test") },
{ "radiostop_sw:", STRN("radiostop") },
{ "radiocall3_sw:", STRN("radio call 3") },
{ "radiovolume_sw:", STRN("radio volume") },
{ "radiovolumenext_sw:", STRN("radio volume") },
{ "radiovolumeprev_sw:", STRN("radio volume") },
{ "pantfront_sw:", STRN("pantograph A") },
{ "pantrear_sw:", STRN("pantograph B") },
{ "pantfrontoff_sw:", STRN("pantograph A") },
@@ -257,6 +279,8 @@ std::string locale::label_cab_control(std::string const &Label)
{ "pantalloff_sw:", STRN("all pantographs") },
{ "pantselected_sw:", STRN("selected pantograph") },
{ "pantselectedoff_sw:", STRN("selected pantograph") },
{ "pantselect_sw:", STRN("selected pantograph") },
{ "pantvalves_sw:", STRN("selected pantograph") },
{ "pantcompressor_sw:", STRN("pantograph compressor") },
{ "pantcompressorvalve_sw:", STRN("pantograph 3 way valve") },
{ "trainheating_sw:", STRN("heating") },
@@ -268,7 +292,23 @@ std::string locale::label_cab_control(std::string const &Label)
{ "timetablelight_sw:", STRN("timetable light") },
{ "cablight_sw:", STRN("interior light") },
{ "cablightdim_sw:", STRN("interior light dimmer") },
{ "compartmentlights_sw:", STRN("compartment lights") },
{ "compartmentlightsoff_sw:", STRN("compartment lights") },
{ "compartmentlightson_sw:", STRN("compartment lights") },
{ "couplingdisconnect_sw:", STRN("coupling") },
{ "battery_sw:", STRN("battery") },
{ "batteryon_sw:", STRN("battery") },
{ "batteryoff_sw:", STRN("battery") },
{ "epbrake_bt:", STRN("ep brake") },
{ "relayreset1_bt:", STRN("relay reset") },
{ "relayreset2_bt:", STRN("relay reset") },
{ "relayreset3_bt:", STRN("relay reset") },
{ "springbrakeoff_bt:", STRN("spring brake") },
{ "springbrakeon_bt:", STRN("spring brake") },
{ "springbraketoggle_bt:", STRN("spring brake") },
{ "universalbrake1_bt:", STRN("train brake") },
{ "universalbrake2_bt:", STRN("train brake") },
{ "universalbrake3_bt:", STRN("train brake") },
{ "universal0:", STRN("interactive part") },
{ "universal1:", STRN("interactive part") },
{ "universal2:", STRN("interactive part") },