Merge branch 'gfx-work' into sim

translation.h

@@ -27,8 +27,26 @@ enum string {
     driver_aid_loadinginprogress,
     driver_aid_vehicleahead,
 
+    driver_scenario_header,
+    driver_scenario_assignment,
+    driver_scenario_currenttask,
+    driver_scenario_waitfororders,
+    driver_scenario_prepareengine,
+    driver_scenario_releaseengine,
+    driver_scenario_changedirection,
+    driver_scenario_connect,
+    driver_scenario_disconnect,
+    driver_scenario_allvehicles,
+    driver_scenario_onevehicle,
+    driver_scenario_fewvehicles,
+    driver_scenario_somevehicles,
+    driver_scenario_shunt,
+    driver_scenario_looseshunt,
+    driver_scenario_obeytrain,
+    driver_scenario_bank,
+
     driver_timetable_header,
-    driver_timetable_time,
+    driver_timetable_name,
     driver_timetable_notimetable,
     driver_timetable_consistdata,
 
@@ -83,8 +101,10 @@ enum string {
 	vehicleparams_window,
 
     cab_mainctrl,
+    cab_jointctrl,
     cab_scndctrl,
     cab_shuntmodepower,
+    cab_tempomat,
     cab_dirkey,
     cab_brakectrl,
     cab_localbrake,
@@ -105,6 +125,7 @@ enum string {
     cab_motorblowersfront_sw,
     cab_motorblowersrear_sw,
     cab_motorblowersalloff_sw,
+    cab_coolingfans_sw,
     cab_main_off_bt,
     cab_main_on_bt,
     cab_security_reset_bt,
@@ -129,6 +150,7 @@ enum string {
     cab_doorrightoff_sw,
     cab_doorallon_sw,
     cab_dooralloff_sw,
+    cab_doorstep_sw,
     cab_departure_signal_bt,
     cab_upperlight_sw,
     cab_leftlight_sw,