From ed8e6afb6fde489404a80e288ad1c7ebb714ed87 Mon Sep 17 00:00:00 2001 From: Ted John Date: Fri, 18 Dec 2015 04:00:17 +0000 Subject: [PATCH] Merge Localisation/master into OpenRCT2/develop. --- data/language/english_us.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/language/english_us.txt b/data/language/english_us.txt index 5e25bea092..77afcef7f5 100644 --- a/data/language/english_us.txt +++ b/data/language/english_us.txt @@ -2689,7 +2689,7 @@ STR_2680 :All research complete STR_2681 :{MEDIUMFONT}{BLACK}Increases your money by {CURRENCY} STR_2682 : STR_2683 : -STR_2684 :{SMALLFONT}{BLACK}Large group of peeps arrive +STR_2684 :{SMALLFONT}{BLACK}Large group of guests arrive STR_2685 :Simplex Noise Parameters STR_2686 :{WINDOW_COLOUR_2}Low: STR_2687 :{WINDOW_COLOUR_2}High: @@ -3505,13 +3505,13 @@ STR_5161 :Date Format: STR_5162 :Day/Month/Year STR_5163 :Month/Day/Year STR_5164 :Twitch Channel name -STR_5165 :Name peeps after followers -STR_5166 :{SMALLFONT}{BLACK}Will name peeps after channel's Twitch followers -STR_5167 :Track follower peeps +STR_5165 :Name guests after followers +STR_5166 :{SMALLFONT}{BLACK}Will name guests after channel's Twitch followers +STR_5167 :Track follower guests STR_5168 :{SMALLFONT}{BLACK}Will turn on tracking information for guests named after channel's Twitch followers -STR_5169 :Name peeps after people in Twitch chat -STR_5170 :{SMALLFONT}{BLACK}Will name peeps after people in Twitch chat -STR_5171 :Track chat peeps +STR_5169 :Name guests after people in Twitch chat +STR_5170 :{SMALLFONT}{BLACK}Will name guests after people in Twitch chat +STR_5171 :Track chat guests STR_5172 :{SMALLFONT}{BLACK}Will turn on tracking information for guests named after Twitch chat participants STR_5173 :Pull Twitch chat as news STR_5174 :{SMALLFONT}{BLACK}Will use Twitch chat messages preceded by !news for in game notifications @@ -3571,7 +3571,7 @@ STR_5227 :Save Overwrite Prompt STR_5228 :{SMALLFONT}{BLACK}Main UI STR_5229 :{SMALLFONT}{BLACK}Park STR_5230 :{SMALLFONT}{BLACK}Tools -STR_5231 :{SMALLFONT}{BLACK}Rides and Peeps +STR_5231 :{SMALLFONT}{BLACK}Rides and Guests STR_5232 :{SMALLFONT}{BLACK}Editors STR_5233 :{SMALLFONT}{BLACK}Miscellaneous STR_5234 :{SMALLFONT}{BLACK}Prompts