diff options
author | rubidium <rubidium@openttd.org> | 2009-07-23 19:31:50 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-07-23 19:31:50 +0000 |
commit | e9bc557b2a3c13ab8038d577c047813c691122dd (patch) | |
tree | 70792ef1ccec63af813dd750920ba9d86a0febd2 /src/lang/english_US.txt | |
parent | 20c1e42be128c915087b0ecf081b3101bcec234e (diff) | |
download | openttd-e9bc557b2a3c13ab8038d577c047813c691122dd.tar.xz |
(svn r16930) -Codechange: more StringID name unification and grouping
Diffstat (limited to 'src/lang/english_US.txt')
-rw-r--r-- | src/lang/english_US.txt | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index ceb91ee9b..32b3842bd 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -154,8 +154,8 @@ 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_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT} +STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG} STR_SMALLMAP_CAPTION :{WHITE}Map - {STRING} STR_GAME_OPTIONS_CAPTION :{WHITE}Game Options STR_ERROR_MESSAGE_CAPTION :{YELLOW}Message @@ -328,7 +328,6 @@ 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 @@ -412,8 +411,8 @@ 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_BLACK_SMALL_ARROW_UP :{BLACK}{SMALLUPARROW} +STR_BLACK_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 @@ -583,12 +582,12 @@ 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_BLUE_COMMA :{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_BLACK_ARROW_UP :{BLACK}{UPARROW} +STR_BLACK_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 @@ -672,7 +671,7 @@ STR_FULL :Full STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - - STR_BLACK_STRING :{BLACK}{STRING} -STR_CHECKMARK :{CHECKMARK} +STR_JUST_CHECKMARK :{CHECKMARK} ############ range for menu starts STR_SETTINGS_MENU_GAME_OPTIONS :Game options STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Difficulty settings @@ -777,8 +776,8 @@ 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' program -STR_6 :{BLACK}6 -STR_7 :{BLACK}7 +STR_BLACK_6 :{BLACK}6 +STR_BLACK_7 :{BLACK}7 ############ start of townname region STR_TOWNNAME_ORIGINAL_ENGLISH :English (Original) @@ -886,7 +885,7 @@ STR_CRATES :crates STR_RES_OTHER :other STR_NOTHING : -STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW} +STR_TINY_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... @@ -1159,8 +1158,7 @@ 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_JUST_CURRENCY :{CURRENCY} STR_CONFIG_SETTING_QUERY_CAPT :{WHITE}Change setting value STR_TEMPERATE_LANDSCAPE :Temperate landscape @@ -2126,8 +2124,8 @@ 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_BLACK_SMALL_ARROW_LEFT :{BLACK}{SMALLLEFTARROW} +STR_BLACK_SMALL_ARROW_RIGHT :{BLACK}{SMALLRIGHTARROW} STR_AI_SPEED_VERY_SLOW :Very Slow STR_AI_SPEED_SLOW :Slow STR_AI_SPEED_MEDIUM :Medium @@ -2808,7 +2806,7 @@ 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_JUST_CARGO :{CARGO} STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}{STRING} STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} vehicle{P "" s}{STRING} STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO} ({SHORTCARGO}) |