--- a/src/lang/english.txt Tue Apr 15 19:47:58 2008 +0000
+++ b/src/lang/english.txt Wed Apr 16 00:07:47 2008 +0000
@@ -2652,8 +2652,8 @@
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}!
STR_8802_DETAILS :{WHITE}{VEHICLE} (Details)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Train in the way
-STR_8804 :{SETX 10}{COMMA}: {STRING3} {STRING2}
-STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING3} {STRING2}
+STR_8804 :{SETX 10}{COMMA}: {STRING4} {STRING2}
+STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING4} {STRING2}
STR_ORDER_GO_TO :Go to
STR_ORDER_GO_NON_STOP_TO :Go non-stop to
STR_ORDER_GO_VIA :Go via
@@ -2684,12 +2684,46 @@
STR_ORDER_TOOLTIP_FULL_LOAD :{BLACK}Change the loading behaviour of the highlighted order
STR_ORDER_TOOLTIP_UNLOAD :{BLACK}Change the unloading behaviour of the highlighted order
STR_GO_TO_STATION :{STRING} {STATION} {STRING}
-STR_GO_TO_TRAIN_DEPOT :Go to {TOWN} Train Depot
-STR_SERVICE_AT_TRAIN_DEPOT :Service at {TOWN} Train Depot
-STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Go non-stop to {TOWN} Train Depot
-STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Service non-stop at {TOWN} Train Depot
-STR_TIMETABLE_GO_TO :{STRING3} {STRING2}
+STR_ORDER_GO_TO_DROPDOWN_TOOLTIP :{BLACK}Insert an advanced order
+STR_ORDER_GO_TO_NEAREST_DEPOT :Go to nearest depot
+STR_ORDER_GO_TO_NEAREST_HANGAR :Go to nearest hangar
+STR_ORDER_NEAREST_DEPOT :the nearest
+STR_ORDER_NEAREST_HANGAR :the nearest Hangar
+STR_ORDER_SERVICE_AT :Service at
+STR_ORDER_SERVICE_NON_STOP_AT :Service non-stop at
+STR_ORDER_TRAIN_DEPOT :Train Depot
+STR_ORDER_ROAD_DEPOT :Road Vehicle Depot
+STR_ORDER_SHIP_DEPOT :Ship Depot
+STR_GO_TO_DEPOT :{STRING} {TOWN} {STRING}
+STR_GO_TO_NEAREST_DEPOT :{STRING} {STRING} {STRING}
+STR_GO_TO_HANGAR :{STRING} {STATION} Hangar
+
+STR_ORDER_CONDITIONAL :Conditional order jump
+STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Vehicle data to base jumping on
+STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP :{BLACK}How to compare the vehicle data to the given value
+STR_ORDER_CONDITIONAL_VALUE_TOOLTIP :{BLACK}The value to compare the vehicle data against
+STR_ORDER_CONDITIONAL_VALUE_CAPT :{WHITE}Enter value to compare against
+STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Load percentage
+STR_ORDER_CONDITIONAL_RELIABILITY :Reliability
+STR_ORDER_CONDITIONAL_MAX_SPEED :Maximum speed
+STR_ORDER_CONDITIONAL_AGE :Vehicle age (years)
+STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Requires service
+STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Always
+STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS :is equal to
+STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS :is not equal to
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN :is less than
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS :is less or equal to
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN :is more than
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS :is more or equal to
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE :is true
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE :is false
+STR_CONDITIONAL_VALUE :{SKIP}{BLACK}{COMMA}
+STR_CONDITIONAL_UNCONDITIONAL :Jump to order {COMMA}
+STR_CONDITIONAL_NUM :Jump to order {COMMA} when {STRING} {STRING} {COMMA}
+STR_CONDITIONAL_TRUE_FALSE :Jump to order {COMMA} when {STRING} {STRING}
+
+STR_TIMETABLE_GO_TO :{STRING4} {STRING2}
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Travel (not timetabled)
STR_TIMETABLE_TRAVEL_FOR :Travel for {STRING1}
STR_TIMETABLE_STAY_FOR :and stay for {STRING1}
@@ -2900,8 +2934,6 @@
STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Rename road vehicle type
STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Rename road vehicle type
STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Can't rename road vehicle type...
-STR_GO_TO_ROADVEH_DEPOT :Go to {TOWN} Road Vehicle Depot
-STR_SERVICE_AT_ROADVEH_DEPOT :Service at {TOWN} Road Vehicle Depot
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Refit road vehicle to carry a different cargo type
STR_REFIT_ROAD_VEHICLE :{BLACK}Refit road vehicle
@@ -2977,8 +3009,6 @@
STR_9840_NEW_CAPACITY_COST_OF_REFIT :{BLACK}New capacity: {GOLD}{CARGO}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
STR_9841_CAN_T_REFIT_SHIP :{WHITE}Can't refit ship...
STR_9842_REFITTABLE :(refittable)
-STR_GO_TO_SHIP_DEPOT :Go to {TOWN} Ship Depot
-SERVICE_AT_SHIP_DEPOT :Service at {TOWN} Ship Depot
##id 0xA000
STR_A000_AIRPORTS :{WHITE}Airports
@@ -3049,8 +3079,6 @@
STR_A040_SELECT_CARGO_TYPE_TO_CARRY :{GOLD}Select cargo type to carry:
STR_A041_NEW_CAPACITY_COST_OF_REFIT :{BLACK}New capacity: {GOLD}{STRING1}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
STR_A042_CAN_T_REFIT_AIRCRAFT :{WHITE}Can't refit aircraft...
-STR_GO_TO_AIRPORT_HANGAR :Go to {STATION} Hangar
-SERVICE_AT_AIRPORT_HANGAR :Service at {STATION} Hangar
STR_TIMETABLE_TITLE :{WHITE}{VEHICLE} (Timetable)