--- a/src/lang/american.txt Sat Oct 06 21:16:00 2007 +0000
+++ b/src/lang/american.txt Mon Dec 03 23:39:38 2007 +0000
@@ -860,6 +860,7 @@
STR_0314_FUND_NEW_INDUSTRY :{WHITE}Fund new industry
STR_JUST_STRING :{STRING}
+STR_JUST_INT :{NUM}
STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...can only be built in towns
STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...can only be built in rainforest areas
STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...can only be built in desert areas
@@ -1047,6 +1048,8 @@
STR_CONFIG_PATCHES_ROADVEH_QUEUE :{LTBLUE}Road vehicle queueing (with quantum effects): {ORANGE}{STRING}
STR_CONFIG_PATCHES_AUTOSCROLL :{LTBLUE}Pan window when mouse is at the edge: {ORANGE}{STRING}
STR_CONFIG_PATCHES_BRIBE :{LTBLUE}Allow bribing of the local authority: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Allow buying exclusive transport rights: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Allow sending money to other companies: {ORANGE}{STRING}
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Nonuniform stations: {ORANGE}{STRING}
STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL :{LTBLUE}New global pathfinding (NPF, overrides NTP): {ORANGE}{STRING}
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Weight multiplier for freight to simulate heavy trains: {ORANGE}{STRING}
@@ -1187,6 +1190,7 @@
STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Proportion of towns that will grow twice as fast: {ORANGE}1 in {STRING}
STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Proportion of towns that will grow twice as fast: {ORANGE}None
STR_CONFIG_PATCHES_CITY_SIZE_MULTIPLIER :{LTBLUE}Initial city size multiplier: {ORANGE}{STRING}
+STR_CONFIG_MODIFIED_ROAD_REBUILD :{LTBLUE}Remove absurd road-elements during the road construction
STR_CONFIG_PATCHES_GUI :{BLACK}Interface
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Construction
@@ -1996,9 +2000,9 @@
STR_482F_COST :{BLACK}Cost: {YELLOW}{CURRENCY}
STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY :{WHITE}Can't construct this industry type here...
STR_4831_FOREST_CAN_ONLY_BE_PLANTED :{WHITE}...forest can only be planted above snow-line
-STR_4832_ANNOUNCES_IMMINENT_CLOSURE :{BLACK}{BIGFONT}{INDUSTRY} announces imminent closure!
-STR_4833_SUPPLY_PROBLEMS_CAUSE_TO :{BLACK}{BIGFONT}Supply problems cause {INDUSTRY} to announce imminent closure!
-STR_4834_LACK_OF_NEARBY_TREES_CAUSES :{BLACK}{BIGFONT}Lack of nearby trees causes {INDUSTRY} to announce imminent closure!
+STR_4832_ANNOUNCES_IMMINENT_CLOSURE :{BLACK}{BIGFONT}{STRING} announces imminent closure!
+STR_4833_SUPPLY_PROBLEMS_CAUSE_TO :{BLACK}{BIGFONT}Supply problems cause {STRING} to announce imminent closure!
+STR_4834_LACK_OF_NEARBY_TREES_CAUSES :{BLACK}{BIGFONT}Lack of nearby trees causes {STRING} to announce imminent closure!
STR_4835_INCREASES_PRODUCTION :{BLACK}{BIGFONT}{INDUSTRY} increases production!
STR_4836_NEW_COAL_SEAM_FOUND_AT :{BLACK}{BIGFONT}New coal seam found at {INDUSTRY}!{}Production is expected to double!
STR_4837_NEW_OIL_RESERVES_FOUND :{BLACK}{BIGFONT}New oil reserves found at {INDUSTRY}!{}Production is expected to double!
@@ -2017,6 +2021,8 @@
STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Must demolish tunnel first
STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Must demolish bridge first
STR_5008_CANNOT_START_AND_END_ON :{WHITE}Cannot start and end on same position
+STR_BRIDGEHEADS_NOT_SAME_HEIGHT :{WHITE}Bridge heads not at the same level
+STR_BRIDGE_TOO_LOW_FOR_TERRAIN :{WHITE}Bridge is too low for the terrain
STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Start and end must be in line
STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Site unsuitable for tunnel entrance
STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
@@ -2296,7 +2302,7 @@
STR_RELOCATE_HQ :{BLACK}Relocate HQ
STR_COMPANY_PASSWORD :{BLACK}Password
STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Password-protect your company to prevent unauthorized users from joining.
-STR_SET_COMPANY_PASSWORD :Set company password
+STR_SET_COMPANY_PASSWORD :{BLACK}Set company password
STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}World Recession!{}{}Financial experts fear worst as economy slumps!
STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Recession Over!{}{}Upturn in trade gives confidence to industries as economy strengthens!
STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Toggle large/small window size
@@ -2308,7 +2314,6 @@
STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Can't buy 25% share in this company...
STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Can't sell 25% share in this company...
STR_707D_OWNED_BY :{WHITE}({COMMA}% owned by {COMPANY})
-STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% owned by {COMPANY}{} {COMMA}% owned by {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} has been taken over by {COMPANY}!
STR_7080_PROTECTED :{WHITE}This company is not old enough to trade shares yet...
@@ -2777,6 +2782,8 @@
STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}New {STRING} now available! - {ENGINE}
+STR_CAN_T_SELL_DESTROYED_VEHICLE :{WHITE}Can't sell destroyed vehicle...
+
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Can't timetable vehicle...
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Vehicles can only wait at stations.
STR_TIMETABLE_NOT_STOPPING_HERE :{WHITE}This vehicle is not stopping at this station.
@@ -3380,3 +3387,51 @@
STR_PROSPECT_NEW_INDUSTRY :{BLACK}Prospect
STR_BUILD_NEW_INDUSTRY :{BLACK}Build
STR_INDUSTRY_SELECTION_HINT :{BLACK}Choose the appropriate industry from this list
+
+############ Face formatting
+STR_FACE_ADVANCED :{BLACK}Advanced
+STR_FACE_ADVANCED_TIP :{BLACK}Advanced face selection.
+STR_FACE_SIMPLE :{BLACK}Simple
+STR_FACE_SIMPLE_TIP :{BLACK}Simple face selection.
+STR_FACE_LOAD :{BLACK}Load
+STR_FACE_LOAD_TIP :{BLACK}Load favorite face
+STR_FACE_LOAD_DONE :{WHITE}Your favorite face has been loaded from the OpenTTD config file.
+STR_FACE_FACECODE :{BLACK}Player face no.
+STR_FACE_FACECODE_TIP :{BLACK}View and/or set player face number
+STR_FACE_FACECODE_CAPTION :{WHITE}View and/or set player face number
+STR_FACE_FACECODE_SET :{WHITE}New face number code has been set.
+STR_FACE_FACECODE_ERR :{WHITE}Couldn't set player face number - must be numeric between 0 and 4,294,967,295!
+STR_FACE_SAVE :{BLACK}Save
+STR_FACE_SAVE_TIP :{BLACK}Save favorite face
+STR_FACE_SAVE_DONE :{WHITE}This face will be saved as your favorite in the OpenTTD config file.
+STR_FACE_EUROPEAN :{BLACK}European
+STR_FACE_SELECT_EUROPEAN :{BLACK}Select European faces
+STR_FACE_AFRICAN :{BLACK}African
+STR_FACE_SELECT_AFRICAN :{BLACK}Select African faces
+STR_FACE_YES :Yes
+STR_FACE_NO :No
+STR_FACE_MOUSTACHE_EARRING_TIP :{BLACK}Enable mustache or earring
+STR_FACE_HAIR :Hair:
+STR_FACE_HAIR_TIP :{BLACK}Change hair
+STR_FACE_EYEBROWS :Eyebrows:
+STR_FACE_EYEBROWS_TIP :{BLACK}Change eyebrows
+STR_FACE_EYECOLOUR :Eye color:
+STR_FACE_EYECOLOUR_TIP :{BLACK}Change eyecolor
+STR_FACE_GLASSES :Glasses:
+STR_FACE_GLASSES_TIP :{BLACK}Enable glasses
+STR_FACE_GLASSES_TIP_2 :{BLACK}Change glasses
+STR_FACE_NOSE :Nose:
+STR_FACE_NOSE_TIP :{BLACK}Change nose
+STR_FACE_LIPS :Lips:
+STR_FACE_MOUSTACHE :Mustache:
+STR_FACE_LIPS_MOUSTACHE_TIP :{BLACK}Change lips or mustache
+STR_FACE_CHIN :Chin:
+STR_FACE_CHIN_TIP :{BLACK}Change chin
+STR_FACE_JACKET :Jacket:
+STR_FACE_JACKET_TIP :{BLACK}Change jacket
+STR_FACE_COLLAR :Collar:
+STR_FACE_COLLAR_TIP :{BLACK}Change collar
+STR_FACE_TIE :Tie:
+STR_FACE_EARRING :Earring:
+STR_FACE_TIE_EARRING_TIP :{BLACK}Change tie or earring
+########