From e9bc557b2a3c13ab8038d577c047813c691122dd Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 23 Jul 2009 19:31:50 +0000 Subject: (svn r16930) -Codechange: more StringID name unification and grouping --- src/lang/english.txt | 122 ++++++++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 60 deletions(-) (limited to 'src/lang/english.txt') diff --git a/src/lang/english.txt b/src/lang/english.txt index 0547e3439..d132a4071 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -154,8 +154,6 @@ STR_ABBREV_PLASTIC :{TINYFONT}PL STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ STR_ABBREV_NONE :{TINYFONT}NO STR_ABBREV_ALL :{TINYFONT}ALL -STR_DATE_SHORT_WHITE :{WHITE}{DATE_SHORT} -STR_DATE_LONG_WHITE :{WHITE}{DATE_LONG} STR_SMALLMAP_CAPTION :{WHITE}Map - {STRING} STR_GAME_OPTIONS_CAPTION :{WHITE}Game Options STR_ERROR_MESSAGE_CAPTION :{YELLOW}Message @@ -167,17 +165,11 @@ STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV} STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2009 The OpenTTD team -STR_BLACK_CROSS :{BLACK}{CROSS} -STR_SILVER_CROSS :{SILVER}{CROSS} STR_QUIT_CAPTION :{WHITE}Quit STR_YES :{BLACK}Yes STR_NO :{BLACK}No STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Are you sure you want to exit OpenTTD and return to {STRING}? -STR_BLACK_1 :{BLACK}1 -STR_BLACK_2 :{BLACK}2 -STR_BLACK_3 :{BLACK}3 -STR_BLACK_4 :{BLACK}4 -STR_BLACK_5 :{BLACK}5 + STR_JUST_NOTHING :Nothing STR_COLOUR_DARK_BLUE :Dark Blue STR_COLOUR_PALE_GREEN :Pale Green @@ -196,8 +188,6 @@ STR_COLOUR_BROWN :Brown STR_COLOUR_GREY :Grey STR_COLOUR_WHITE :White STR_ERROR_TOO_MANY_VEHICLES_IN_GAME :{WHITE}Too many vehicles in game -STR_BLACK_COMMA :{BLACK}{COMMA} -STR_RED_COMMA :{RED}{COMMA} STR_BUTTON_LOCATION :{BLACK}Location STR_SMALLMAP_TYPE_CONTOURS :Contours STR_SMALLMAP_TYPE_VEHICLES :Vehicles @@ -323,13 +313,13 @@ STR_SORT_CRITERIA_TIP :{BLACK}Select s STR_FILTER_CRITERIA_TIP :{BLACK}Select filtering criteria STR_SORT_BY :{BLACK}Sort by +### The first three are also used as 'Sort by' buttons, the rest only in dropdowns STR_SORT_BY_POPULATION :{BLACK}Population +STR_SORT_BY_NAME :{BLACK}Name +STR_SORT_BY_DATE :{BLACK}Date STR_SORT_BY_PRODUCTION :Production STR_SORT_BY_TYPE :Type STR_SORT_BY_TRANSPORTED :Transported -STR_SORT_BY_NAME :{BLACK}Name -STR_SORT_BY_DROPDOWN_NAME :Name -STR_SORT_BY_DATE :{BLACK}Date STR_SORT_BY_NUMBER :Number STR_SORT_BY_PROFIT_LAST_YEAR :Profit last year STR_SORT_BY_PROFIT_THIS_YEAR :Profit this year @@ -352,6 +342,7 @@ STR_SORT_BY_INTRO_DATE :Introduction Da STR_SORT_BY_RUNNING_COST :Running Cost STR_SORT_BY_POWER_VS_RUNNING_COST :Power/Running Cost STR_SORT_BY_CARGO_CAPACITY :Cargo Capacity + STR_NO_WAITING_CARGO :{BLACK}No cargo of any type is waiting STR_SELECT_ALL_FACILITIES :{BLACK}Select all facilities STR_SELECT_ALL_TYPES :{BLACK}Select all cargo types (including no waiting cargo) @@ -371,21 +362,6 @@ STR_SEND_ROAD_VEHICLE_TO_DEPOT :Send to Depot STR_SEND_SHIP_TO_DEPOT :Send to Depot STR_SEND_AIRCRAFT_TO_HANGAR :Send to Hangar -############ range for months starts -STR_MONTH_ABBREV_JAN :Jan -STR_MONTH_ABBREV_FEB :Feb -STR_MONTH_ABBREV_MAR :Mar -STR_MONTH_ABBREV_APR :Apr -STR_MONTH_ABBREV_MAY :May -STR_MONTH_ABBREV_JUN :Jun -STR_MONTH_ABBREV_JUL :Jul -STR_MONTH_ABBREV_AUG :Aug -STR_MONTH_ABBREV_SEP :Sep -STR_MONTH_ABBREV_OCT :Oct -STR_MONTH_ABBREV_NOV :Nov -STR_MONTH_ABBREV_DEC :Dec -############ range for months ends - STR_GRAPH_X_LABEL_MONTH :{TINYFONT}{STRING}{} {STRING} STR_GRAPH_X_LABEL_MONTH_YEAR :{TINYFONT}{STRING}{} {STRING}{}{NUM} STR_GRAPH_Y_LABEL :{TINYFONT}{STRING2}- @@ -412,8 +388,6 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Build ai STR_TOOLBAR_TOOLTIP_PLANT_TREES_PLACE_SIGNS :{BLACK}Plant trees, place signs etc. STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Land area information STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Options -STR_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} -STR_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW} STR_ERROR_CAN_T_CHANGE_SERVICING :{WHITE}Can't change servicing interval... STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Close window STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Window title - drag this to move window @@ -460,7 +434,7 @@ STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :None STR_VEHICLE_NAME_BUTTON :{BLACK}Name STR_VEHICLE_NAME_SMALL :{BLACK}{TINYFONT}{VEHICLE} -############ range for days starts +############ range for days starts (also used for the place in the highscore window) STR_ORDINAL_NUMBER_1ST :1st STR_ORDINAL_NUMBER_2ND :2nd STR_ORDINAL_NUMBER_3RD :3rd @@ -494,6 +468,34 @@ STR_ORDINAL_NUMBER_30TH :30th STR_ORDINAL_NUMBER_31ST :31st ############ range for days ends +############ range for months starts +STR_MONTH_ABBREV_JAN :Jan +STR_MONTH_ABBREV_FEB :Feb +STR_MONTH_ABBREV_MAR :Mar +STR_MONTH_ABBREV_APR :Apr +STR_MONTH_ABBREV_MAY :May +STR_MONTH_ABBREV_JUN :Jun +STR_MONTH_ABBREV_JUL :Jul +STR_MONTH_ABBREV_AUG :Aug +STR_MONTH_ABBREV_SEP :Sep +STR_MONTH_ABBREV_OCT :Oct +STR_MONTH_ABBREV_NOV :Nov +STR_MONTH_ABBREV_DEC :Dec + +STR_MONTH_JAN :January +STR_MONTH_FEB :February +STR_MONTH_MAR :March +STR_MONTH_APR :April +STR_MONTH_MAY :May +STR_MONTH_JUN :June +STR_MONTH_JUL :July +STR_MONTH_AUG :August +STR_MONTH_SEP :September +STR_MONTH_OCT :October +STR_MONTH_NOV :November +STR_MONTH_DEC :December +############ range for months ends + STR_GRAPH_Y_LABEL_NUMBER :{TINYFONT}{COMMA} STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}Cargo accepted: {LTBLUE} @@ -583,12 +585,9 @@ STR_HIGHSCORE_NAME :{BIGFONT}{PRESI STR_HIGHSCORE_STATS :{BIGFONT}'{STRING}' ({COMMA}) STR_HIGHSCORE_COMPANY_ACHIEVES_STATUS :{BLACK}{BIGFONT}{COMPANY} achieves '{STRING}' status! STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PRESIDENTNAME} of {COMPANY} achieves '{STRING}' status! -STR_BLUE_NUMBER :{BLUE}{COMMA} STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Scenario Editor STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Land Generation -STR_ARROW_UP :{BLACK}{UPARROW} -STR_ARROW_DOWN :{BLACK}{DOWNARROW} STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Increase area of land to lower/raise STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Decrease area of land to lower/raise STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Generate random land @@ -670,9 +669,7 @@ STR_OFF :Off STR_SUMMARY :Summary STR_FULL :Full STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - - -STR_BLACK_STRING :{BLACK}{STRING} -STR_CHECKMARK :{CHECKMARK} ############ range for menu starts STR_SETTINGS_MENU_GAME_OPTIONS :Game options STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Difficulty settings @@ -777,9 +774,6 @@ STR_STATUSBAR_SAVING_GAME :{RED}* * SAVI STR_SAVE_STILL_IN_PROGRESS :{WHITE}Saving still in progress,{}please wait until it is finished! STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE :{BLACK}Select 'Ezy Street style music' programme -STR_6 :{BLACK}6 -STR_7 :{BLACK}7 - ############ start of townname region STR_TOWNNAME_ORIGINAL_ENGLISH :English (Original) STR_TOWNNAME_FRENCH :French @@ -859,19 +853,6 @@ STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP :{BLACK}Addition STR_AUTOSAVE_FAILED :{WHITE}Autosave failed -STR_MONTH_JAN :January -STR_MONTH_FEB :February -STR_MONTH_MAR :March -STR_MONTH_APR :April -STR_MONTH_MAY :May -STR_MONTH_JUN :June -STR_MONTH_JUL :July -STR_MONTH_AUG :August -STR_MONTH_SEP :September -STR_MONTH_OCT :October -STR_MONTH_NOV :November -STR_MONTH_DEC :December - STR_HEADING_FOR_STATION :{LTBLUE}Heading for {STATION} STR_HEADING_FOR_STATION_VEL :{LTBLUE}Heading for {STATION}, {VELOCITY} STR_NO_ORDERS :{LTBLUE}No orders @@ -886,8 +867,6 @@ STR_CRATES :crates STR_RES_OTHER :other STR_NOTHING : -STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW} - STR_CANT_SHARE_ORDER_LIST :{WHITE}Can't share order list... STR_CANT_COPY_ORDER_LIST :{WHITE}Can't copy order list... STR_END_OF_SHARED_ORDERS :{SETX 10}- - End of Shared Orders - - @@ -1159,8 +1138,6 @@ STR_CONFIG_SETTING_MAP_Y :{LTBLUE}Y-size ############ generic strings for settings STR_CONFIG_SETTING_DISABLED :disabled -STR_CONFIG_SETTING_INT32 :{NUM} -STR_CONFIG_SETTING_CURRENCY :{CURRENCY} STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Change setting value STR_TEMPERATE_LANDSCAPE :Temperate landscape @@ -2126,8 +2103,6 @@ STR_NUM_LOW :Low STR_NUM_NORMAL :Normal STR_NUM_HIGH :High STR_NUM_CUSTOM :Custom -STR_ARROW_LEFT_SMALL :{BLACK}{SMALLLEFTARROW} -STR_ARROW_RIGHT_SMALL :{BLACK}{SMALLRIGHTARROW} STR_AI_SPEED_VERY_SLOW :Very Slow STR_AI_SPEED_SLOW :Slow STR_AI_SPEED_MEDIUM :Medium @@ -2808,7 +2783,6 @@ STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT :{WHITE}...must STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Unable to find local depot STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Force vehicle to turn around STR_ARTICULATED_RV_CAPACITY :{BLACK}Capacity: {LTBLUE} -STR_BARE_CARGO :{CARGO} STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{RAW_STRING} STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vehicle{P "" s}{RAW_STRING} STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO}) @@ -3474,7 +3448,10 @@ STR_TOWN_NAME :{TOWN} STR_VEHICLE_NAME :{VEHICLE} STR_WAYPOINT_NAME :{WAYPOINT} +STR_JUST_CARGO :{CARGO} +STR_JUST_CHECKMARK :{CHECKMARK} STR_JUST_COMMA :{COMMA} +STR_JUST_CURRENCY :{CURRENCY} STR_JUST_INT :{NUM} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_SHORT :{DATE_SHORT} @@ -3492,6 +3469,31 @@ STR_FORMAT_COMPANY_NUM :(Company {COMMA STR_FORMAT_GROUP_NAME :Group {COMMA} STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_BLACK_ARROW_DOWN :{BLACK}{DOWNARROW} +STR_BLACK_ARROW_UP :{BLACK}{UPARROW} +STR_BLACK_COMMA :{BLACK}{COMMA} +STR_BLUE_COMMA :{BLUE}{COMMA} +STR_RED_COMMA :{RED}{COMMA} +STR_BLACK_CROSS :{BLACK}{CROSS} +STR_SILVER_CROSS :{SILVER}{CROSS} +STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT} +STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG} +STR_BLACK_STRING :{BLACK}{STRING} + +STR_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} +STR_BLACK_SMALL_ARROW_DOWN :{BLACK}{SMALLDOWNARROW} +STR_TINY_RIGHT_ARROW :{TINYFONT}{RIGHTARROW} +STR_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW} +STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW} + +STR_BLACK_1 :{BLACK}1 +STR_BLACK_2 :{BLACK}2 +STR_BLACK_3 :{BLACK}3 +STR_BLACK_4 :{BLACK}4 +STR_BLACK_5 :{BLACK}5 +STR_BLACK_6 :{BLACK}6 +STR_BLACK_7 :{BLACK}7 + STR_NAME_MUST_BE_UNIQUE :{WHITE}Name must be unique #### Improved sign GUI -- cgit v1.2.3-70-g09d2