--- a/src/lang/english.txt	Sat Mar 22 10:56:08 2008 +0000
+++ b/src/lang/english.txt	Sat Mar 22 11:27:46 2008 +0000
@@ -1715,6 +1715,7 @@
 STR_2002_WHITE                                                  :{TINYFONT}{WHITE}{SIGN}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Building must be demolished first
 STR_2005                                                        :{WHITE}{TOWN}
+STR_CITY                                                        :{WHITE}{TOWN} (City)
 STR_2006_POPULATION                                             :{BLACK}Population: {ORANGE}{COMMA}{BLACK}  Houses: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Rename Town
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Can't rename town...

--- a/src/town_gui.cpp	Sat Mar 22 10:56:08 2008 +0000
+++ b/src/town_gui.cpp	Sat Mar 22 11:27:46 2008 +0000
@@ -275,6 +275,10 @@
 	Town *t = GetTown(w->window_number);
 
 	switch (e->event) {
+	case WE_CREATE:
+		if (t->larger_town) w->widget[1].data = STR_CITY;
+		break;
+
 	case WE_PAINT:
 		/* disable renaming town in network games if you are not the server */
 		w->SetWidgetDisabledState(8, _networking && !_network_server);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/yapf/follow_track.cpp	Sat Mar 22 11:27:46 2008 +0000
@@ -0,0 +1,47 @@
+/* $Id$ */
+
+#include "../stdafx.h"
+#include "yapf.hpp"
+#include "follow_track.hpp"
+
+void FollowTrackInit(FollowTrack_t *This, const Vehicle* v)
+{
+	CFollowTrackWater& F = *(CFollowTrackWater*) This;
+	F.Init(v, NULL);
+}
+
+bool FollowTrackWater(FollowTrack_t *This, TileIndex old_tile, Trackdir old_td)
+{
+	CFollowTrackWater& F = *(CFollowTrackWater*) This;
+	return F.Follow(old_tile, old_td);
+}
+
+bool FollowTrackRoad(FollowTrack_t *This, TileIndex old_tile, Trackdir old_td)
+{
+	CFollowTrackRoad& F = *(CFollowTrackRoad*) This;
+	return F.Follow(old_tile, old_td);
+}
+
+bool FollowTrackRail(FollowTrack_t *This, TileIndex old_tile, Trackdir old_td)
+{
+	CFollowTrackRail& F = *(CFollowTrackRail*) This;
+	return F.Follow(old_tile, old_td);
+}
+
+bool FollowTrackWaterNo90(FollowTrack_t *This, TileIndex old_tile, Trackdir old_td)
+{
+	CFollowTrackWaterNo90& F = *(CFollowTrackWaterNo90*) This;
+	return F.Follow(old_tile, old_td);
+}
+
+bool FollowTrackRoadNo90(FollowTrack_t *This, TileIndex old_tile, Trackdir old_td)
+{
+	CFollowTrackRoadNo90& F = *(CFollowTrackRoadNo90*) This;
+	return F.Follow(old_tile, old_td);
+}
+
+bool FollowTrackRailNo90(FollowTrack_t *This, TileIndex old_tile, Trackdir old_td)
+{
+	CFollowTrackRailNo90& F = *(CFollowTrackRailNo90*) This;
+	return F.Follow(old_tile, old_td);
+}