--- a/lang/american.txt	Sun Nov 14 12:37:23 2004 +0000
+++ b/lang/american.txt	Sun Nov 14 13:07:07 2004 +0000
@@ -741,8 +741,8 @@
 STR_02CC_STATION_NAMES_DISPLAYED				:{SETX 12}Station names displayed
 STR_02CD_SIGNS_DISPLAYED					:{CHECKMARK}{SETX 12}Signs displayed
 STR_02CE_SIGNS_DISPLAYED					:{SETX 12}Signs displayed
-STR_CHECKPOINTS_DISPLAYED					:{CHECKMARK}{SETX 12}Checkpoints displayed
-STR_CHECKPOINTS_DISPLAYED2					:{SETX 12}Checkpoints displayed
+STR_WAYPOINTS_DISPLAYED					:{CHECKMARK}{SETX 12}Waypoints displayed
+STR_WAYPOINTS_DISPLAYED2					:{SETX 12}Waypoints displayed
 STR_02CF_FULL_ANIMATION						:{CHECKMARK}{SETX 12}Full animation
 STR_02D0_FULL_ANIMATION						:{SETX 12}Full animation
 STR_02D1_FULL_DETAIL						:{CHECKMARK}{SETX 12}Full detail
@@ -1072,24 +1072,24 @@
 STR_CHEAT_SWITCH_CLIMATE					:{LTBLUE}Switch climate: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE						:{LTBLUE}Change date: {ORANGE} {DATE_SHORT}
 
-STR_HEADING_FOR_CHECKPOINT					:{LTBLUE}Heading for {CHECKPOINT}
-STR_HEADING_FOR_CHECKPOINT_VEL					:{LTBLUE}Heading for {CHECKPOINT}, {VELOCITY}
-
-STR_GO_TO_CHECKPOINT						:Go via {CHECKPOINT}
-
-STR_CHECKPOINTNAME_CITY						:Checkpoint {TOWN}
-STR_CHECKPOINTNAME_CITY_SERIAL					:Checkpoint {TOWN} #{COMMA16}
-STR_LANDINFO_CHECKPOINT						:Checkpoint
+STR_HEADING_FOR_WAYPOINT					:{LTBLUE}Heading for {WAYPOINT}
+STR_HEADING_FOR_WAYPOINT_VEL					:{LTBLUE}Heading for {WAYPOINT}, {VELOCITY}
 
-STR_CHECKPOINT_VIEWPORT						:{WHITE}{CHECKPOINT}
-STR_CHECKPOINT_VIEWPORT_TINY					:{TINYFONT}{WHITE}{CHECKPOINT}
-STR_CHECKPOINT_RAW						:{CHECKPOINT}
-STR_EDIT_CHECKPOINT_NAME					:{WHITE}Edit checkpoint name
+STR_GO_TO_WAYPOINT						:Go via {WAYPOINT}
 
-STR_CANT_CHANGE_CHECKPOINT_NAME					:{WHITE}Can't change checkpoint name...
-STR_CONVERT_RAIL_TO_CHECKPOINT_TIP				:{BLACK}Convert rail to checkpoint
-STR_CANT_BUILD_TRAIN_CHECKPOINT					:{WHITE}Can't build train checkpoint here...
-STR_CANT_REMOVE_TRAIN_CHECKPOINT				:{WHITE}Can't remove train checkpoint here...
+STR_WAYPOINTNAME_CITY						:Waypoint {TOWN}
+STR_WAYPOINTNAME_CITY_SERIAL					:Waypoint {TOWN} #{COMMA16}
+STR_LANDINFO_WAYPOINT						:Waypoint
+
+STR_WAYPOINT_VIEWPORT						:{WHITE}{WAYPOINT}
+STR_WAYPOINT_VIEWPORT_TINY					:{TINYFONT}{WHITE}{WAYPOINT}
+STR_WAYPOINT_RAW						:{WAYPOINT}
+STR_EDIT_WAYPOINT_NAME					:{WHITE}Edit waypoint name
+
+STR_CANT_CHANGE_WAYPOINT_NAME					:{WHITE}Can't change waypoint name...
+STR_CONVERT_RAIL_TO_WAYPOINT_TIP				:{BLACK}Convert rail to waypoint
+STR_CANT_BUILD_TRAIN_WAYPOINT					:{WHITE}Can't build train waypoint here...
+STR_CANT_REMOVE_TRAIN_WAYPOINT				:{WHITE}Can't remove train waypoint here...
 
 STR_BUILD_AUTORAIL_TIP						:{BLACK}Build railroad track using the Autorail mode