(svn r16118) -Change/cleanup: remove the hexadecimal 'in TTD the string had this ID' from 'some' strings and replace the string name with something more sensible.

1 files changed, 57 insertions, 57 deletions

diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 2693c31a2..2ec595ba5 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -25,21 +25,21 @@
 #include "table/sprites.h"
 
 static const Widget _smallmap_widgets[] = {
-{  WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_BROWN,     0,    10,     0,    13, STR_00C5,                 STR_018B_CLOSE_WINDOW},
-{   WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_BROWN,    11,   337,     0,    13, STR_00B0_MAP,             STR_018C_WINDOW_TITLE_DRAG_THIS},
+{  WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_BROWN,     0,    10,     0,    13, STR_BLACK_CROSS,          STR_TOOLTIP_CLOSE_WINDOW},
+{   WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_BROWN,    11,   337,     0,    13, STR_SMALLMAP_CAPTION,     STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
 { WWT_STICKYBOX,     RESIZE_LR,  COLOUR_BROWN,   338,   349,     0,    13, 0x0,                      STR_STICKY_BUTTON},
 {     WWT_PANEL,     RESIZE_RB,  COLOUR_BROWN,     0,   349,    14,   157, 0x0,                      STR_NULL},
 {     WWT_INSET,     RESIZE_RB,  COLOUR_BROWN,     2,   347,    16,   155, 0x0,                      STR_NULL},
 {     WWT_PANEL,    RESIZE_RTB,  COLOUR_BROWN,     0,   261,   158,   201, 0x0,                      STR_NULL},
 {     WWT_PANEL,   RESIZE_LRTB,  COLOUR_BROWN,   262,   349,   158,   158, 0x0,                      STR_NULL},
-{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   284,   305,   158,   179, SPR_IMG_SHOW_COUNTOURS,   STR_0191_SHOW_LAND_CONTOURS_ON_MAP},
-{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   306,   327,   158,   179, SPR_IMG_SHOW_VEHICLES,    STR_0192_SHOW_VEHICLES_ON_MAP},
-{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   328,   349,   158,   179, SPR_IMG_INDUSTRY,         STR_0193_SHOW_INDUSTRIES_ON_MAP},
-{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   284,   305,   180,   201, SPR_IMG_SHOW_ROUTES,      STR_0194_SHOW_TRANSPORT_ROUTES_ON},
-{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   306,   327,   180,   201, SPR_IMG_PLANTTREES,       STR_0195_SHOW_VEGETATION_ON_MAP},
-{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   328,   349,   180,   201, SPR_IMG_COMPANY_GENERAL,  STR_0196_SHOW_LAND_OWNERS_ON_MAP},
+{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   284,   305,   158,   179, SPR_IMG_SHOW_COUNTOURS,   STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP},
+{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   306,   327,   158,   179, SPR_IMG_SHOW_VEHICLES,    STR_SMALLMAP_TOOLTIP_SHOW_VEHICLES_ON_MAP},
+{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   328,   349,   158,   179, SPR_IMG_INDUSTRY,         STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRIES_ON_MAP},
+{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   284,   305,   180,   201, SPR_IMG_SHOW_ROUTES,      STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON},
+{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   306,   327,   180,   201, SPR_IMG_PLANTTREES,       STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP},
+{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   328,   349,   180,   201, SPR_IMG_COMPANY_GENERAL,  STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP},
 {    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   262,   283,   158,   179, SPR_IMG_SMALLMAP,         STR_SMALLMAP_CENTER},
-{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   262,   283,   180,   201, SPR_IMG_TOWN,             STR_0197_TOGGLE_TOWN_NAMES_ON_OFF},
+{    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   262,   283,   180,   201, SPR_IMG_TOWN,             STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF},
 {     WWT_PANEL,    RESIZE_RTB,  COLOUR_BROWN,     0,   337,   202,   213, 0x0,                      STR_NULL},
 {   WWT_TEXTBTN,     RESIZE_TB,  COLOUR_BROWN,     0,    99,   202,   213, STR_MESSAGES_ENABLE_ALL,  STR_NULL},
 {   WWT_TEXTBTN,     RESIZE_TB,  COLOUR_BROWN,   100,   201,   202,   213, STR_MESSAGES_DISABLE_ALL, STR_NULL},
@@ -70,64 +70,64 @@ struct LegendAndColour {
 
 /** Legend text giving the colours to look for on the minimap */
 static const LegendAndColour _legend_land_contours[] = {
-	MK(0x5A, STR_00F0_100M),
-	MK(0x5C, STR_00F1_200M),
-	MK(0x5E, STR_00F2_300M),
-	MK(0x1F, STR_00F3_400M),
-	MK(0x27, STR_00F4_500M),
-
-	MS(0xD7, STR_00EB_ROADS),
-	MK(0x0A, STR_00EC_RAILROADS),
-	MK(0x98, STR_00ED_STATIONS_AIRPORTS_DOCKS),
-	MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES),
-	MK(0x0F, STR_00EF_VEHICLES),
+	MK(0x5A, STR_SMALLMAP_LEGENDA_100M),
+	MK(0x5C, STR_SMALLMAP_LEGENDA_200M),
+	MK(0x5E, STR_SMALLMAP_LEGENDA_300M),
+	MK(0x1F, STR_SMALLMAP_LEGENDA_400M),
+	MK(0x27, STR_SMALLMAP_LEGENDA_500M),
+
+	MS(0xD7, STR_SMALLMAP_LEGENDA_ROADS),
+	MK(0x0A, STR_SMALLMAP_LEGENDA_RAILROADS),
+	MK(0x98, STR_SMALLMAP_LEGENDA_STATIONS_AIRPORTS_DOCKS),
+	MK(0xB5, STR_SMALLMAP_LEGENDA_BUILDINGS_INDUSTRIES),
+	MK(0x0F, STR_SMALLMAP_LEGENDA_VEHICLES),
 	MKEND()
 };
 
 static const LegendAndColour _legend_vehicles[] = {
-	MK(0xB8, STR_00F5_TRAINS),
-	MK(0xBF, STR_00F6_ROAD_VEHICLES),
-	MK(0x98, STR_00F7_SHIPS),
-	MK(0x0F, STR_00F8_AIRCRAFT),
-	MS(0xD7, STR_00F9_TRANSPORT_ROUTES),
-	MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES),
+	MK(0xB8, STR_SMALLMAP_LEGENDA_TRAINS),
+	MK(0xBF, STR_SMALLMAP_LEGENDA_ROAD_VEHICLES),
+	MK(0x98, STR_SMALLMAP_LEGENDA_SHIPS),
+	MK(0x0F, STR_SMALLMAP_LEGENDA_AIRCRAFT),
+	MS(0xD7, STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES),
+	MK(0xB5, STR_SMALLMAP_LEGENDA_BUILDINGS_INDUSTRIES),
 	MKEND()
 };
 
 static const LegendAndColour _legend_routes[] = {
-	MK(0xD7, STR_00EB_ROADS),
-	MK(0x0A, STR_00EC_RAILROADS),
-	MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES),
-	MS(0x56, STR_011B_RAILROAD_STATION),
-
-	MK(0xC2, STR_011C_TRUCK_LOADING_BAY),
-	MK(0xBF, STR_011D_BUS_STATION),
-	MK(0xB8, STR_011E_AIRPORT_HELIPORT),
-	MK(0x98, STR_011F_DOCK),
+	MK(0xD7, STR_SMALLMAP_LEGENDA_ROADS),
+	MK(0x0A, STR_SMALLMAP_LEGENDA_RAILROADS),
+	MK(0xB5, STR_SMALLMAP_LEGENDA_BUILDINGS_INDUSTRIES),
+	MS(0x56, STR_SMALLMAP_LEGENDA_RAILROAD_STATION),
+
+	MK(0xC2, STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY),
+	MK(0xBF, STR_SMALLMAP_LEGENDA_BUS_STATION),
+	MK(0xB8, STR_SMALLMAP_LEGENDA_AIRPORT_HELIPORT),
+	MK(0x98, STR_SMALLMAP_LEGENDA_DOCK),
 	MKEND()
 };
 
 static const LegendAndColour _legend_vegetation[] = {
-	MK(0x52, STR_0120_ROUGH_LAND),
-	MK(0x54, STR_0121_GRASS_LAND),
-	MK(0x37, STR_0122_BARE_LAND),
-	MK(0x25, STR_0123_FIELDS),
-	MK(0x57, STR_0124_TREES),
-	MK(0xD0, STR_00FC_FOREST),
-	MS(0x0A, STR_0125_ROCKS),
-
-	MK(0xC2, STR_012A_DESERT),
-	MK(0x98, STR_012B_SNOW),
-	MK(0xD7, STR_00F9_TRANSPORT_ROUTES),
-	MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES),
+	MK(0x52, STR_SMALLMAP_LEGENDA_ROUGH_LAND),
+	MK(0x54, STR_SMALLMAP_LEGENDA_GRASS_LAND),
+	MK(0x37, STR_SMALLMAP_LEGENDA_BARE_LAND),
+	MK(0x25, STR_SMALLMAP_LEGENDA_FIELDS),
+	MK(0x57, STR_SMALLMAP_LEGENDA_TREES),
+	MK(0xD0, STR_SMALLMAP_LEGENDA_FOREST),
+	MS(0x0A, STR_SMALLMAP_LEGENDA_ROCKS),
+
+	MK(0xC2, STR_SMALLMAP_LEGENDA_DESERT),
+	MK(0x98, STR_SMALLMAP_LEGENDA_SNOW),
+	MK(0xD7, STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES),
+	MK(0xB5, STR_SMALLMAP_LEGENDA_BUILDINGS_INDUSTRIES),
 	MKEND()
 };
 
 static const LegendAndColour _legend_land_owners[] = {
-	MK(0xCA, STR_0126_WATER),
-	MK(0x54, STR_0127_NO_OWNER),
-	MK(0xB4, STR_0128_TOWNS),
-	MK(0x20, STR_0129_INDUSTRIES),
+	MK(0xCA, STR_SMALLMAP_LEGENDA_WATER),
+	MK(0x54, STR_SMALLMAP_LEGENDA_NO_OWNER),
+	MK(0xB4, STR_SMALLMAP_LEGENDA_TOWNS),
+	MK(0x20, STR_SMALLMAP_LEGENDA_INDUSTRIES),
 	MKEND()
 };
 #undef MK
@@ -738,7 +738,7 @@ public:
 						y < dpi->top + dpi->height) {
 					/* And draw it. */
 					SetDParam(0, t->index);
-					DrawString(x, x + t->sign.width_2, y, STR_2056, TC_WHITE);
+					DrawString(x, x + t->sign.width_2, y, STR_SMALLMAP_TOWN, TC_WHITE);
 				}
 			}
 		}
@@ -831,7 +831,7 @@ public:
 		this->SetWidgetHiddenState(SM_WIDGET_DISABLEINDUSTRIES, this->map_type != SMT_INDUSTRY);
 
 		/* draw the window */
-		SetDParam(0, STR_00E5_CONTOURS + this->map_type);
+		SetDParam(0, STR_SMALLMAP_TYPE_CONTOURS + this->map_type);
 		this->DrawWidgets();
 
 		const Widget *legend = &this->widget[SM_WIDGET_LEGEND];
@@ -1069,13 +1069,13 @@ void ShowSmallMap()
 
 /* Extra ViewPort Window Stuff */
 static const Widget _extra_view_port_widgets[] = {
-{   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,    0,   13, STR_00C5,                         STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   287,    0,   13, STR_EXTRA_VIEW_PORT_TITLE,        STR_018C_WINDOW_TITLE_DRAG_THIS},
+{   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,    0,   13, STR_BLACK_CROSS,                  STR_TOOLTIP_CLOSE_WINDOW},
+{    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   287,    0,   13, STR_EXTRA_VIEW_PORT_TITLE,        STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
 {  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   288,   299,    0,   13, 0x0,                              STR_STICKY_BUTTON},
 {      WWT_PANEL,     RESIZE_RB,  COLOUR_GREY,     0,   299,   14,   33, 0x0,                              STR_NULL},
 {      WWT_INSET,     RESIZE_RB,  COLOUR_GREY,     2,   297,   16,   31, 0x0,                              STR_NULL},
-{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,     0,    21,   34,   55, SPR_IMG_ZOOMIN,                   STR_017F_ZOOM_THE_VIEW_IN},
-{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,    22,    43,   34,   55, SPR_IMG_ZOOMOUT,                  STR_0180_ZOOM_THE_VIEW_OUT},
+{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,     0,    21,   34,   55, SPR_IMG_ZOOMIN,                   STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN},
+{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,    22,    43,   34,   55, SPR_IMG_ZOOMOUT,                  STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT},
 { WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,    44,   171,   34,   55, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT},
 { WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,   172,   298,   34,   55, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT},
 {      WWT_PANEL,    RESIZE_RTB,  COLOUR_GREY,   299,   299,   34,   55, 0x0,                              STR_NULL},