(svn r1088) Strings cleanup. Renamed some strings to reflect their content.

4 files changed, 13 insertions, 13 deletions

diff --git a/intro_gui.c b/intro_gui.c
index 65f6d3fa8..cde62d1d9 100644
--- a/intro_gui.c
+++ b/intro_gui.c
@@ -22,16 +22,16 @@ static const Widget _select_game_widgets[] = {
 {    WWT_CAPTION,    13,     0,   335,     0,    13, STR_0307_OPENTTD,				STR_NULL},
 {     WWT_IMGBTN,    13,     0,   335,    14,   196, 0x0,											STR_NULL},
 { WWT_PUSHTXTBTN,    12,    10,   167,    22,    33, STR_0140_NEW_GAME,				STR_02FB_START_A_NEW_GAME},
-{ WWT_PUSHTXTBTN,    12,   168,   325,    22,    33, STR_0141_LOAD_GAME,			STR_02FC_LOAD_A_SAVED_GAME_FROM},
+{ WWT_PUSHTXTBTN,    12,   168,   325,    22,    33, STR_0141_LOAD_GAME,			STR_02FC_LOAD_A_SAVED_GAME},
 //{ WWT_PUSHTXTBTN,    12,    10,   167,   177,   188, STR_0142_TUTORIAL_DEMONSTRATION, STR_02FD_VIEW_DEMONSTRATIONS_TUTORIALS},
 { WWT_PUSHTXTBTN,    12,    10,   167,   177,   188, STR_CONFIG_PATCHES,			STR_CONFIG_PATCHES_TIP},
 { WWT_PUSHTXTBTN,    12,    10,   167,    40,    51, STR_0220_CREATE_SCENARIO,STR_02FE_CREATE_A_CUSTOMIZED_GAME},
 { WWT_PUSHTXTBTN,    12,    10,   167,   136,   147, STR_SINGLE_PLAYER,				STR_02FF_SELECT_SINGLE_PLAYER_GAME},
-{ WWT_PUSHTXTBTN,    12,   168,   325,   136,   147, STR_MULTIPLAYER,					STR_0300_SELECT_TWO_PLAYER_GAME},
+{ WWT_PUSHTXTBTN,    12,   168,   325,   136,   147, STR_MULTIPLAYER,					STR_0300_SELECT_MULTIPLAYER_GAME},
 { WWT_PUSHTXTBTN,    12,    10,   167,   159,   170, STR_0148_GAME_OPTIONS,		STR_0301_DISPLAY_GAME_OPTIONS},
 { WWT_PUSHTXTBTN,    12,   168,   325,   159,   170, STR_01FE_DIFFICULTY,			STR_0302_DISPLAY_DIFFICULTY_OPTIONS},
 { WWT_PUSHTXTBTN,    12,   168,   325,    40,    51, STR_029A_PLAY_SCENARIO,	STR_0303_START_A_NEW_GAME_USING},
-{ WWT_PUSHTXTBTN,    12,   168,   325,   177,   188, STR_0304_QUIT,						STR_0305_LEAVE_OPENTTD},
+{ WWT_PUSHTXTBTN,    12,   168,   325,   177,   188, STR_0304_QUIT,						STR_0305_QUIT_OPENTTD},
 {    WWT_PANEL_2,    12,    10,    85,    69,   122, 0x1312,									STR_030E_SELECT_TEMPERATE_LANDSCAPE},
 {    WWT_PANEL_2,    12,    90,   165,    69,   122, 0x1314,									STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE},
 {    WWT_PANEL_2,    12,   170,   245,    69,   122, 0x1316,									STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE},
diff --git a/lang/english.txt b/lang/english.txt
index cc1d46d97..cfff04405 100644
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -540,7 +540,7 @@ STR_01F5_SELECT_NEW_STYLE_MUSIC					:{BLACK}Select 'new style music' programme
 STR_01F6_SELECT_CUSTOM_1_USER_DEFINED				:{BLACK}Select 'Custom 1' (user-defined) programme
 STR_01F7_SELECT_CUSTOM_2_USER_DEFINED				:{BLACK}Select 'Custom 2' (user-defined) programme
 STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1				:{BLACK}Clear current programme (Custom1 or Custom2 only)
-STR_01F9_SAVE_MUSIC_SETTINGS_TO					:{BLACK}Save music settings to disk
+STR_01F9_SAVE_MUSIC_SETTINGS						:{BLACK}Save music settings
 STR_01FA_CLICK_ON_MUSIC_TRACK_TO				:{BLACK}Click on music track to add to current programme (Custom1 or Custom2 only)
 STR_01FB_TOGGLE_PROGRAM_SHUFFLE					:{BLACK}Toggle programme shuffle on/off
 STR_01FC_SHOW_MUSIC_TRACK_SELECTION				:{BLACK}Show music track selection window
@@ -725,9 +725,9 @@ STR_02BC_VEHICLE_DESIGN_NAMES					:{BLACK}Vehicle design names
 STR_02BD							:{BLACK}{STRING}
 STR_02BE_DEFAULT						:Default
 STR_02BF_CUSTOM							:Custom
-STR_02C0_SAVE_CUSTOM_NAMES_TO_DISK				:{BLACK}Save custom names to disk
+STR_02C0_SAVE_CUSTOM_NAMES				:{BLACK}Save custom names
 STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION				:{BLACK}Vehicle design names selection
-STR_02C2_SAVE_CUSTOMIZED_VEHICLE				:{BLACK}Save customized vehicle design names to disk
+STR_02C2_SAVE_CUSTOMIZED_VEHICLE				:{BLACK}Save customized vehicle design names
 
 ############ range for menu	starts
 STR_02C3_GAME_OPTIONS						:Game options
@@ -800,16 +800,16 @@ STR_02F8_EVERY_3_MONTHS						:Every 3 months
 STR_02F9_EVERY_6_MONTHS						:Every 6 months
 STR_02FA_EVERY_12_MONTHS					:Every 12 months
 STR_02FB_START_A_NEW_GAME					:{BLACK}Start a new game
-STR_02FC_LOAD_A_SAVED_GAME_FROM					:{BLACK}Load a saved game from disk
+STR_02FC_LOAD_A_SAVED_GAME				:{BLACK}Load a saved game
 STR_02FD_VIEW_DEMONSTRATIONS_TUTORIALS				:{BLACK}View demonstrations/tutorials
 STR_02FE_CREATE_A_CUSTOMIZED_GAME				:{BLACK}Create a customized game world/scenario
 STR_02FF_SELECT_SINGLE_PLAYER_GAME				:{BLACK}Select single-player game
-STR_0300_SELECT_TWO_PLAYER_GAME					:{BLACK}Select multiplayer game of 2-8 players
+STR_0300_SELECT_MULTIPLAYER_GAME					:{BLACK}Select multiplayer game of 2-8 players
 STR_0301_DISPLAY_GAME_OPTIONS					:{BLACK}Display game options
 STR_0302_DISPLAY_DIFFICULTY_OPTIONS				:{BLACK}Display difficulty options
-STR_0303_START_A_NEW_GAME_USING					:{BLACK}Start a new game, using a customized scenario from disk
+STR_0303_START_A_NEW_GAME_USING					:{BLACK}Start a new game, using a customized scenario
 STR_0304_QUIT							:{BLACK}Quit
-STR_0305_LEAVE_OPENTTD						:{BLACK}Leave 'OpenTTD', and quit
+STR_0305_QUIT_OPENTTD						:{BLACK}Quit 'OpenTTD'
 STR_0306_VIEW_DEMONSTRATION_TUTORIAL				:{BLACK}View demonstration/tutorial
 STR_0307_OPENTTD						:{WHITE}OpenTTD {REV}
 STR_030D_CAN_ONLY_BE_BUILT_IN_TOWNS				:{WHITE}...can only be built in towns
@@ -831,7 +831,7 @@ STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST			:{WHITE}...can only be built in rainf
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT				:{WHITE}...can only be built in desert areas
 STR_0319_PAUSED							:{YELLOW}* *  PAUSED  *  *
 
-STR_031B_SCREENSHOT_SUCCESSFULLY				:{WHITE}Screenshot successfully saved to disk as '{STRING}'
+STR_031B_SCREENSHOT_SUCCESSFULLY				:{WHITE}Screenshot successfully saved as '{STRING}'
 STR_031C_SCREENSHOT_FAILED					:{WHITE}Screenshot failed!
 
 STR_0329_PURCHASE_LAND_FOR_FUTURE				:{BLACK}Purchase land for future use
diff --git a/music_gui.c b/music_gui.c
index 3d1edc258..417035140 100644
--- a/music_gui.c
+++ b/music_gui.c
@@ -287,7 +287,7 @@ static const Widget _music_track_selection_widgets[] = {
 { WWT_PUSHIMGBTN,    14,   186,   245,    76,    83, 0x0,			STR_01F6_SELECT_CUSTOM_1_USER_DEFINED},
 { WWT_PUSHIMGBTN,    14,   186,   245,    84,    91, 0x0,			STR_01F7_SELECT_CUSTOM_2_USER_DEFINED},
 { WWT_PUSHIMGBTN,    14,   186,   245,   108,   115, 0x0,			STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1},
-{ WWT_PUSHIMGBTN,    14,   186,   245,   124,   131, 0x0,			STR_01F9_SAVE_MUSIC_SETTINGS_TO},
+{ WWT_PUSHIMGBTN,    14,   186,   245,   124,   131, 0x0,			STR_01F9_SAVE_MUSIC_SETTINGS},
 {   WIDGETS_END},
 };
 
diff --git a/settings_gui.c b/settings_gui.c
index b8dd259a5..734532ff9 100644
--- a/settings_gui.c
+++ b/settings_gui.c
@@ -229,7 +229,7 @@ static const Widget _game_options_widgets[] = {
 {      WWT_FRAME,    14,    10,   359,   194,   228, STR_02BC_VEHICLE_DESIGN_NAMES,				STR_NULL},
 {          WWT_6,    14,    20,   119,   207,   218, STR_02BD,								STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION},
 {   WWT_CLOSEBOX,    14,   108,   118,   208,   217, STR_0225,								STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION},
-{   WWT_CLOSEBOX,    14,   130,   349,   207,   218, STR_02C0_SAVE_CUSTOM_NAMES_TO_DISK,	STR_02C2_SAVE_CUSTOMIZED_VEHICLE},
+{   WWT_CLOSEBOX,    14,   130,   349,   207,   218, STR_02C0_SAVE_CUSTOM_NAMES,	STR_02C2_SAVE_CUSTOMIZED_VEHICLE},
 
 {      WWT_FRAME,    14,   190,   359,   104,   139, STR_OPTIONS_LANG,				STR_NULL},
 {          WWT_6,    14,   200,   349,   118,   129, STR_OPTIONS_LANG_CBO,		STR_OPTIONS_LANG_TIP},