Merge branch 'master' into jgrpp

# Conflicts: # src/lang/afrikaans.txt # src/lang/basque.txt # src/lang/belarusian.txt # src/lang/brazilian_portuguese.txt # src/lang/bulgarian.txt # src/lang/catalan.txt # src/lang/croatian.txt # src/lang/czech.txt # src/lang/danish.txt # src/lang/dutch.txt # src/lang/english.txt # src/lang/english_AU.txt # src/lang/english_US.txt # src/lang/estonian.txt # src/lang/finnish.txt # src/lang/french.txt # src/lang/gaelic.txt # src/lang/galician.txt # src/lang/german.txt # src/lang/greek.txt # src/lang/hebrew.txt # src/lang/hungarian.txt # src/lang/icelandic.txt # src/lang/indonesian.txt # src/lang/irish.txt # src/lang/italian.txt # src/lang/japanese.txt # src/lang/korean.txt # src/lang/latin.txt # src/lang/latvian.txt # src/lang/lithuanian.txt # src/lang/luxembourgish.txt # src/lang/norwegian_bokmal.txt # src/lang/norwegian_nynorsk.txt # src/lang/polish.txt # src/lang/portuguese.txt # src/lang/romanian.txt # src/lang/russian.txt # src/lang/serbian.txt # src/lang/simplified_chinese.txt # src/lang/slovak.txt # src/lang/slovenian.txt # src/lang/spanish.txt # src/lang/spanish_MX.txt # src/lang/swedish.txt # src/lang/tamil.txt # src/lang/thai.txt # src/lang/traditional_chinese.txt # src/lang/turkish.txt # src/lang/ukrainian.txt # src/lang/unfinished/persian.txt # src/lang/vietnamese.txt # src/lang/welsh.txt # src/rail_cmd.cpp # src/station_cmd.cpp
2019-02-19 19:36:30 +00:00
parent a695dcd331 ba55f93f41
commit 36ac643749
75 changed files with 540 additions and 560 deletions
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,8 +1,8 @@
-1.9.0-beta2 (2018-02-09)
+1.9.0-beta2 (2019-02-09)
 ------------------------------------------------------------------------
 - Fix: Non-Windows builds did not get correct git hash

-1.9.0-beta1 (2018-02-09)
+1.9.0-beta1 (2019-02-09)
 ------------------------------------------------------------------------
 Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbers have been replaced with Pull Requests and Issue numbers
 - Feature: Group liveries, and livery window usability enhancements (#7108)
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -1488,7 +1488,7 @@ struct BuildVehicleWindow : Window {
 		this->GenerateBuildList();
 		this->vscroll->SetCount(this->eng_list.Length());

-		this->SetWidgetDisabledState(WID_BV_SHOW_HIDE, this->sel_engine == INVALID_ENGINE);
+		this->SetWidgetsDisabledState(this->sel_engine == INVALID_ENGINE, WID_BV_SHOW_HIDE, WID_BV_BUILD, WID_BV_RENAME, WIDGET_LIST_END);

 		// disable build and refit if all or none cargo type selected
 		if (this->cargo_filter[this->cargo_filter_criteria] == CF_ANY || this->cargo_filter[this->cargo_filter_criteria] == CF_NONE) {
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -319,7 +319,7 @@ Group::~Group()
 * @param tile unused
 * @param flags type of operation
 * @param p1   vehicle type
- * @param p2   unused
+ * @param p2   parent groupid
 * @param text unused
 * @return the cost of this operation or an error
 */
@@ -330,15 +330,27 @@ CommandCost CmdCreateGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3

 	if (!Group::CanAllocateItem()) return CMD_ERROR;

+	const Group *pg = Group::GetIfValid(GB(p2, 0, 16));
+	if (pg != NULL) {
+		if (pg->owner != _current_company) return CMD_ERROR;
+		if (pg->vehicle_type != vt) return CMD_ERROR;
+	}
+
 	if (flags & DC_EXEC) {
 		Group *g = new Group(_current_company);
 		g->replace_protection = false;
 		g->vehicle_type = vt;
 		g->parent = INVALID_GROUP;

+		if (pg == NULL) {
 			const Company *c = Company::Get(_current_company);
 			g->livery.colour1 = c->livery[LS_DEFAULT].colour1;
 			g->livery.colour2 = c->livery[LS_DEFAULT].colour2;
+		} else {
+			g->parent = pg->index;
+			g->livery.colour1 = pg->livery.colour1;
+			g->livery.colour2 = pg->livery.colour2;
+		}

 		_new_group_id = g->index;

--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -776,7 +776,7 @@ public:
 			}

 			case WID_GL_CREATE_GROUP: { // Create a new group
-				DoCommandP(0, this->vli.vtype, 0, CMD_CREATE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_CREATE), CcCreateGroup);
+				DoCommandP(0, this->vli.vtype, this->vli.index, CMD_CREATE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_CREATE), CcCreateGroup);
 				break;
 			}

--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -2062,9 +2062,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Verskaff
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Maatskappy is beskerm. Voer wagwoord in

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klient Lys
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Toeskou
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nuwe maatskapy
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Klient Lys
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Toeskou
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nuwe maatskapy

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Skop
@@ -2077,8 +2077,6 @@ STR_NETWORK_SERVER                                              :Verskaffer
 STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Aanskouers

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Toeskouer
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Moenie die ingesleutelde wagwoord bewaar nie
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Gee die maatskappy die nuwe wagwoord
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -1726,9 +1726,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}الخا
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}الشركه محميه. من فضلك ادخل كلمه المرور

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}قائمة العملاء
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}شاهد
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}شركة جديدة
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :قائمة العملاء
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :شاهد
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :شركة جديدة

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :اطرد
--- a/src/lang/basque.txt
+++ b/src/lang/basque.txt
@@ -1970,9 +1970,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Zerbitza
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Konpainia babestua dago. Pasahitza sartu

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Bezero zerrenda
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Ikusle
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Konpainia berria
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Bezero zerrenda
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Ikusle
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Konpainia berria

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kanporatu
@@ -1985,8 +1985,6 @@ STR_NETWORK_SERVER                                              :Zerbitzaria
 STR_NETWORK_CLIENT                                              :Bezeroa
 STR_NETWORK_SPECTATORS                                          :Ikusleak

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Ikusle
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ez gorde sartutako pasahitza
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Konpainiari pasahitz berria ezarri
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -2387,9 +2387,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Сэрв
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Кампанія абароненая. Увядзіце пароль

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Сьпіс кліентаў
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Назіраць
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Новая кампанія
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Сьпіс кліентаў
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Назіраць
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Новая кампанія

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Выкінуць гульца
@@ -2402,8 +2402,6 @@ STR_NETWORK_SERVER                                              :Сэрвэр
 STR_NETWORK_CLIENT                                              :Кліент
 STR_NETWORK_SPECTATORS                                          :Назіральнікі

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Назіральнік
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Не захоўваць уведзены пароль
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Даць кампаніі новы пароль
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -2078,9 +2078,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa está protegida. Digite a senha

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Assistir
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova Companhia
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clientes
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Assistir
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nova Companhia

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Banir
@@ -2093,8 +2093,6 @@ STR_NETWORK_SERVER                                              :Servidor
 STR_NETWORK_CLIENT                                              :Cliente
 STR_NETWORK_SPECTATORS                                          :Espectadores

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Espectador
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Não salvar a senha digitada
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Dar à empresa uma nova senha
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -2009,9 +2009,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Сърв
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Компанията е защитена. Въведете парола

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Списък с играчите
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Наблюдавай
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Нова фирма
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Списък с играчите
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Наблюдавай
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Нова фирма

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Изгони
@@ -2024,8 +2024,6 @@ STR_NETWORK_SERVER                                              :Сървър
 STR_NETWORK_CLIENT                                              :Клиент
 STR_NETWORK_SPECTATORS                                          :Наблюдатели

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Зрител
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Незапазвай паролата
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Дай на компанията новата парола
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -2076,9 +2076,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Companyia protegida: escriviu-ne la contrasenya

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Llista de clients
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Espectador
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova companyia
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Llista de clients
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Espectador
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nova companyia

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Breu
@@ -2091,8 +2091,6 @@ STR_NETWORK_SERVER                                              :Servidor
 STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Espectadors

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Espectador
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}No desis la nova contrasenya.
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Estableix aquesta nova contrasenya per a la companyia.
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -2179,9 +2179,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Posluži
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Tvrtka je zaštićena. Unesite zaporku

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Popis klijenata
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Promatraj
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova tvrtka
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Popis klijenata
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Promatraj
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nova tvrtka

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Izbaci
@@ -2194,8 +2194,6 @@ STR_NETWORK_SERVER                                              :Poslužitelj
 STR_NETWORK_CLIENT                                              :Klijent
 STR_NETWORK_SPECTATORS                                          :Promatrači

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Gledatelj
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Nemoj spremiti upisanu zaporku
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Daj tvrtci novu zaporku
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -2156,9 +2156,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server j
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Společnost je chráněná. Napiš heslo

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Seznam hráčů
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Pozorovat
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nová společnost
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Seznam hráčů
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Pozorovat
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nová společnost

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Vyhodit
@@ -2171,8 +2171,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Pozorovatelé

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Pozorovatel
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Neukládat zadané heslo
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Změnit heslo společnosti
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -467,6 +467,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Lyd/Musik
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Seneste besked/nyhedsrapport
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Tidligere beskeder
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Slet alle beskeder
 ############ range ends here

 ############ range for about menu starts
@@ -2082,11 +2083,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Afbryd f

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveren er beskyttet. Indtast kodeord
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Selskabet er beskyttet. Indtast kodeord
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Klientliste

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klient liste
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Tilslut som tilskuer
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nyt firma
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Klient liste
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Tilslut som tilskuer
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nyt firma

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Smid ud
@@ -2099,8 +2101,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Tilskuere

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Tilskuer
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Gem ikke den indtastede adgangskode
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Giv firmaet den nye adgangskode
@@ -2779,6 +2779,7 @@ STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF: {WHITE}{STRING}
 STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}Filter-udtryk:
 STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Overskriv fil
+STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}Er du sikker på du vil overskrive den eksisterende fil?

 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Skriv et navn til det gemte spil

@@ -3109,6 +3110,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Bestik
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Mål
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Globale Mål
+STR_GOALS_SPECTATOR                                             :Globale Mål
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Globale mål:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Ingen -
@@ -3157,6 +3159,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klik på
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} Historiebog
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Global Historiebog
+STR_STORY_BOOK_SPECTATOR                                        :Global Historiebog
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Side {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Gå til en bestemt side ved at vælge den i denne rulleliste.
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -472,6 +472,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Sound/music
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Last message/news report
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Message history
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Delete all messages
 ############ range ends here

 ############ range for about menu starts
@@ -2297,11 +2298,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Disconne

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server is protected. Enter password
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Company is protected. Enter password
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Client list

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Client list
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectate
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}New company
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Client list
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Spectate
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :New company

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kick
@@ -2314,8 +2316,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spectators

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spectator
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Do not save the entered password
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Give the company the new password
@@ -3649,6 +3649,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Bribe t
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Goals
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Global Goals
+STR_GOALS_SPECTATOR                                             :Global Goals
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Global goals:
 STR_GOALS_TEXT                                                  :{ORANGE}{RAW_STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- None -
@@ -3697,6 +3698,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Click on
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} Story Book
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Global Story Book
+STR_STORY_BOOK_SPECTATOR                                        :Global Story Book
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{RAW_STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Page {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Jump to a specific page by selecting it in this drop down list.
--- a/src/lang/english_AU.txt
+++ b/src/lang/english_AU.txt
@@ -2036,9 +2036,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server i
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Company is protected. Enter password

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Client list
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectate
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}New company
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Client list
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Spectate
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :New company

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kick
@@ -2051,8 +2051,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spectators

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spectator
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Do not save the entered password
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Give the company the new password
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -2083,9 +2083,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server i
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Company is protected. Enter password

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Client list
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectate
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}New company
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Client list
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Spectate
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :New company

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kick
@@ -2098,8 +2098,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spectators

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spectator
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Do not save the entered password
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Give the company the new password
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -1713,9 +1713,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servilo
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Kompanio estas protektata. Enigu pasvorton

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klientlisto
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spekti
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova kompanio
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Klientlisto
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Spekti
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nova kompanio

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Forbatu
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -2124,9 +2124,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server o
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Ettevõte on kaitstud. Sisesta salasõna

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klientide nimekiri
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Jälgi
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Uus ettevõte
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Klientide nimekiri
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Jälgi
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Uus ettevõte

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Viska välja
@@ -2139,8 +2139,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Vaatlejad

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Vaatleja
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Sisestatud salasõna ei salvestata
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Määra ettevõtte uus salasõna
--- a/src/lang/faroese.txt
+++ b/src/lang/faroese.txt
@@ -1881,9 +1881,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servarin
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Fyritøka er vard. Skriva loyniorð

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Listi yvir klientar
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Eygleið
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nýggja fyritøku
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Listi yvir klientar
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Eygleið
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nýggja fyritøku

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Sparka
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -2078,9 +2078,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Palvelin
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Yhtiö on suojattu. Anna salasana

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Asiakaslista
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Katsele
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Uusi yhtiö
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Asiakaslista
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Katsele
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Uusi yhtiö

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Potkaise
@@ -2093,8 +2093,6 @@ STR_NETWORK_SERVER                                              :Palvelin
 STR_NETWORK_CLIENT                                              :Pelaaja
 STR_NETWORK_SPECTATORS                                          :Katsojat

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Katsoja
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Älä tallenna syötettyä salasanaa
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Anna yhtiölle uusi salasana
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -467,6 +467,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Son/Musique
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Message/Bulletin précédent
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Historique des messages
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Effacer tous les messages
 ############ range ends here

 ############ range for about menu starts
@@ -2082,11 +2083,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Déconne

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Le serveur est protégé. Entrez le mot de passe
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}La compagnie est protégée. Entrez le mot de passe
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Liste des clients

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liste des clients
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectateur
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nouvelle compagnie
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Liste des clients
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Spectateur
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nouvelle compagnie

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Exclure
@@ -2099,8 +2101,6 @@ STR_NETWORK_SERVER                                              :Serveur
 STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spectateurs

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spectateur
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ne pas sauver le mot de passe entré
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Donner un nouveau mot de passe à la compagnie
@@ -3110,6 +3110,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Corromp
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}Objectifs de {COMPANY}
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Objectifs globaux
+STR_GOALS_SPECTATOR                                             :Objectifs globaux
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Objectifs globaux{NBSP}:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}− Aucun −
@@ -3158,6 +3159,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Cliquer
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}Livre d'histoire de {COMPANY}
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Livre d'histoire global
+STR_STORY_BOOK_SPECTATOR                                        :Livre d'histoire global
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Page {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Aller à une page spécifique en la choisissant dans cette liste
--- a/src/lang/gaelic.txt
+++ b/src/lang/gaelic.txt
@@ -2266,9 +2266,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Tha am f
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Tha a' chompanaidh dìonta. Cuir a-steach facal-faire

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liosta nan cliant
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Coimhead air
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Companaidh ùr
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Liosta nan cliant
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Coimhead air
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Companaidh ùr

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Thoir a bhròg dha
@@ -2281,8 +2281,6 @@ STR_NETWORK_SERVER                                              :Frithealaiche
 STR_NETWORK_CLIENT                                              :Cliant
 STR_NETWORK_SPECTATORS                                          :Amharcaichean

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Amharc
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Na sàbhail am facal-faire air a chur a-steach
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Thoir am facal-faire ùr dhan chompanaidh
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -2065,9 +2065,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}O servid
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}A compañía está protexida. Introduce o contrasinal

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Observar
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova compañía
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clientes
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Observar
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nova compañía

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Chimpar
@@ -2080,8 +2080,6 @@ STR_NETWORK_SERVER                                              :Servidor
 STR_NETWORK_CLIENT                                              :Cliente
 STR_NETWORK_SPECTATORS                                          :Espectadores

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Espectador
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Non grava-lo contrasinal introducido
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Asignar á compañía o novo contrasinal
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -2248,9 +2248,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server i
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firma ist geschützt. Passwort eingeben:

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Teilnehmerliste
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Zuschauen
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Neue Firma
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Teilnehmerliste
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Zuschauen
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Neue Firma

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Hinauswerfen
@@ -2263,8 +2263,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Teilnehmer
 STR_NETWORK_SPECTATORS                                          :Zuschauer

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Zuschauer
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Eingegebenes Passwort nicht speichern
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Der Firma ein Passwort zuweisen
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -2186,9 +2186,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Η πρ
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Η εταιρεία προστατεύεται από κωδικό. Εισάγετε κωδικό

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Λίστα συμμετεχόντων
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Παρακολούθηση
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Νέα εταιρεία
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Λίστα συμμετεχόντων
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Παρακολούθηση
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Νέα εταιρεία

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Εκδίωξη
@@ -2201,8 +2201,6 @@ STR_NETWORK_SERVER                                              :Διακομι
 STR_NETWORK_CLIENT                                              :Πελάτης
 STR_NETWORK_SPECTATORS                                          :Θεατές

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Θεατής
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Να μην αποθηκευτεί ο κωδικός
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Δώστε στην εταιρεία νέο κωδικό
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -2087,9 +2087,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}שרת
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}חברה מוגנת. הזן סיסמה

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}רשימת משתתפים
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}צפה
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}חברה חדשה
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :רשימת משתתפים
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :צפה
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :חברה חדשה

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :בעט
@@ -2102,8 +2102,6 @@ STR_NETWORK_SERVER                                              :שרת
 STR_NETWORK_CLIENT                                              :לקוח
 STR_NETWORK_SPECTATORS                                          :צופים

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}צופה
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}בטל שמירת הסיסמה החדשה
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}שמור את הסיסמה החדשה
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -2128,9 +2128,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}A szerve
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}A vállalat jelszóval van védve. Írd be

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Kliens lista
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Megfigyelés
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Új vállalat
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Kliens lista
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Megfigyelés
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Új vállalat

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kirúgás
@@ -2143,8 +2143,6 @@ STR_NETWORK_SERVER                                              :Szerver
 STR_NETWORK_CLIENT                                              :Kliens
 STR_NETWORK_SPECTATORS                                          :Megfigyelők

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Megfigyelő
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ne mentsd el a megadott jelszót
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Add meg az új vállalati jelszót
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -1918,9 +1918,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Þjónn
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Fyrirtæki er varið. Sláðu inn lykilorð

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Listi yfir leikmenn
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Fylgjast með
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nýtt fyrirtæki
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Listi yfir leikmenn
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Fylgjast með
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nýtt fyrirtæki

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Sparka
@@ -1933,8 +1933,6 @@ STR_NETWORK_SERVER                                              :Þjónn
 STR_NETWORK_CLIENT                                              :Notandi
 STR_NETWORK_SPECTATORS                                          :Áhorfendur

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Áhorfandi
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ekki vista innslegið lykilorð
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Læsa fyrirtækinu með nýja lykilorðinu
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -2071,9 +2071,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server t
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Perusahaan terkunci, masukkan kata kunci

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Daftar klien
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Menonton
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Buat Perusahaan
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Daftar klien
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Menonton
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Buat Perusahaan

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Usir
@@ -2086,8 +2086,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Klien
 STR_NETWORK_SPECTATORS                                          :Penonton

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Pengamat
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Jangan simpan kata sandi yang telah dimasukkan
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Berikan perusahaan kata sandi baru
--- a/src/lang/irish.txt
+++ b/src/lang/irish.txt
@@ -2061,9 +2061,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Tá an f
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Tá an chuideachta faoi chosaint. Iontráil pasfhocal

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liosta na gcliant
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Féach air
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Cuideachta nua
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Liosta na gcliant
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Féach air
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Cuideachta nua

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Ciceáil
@@ -2076,8 +2076,6 @@ STR_NETWORK_SERVER                                              :Freastalaí
 STR_NETWORK_CLIENT                                              :Cliant
 STR_NETWORK_SPECTATORS                                          :Féachadóirí

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Féachadóir
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ná sábháil an pasfhocal a iontráladh
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Tabhair an pasfhocal nua don chuideachta
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -2105,9 +2105,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server p
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Compagnia protetta. Inserire la password

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Elenco dei client
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Diventa spettatore
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nuova compagnia
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Elenco dei client
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Diventa spettatore
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nuova compagnia

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Espelli
@@ -2120,8 +2120,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spettatori

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spettatore
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Non salvare la password inserita
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Assegna la nuova password alla compagnia
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -2061,9 +2061,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}この
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}この会社は保護されています。経営に参画するにはパスワードを入力してください

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}クライアントリスト
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}観覧モード
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}新会社
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :クライアントリスト
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :観覧モード
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :新会社

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :追放
@@ -2076,8 +2076,6 @@ STR_NETWORK_SERVER                                              :サーバー
 STR_NETWORK_CLIENT                                              :クライアント
 STR_NETWORK_SPECTATORS                                          :観覧者

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}観覧者
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}入力したパスワードを保存しない
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}会社パスワードを変更
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -2290,9 +2290,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}서버
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}회사 암호가 걸려있습니다. 암호를 입력하세요.

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}접속자 목록
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}관전
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}새 회사
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :접속자 목록
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :관전
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :새 회사

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :추방
@@ -2305,8 +2305,6 @@ STR_NETWORK_SERVER                                              :서버
 STR_NETWORK_CLIENT                                              :접속자
 STR_NETWORK_SPECTATORS                                          :관전자

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}관전자
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}입력한 비밀번호는 저장하지 않기
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}이 회사에 새 비밀번호 부여
--- a/src/lang/latin.txt
+++ b/src/lang/latin.txt
@@ -2262,9 +2262,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servatru
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Societas tuta est. Tesseram inscribe

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Index clientum
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectare
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Societas Nova
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Index clientum
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Spectare
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Societas Nova

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Dimittere
@@ -2277,8 +2277,6 @@ STR_NETWORK_SERVER                                              :Servatrum
 STR_NETWORK_CLIENT                                              :Cliens
 STR_NETWORK_SPECTATORS                                          :Spectatores

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spectator
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Relinquere tesseram inscriptam
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Dare novam tesseram societati
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -2007,9 +2007,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveris
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Uzņēmums ir aizsargāts. Ievadiet paroli

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Spēlētāju saraksts
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Skatīt
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Jauns uzņēmums
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Spēlētāju saraksts
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Skatīt
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Jauns uzņēmums

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Izmest
@@ -2022,8 +2022,6 @@ STR_NETWORK_SERVER                                              :Serveris
 STR_NETWORK_CLIENT                                              :Spēlētājs
 STR_NETWORK_SPECTATORS                                          :Novērotāji

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Novērotājs
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Nesaglabāt ievadīto paroli
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Piešķirt uzņēmumam jaunu paroli
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -2280,9 +2280,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveris
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Kompanija apsaugota. Įvesk slaptažodį

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Žaidėjų sąrašas
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Stebėti
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nauja įmonė
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Žaidėjų sąrašas
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Stebėti
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nauja įmonė

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Išmesti (Kick)
@@ -2295,8 +2295,6 @@ STR_NETWORK_SERVER                                              :Serveris
 STR_NETWORK_CLIENT                                              :Žaidėjas
 STR_NETWORK_SPECTATORS                                          :Stebėtojai

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Stebėtojas
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Neišsaugotas įvestas slaptažodis
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Suteiktas kompanijai naujas slaptažodis
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -2064,9 +2064,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server a
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firma ass geschützt. Passwuert aginn

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Spillerlëscht
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Nokucken
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nei Firma
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Spillerlëscht
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Nokucken
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nei Firma

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kicken
@@ -2079,8 +2079,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Spiller
 STR_NETWORK_SPECTATORS                                          :Zuschauer

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Zuschauer
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Späicher d'Passwuert net
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Benotz daat neit Passwuert fir d'Firma
--- a/src/lang/malay.txt
+++ b/src/lang/malay.txt
@@ -1817,9 +1817,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Pelayan
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Syarikat ini dilindungi. Masukkan kata laluan

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Senarai klien
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Saksi
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Syarikat baru
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Senarai klien
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Saksi
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Syarikat baru

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Tendang
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -2087,9 +2087,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Tjeneren
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firmaet er beskyttet. Skriv inn passord

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liste over klienter
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Vær tilskuer
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nytt firma
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Liste over klienter
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Vær tilskuer
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nytt firma

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kast ut
@@ -2102,8 +2102,6 @@ STR_NETWORK_SERVER                                              :Tjener
 STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Tilskuere

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Tilskuer
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ikke lagre passordet
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Gi firmaet det nye passordet
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -1984,9 +1984,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Tenaren
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firmaet er beskytta. Skriv inn passord

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liste over klientar
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Vær tilskodar
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nytt firma
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Liste over klientar
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Vær tilskodar
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nytt firma

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kast ut
@@ -1999,8 +1999,6 @@ STR_NETWORK_SERVER                                              :Tenar
 STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Tilskodarar

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Tilskodar
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ikkje lagre passordet
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Gje firmaet det nye passordet
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -2461,9 +2461,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serwer j
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firma jest chroniona. Wprowadź hasło

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista klientów
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Obserwuj
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nowa firma
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista klientów
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Obserwuj
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nowa firma

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Wyrzuć
@@ -2476,8 +2476,6 @@ STR_NETWORK_SERVER                                              :Serwer
 STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Widzowie

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Obserwator
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Nie zapisuj podanego hasła
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Nadaj firmie nowe hasło
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -467,6 +467,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Som/música
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Última mensagem/notícia
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Histórico de mensagens
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Apagar todas as mensagens
 ############ range ends here

 ############ range for about menu starts
@@ -2082,11 +2083,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Desligar

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor protegido. Introduza palavra-chave
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa protegida. Introduza palavra-chave
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Lista de clientes

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Assistir
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova empresa
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clientes
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Assistir
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nova empresa

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Expulsar
@@ -2099,8 +2101,6 @@ STR_NETWORK_SERVER                                              :Servidor
 STR_NETWORK_CLIENT                                              :Cliente
 STR_NETWORK_SPECTATORS                                          :Espectadores

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Espectador
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Não gravar a palavra-chave introduzida
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Atribuir nova palavra-chave à empresa
@@ -3110,6 +3110,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Suborna
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Objectivos
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Objetivos globais
+STR_GOALS_SPECTATOR                                             :Objectivos Globais
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Objetivos globais:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Nenhum -
@@ -3158,6 +3159,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Clique n
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} Livro de História
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Livro de História Global
+STR_STORY_BOOK_SPECTATOR                                        :Livro de Histórico Global
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Página nº {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Saltar para uma pagina especifica escolhendo-a nesta lista.
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -2034,9 +2034,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server p
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Companie protejată. Introdu parola

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clienţi
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Observă
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Companie nouă
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clienţi
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Observă
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Companie nouă

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Dă afară
@@ -2049,8 +2049,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spectatori

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spectator
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Parola introdusă nu se va salva
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Schimbarea parolei pentru companie
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -593,6 +593,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Звук/муз
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Последняя новость
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :История сообщений
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Удалить все сообщения
 ############ range ends here

 ############ range for about menu starts
@@ -2236,11 +2237,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Откл

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Сервер защищён. Введите пароль.
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Компания защищена. Введите пароль.
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Список клиентов

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Список клиентов
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Наблюдать
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Новая компания
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Список клиентов
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Наблюдать
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Новая компания

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Отключить
@@ -2253,8 +2255,6 @@ STR_NETWORK_SERVER                                              :Сервер
 STR_NETWORK_CLIENT                                              :Клиент
 STR_NETWORK_SPECTATORS                                          :Наблюдатели

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Наблюдатель
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Не сохранять пароль
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Задать новый пароль компании
@@ -3295,6 +3295,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Дат
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}Задачи компании «{COMPANY}»
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Глобальные задачи
+STR_GOALS_SPECTATOR                                             :Общие задачи
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Общие задачи:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Нет -
@@ -3343,6 +3344,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Нажм
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}История компании «{COMPANY}»
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Мировая история
+STR_STORY_BOOK_SPECTATOR                                        :Мировая история
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Стр. {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Перейти на нужную страницу, выбрав её в выпадающем списке.
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -2268,9 +2268,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server j
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Preduzeće je zaštićeno. Unesite lozinku

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Spisak klijenata
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Praćenje
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Novo preduzeće
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Spisak klijenata
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Praćenje
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Novo preduzeće

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Izbaci
@@ -2283,8 +2283,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Igrač
 STR_NETWORK_SPECTATORS                                          :Posmatrači

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Posmatrač
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Otkaži unetu lozinku
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Postavi preduzeću novu lozinku
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -2071,9 +2071,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}服务
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}公司需要密码：

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}客户端列表
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}旁观
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}新公司
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :客户端列表
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :旁观
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :新公司

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :踢出
@@ -2086,8 +2086,6 @@ STR_NETWORK_SERVER                                              :服务器
 STR_NETWORK_CLIENT                                              :客户端
 STR_NETWORK_SPECTATORS                                          :旁观者

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}旁观者
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}不保存所输入的密码
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}为公司设置新密码
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -2129,9 +2129,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server j
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Spoločnosť je chránená. Zadaj heslo

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Zoznam klientov
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Pozorovať
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nová spoločnosť
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Zoznam klientov
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Pozorovať
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nová spoločnosť

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Vyhodit
@@ -2144,8 +2144,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Pozorovatelia

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Pozorovateľ
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Neukladať zadané heslo
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Nastaviť spoločnosti nové heslo
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -2215,9 +2215,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Strežni
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Podjetje je zaščiteno. Vnesi geslo

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Seznam gostov
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Opazuj
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Novo podjetje
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Seznam gostov
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Opazuj
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Novo podjetje

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Brcni
@@ -2230,8 +2230,6 @@ STR_NETWORK_SERVER                                              :Strežnik
 STR_NETWORK_CLIENT                                              :Gost
 STR_NETWORK_SPECTATORS                                          :Gledalci

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Gledalec
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ne shrani vnešenega gesla
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Dodeli družbi novo geslo
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -2075,9 +2075,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa protegida. Introduzca la contraseña

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Presenciar
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nueva empresa
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clientes
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Presenciar
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nueva empresa

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Expulsar
@@ -2090,8 +2090,6 @@ STR_NETWORK_SERVER                                              :Servidor
 STR_NETWORK_CLIENT                                              :Cliente
 STR_NETWORK_SPECTATORS                                          :Espectadores

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Espectador
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}No guardar la contraseña introducida
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Asignar a la empresa una nueva contraseña
--- a/src/lang/spanish_MX.txt
+++ b/src/lang/spanish_MX.txt
@@ -467,6 +467,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Sonido y músic
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Último mensaje o noticia
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Historial de mensajes
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Eliminar todos los mensajes
 ############ range ends here

 ############ range for about menu starts
@@ -2082,11 +2083,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Desconec

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor protegido. Introducir contraseña
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa protegida. Introducir contraseña
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Lista de clientes

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Observar
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nueva empresa
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clientes
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Observar
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nueva empresa

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Expulsar
@@ -2099,8 +2101,6 @@ STR_NETWORK_SERVER                                              :Servidor
 STR_NETWORK_CLIENT                                              :Cliente
 STR_NETWORK_SPECTATORS                                          :Espectadores

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Espectador
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}No guardar la contraseña introducida
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Asignar a la empresa la nueva contraseña
@@ -3110,6 +3110,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Soborna
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}Metas de {COMPANY}
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Metas globales
+STR_GOALS_SPECTATOR                                             :Metas globales
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Metas globales:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Ninguna -
@@ -3158,6 +3159,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Clic en
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}Historial de {COMPANY}
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Historial global
+STR_STORY_BOOK_SPECTATOR                                        :Historial global
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Página {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Permitir ir a una página específica al elegirla en esta lista desplegable
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -2083,9 +2083,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servern
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Företaget är skyddat. Ange lösenord

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klientlista
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Åskåda
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nytt företag
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Klientlista
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Åskåda
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nytt företag

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kasta ut
@@ -2098,8 +2098,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Åskådare

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Åskådare
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Spara inte det inmatade lösenordet
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Ge företaget det nya lösenordet
--- a/src/lang/tamil.txt
+++ b/src/lang/tamil.txt
@@ -1811,9 +1811,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}சர
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}நிற்வனம் காக்கப்பட்டுள்ளது. கடவுச்சொல்லினை இடவும்

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}விளையாடுவோர் பட்டியல்
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}கவனி
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}புதிய நிறுவனம்
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :விளையாடுவோர் பட்டியல்
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :கவனி
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :புதிய நிறுவனம்

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :உதை
@@ -1826,8 +1826,6 @@ STR_NETWORK_SERVER                                              :சர்வர
 STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :கவனிப்பவர்கள்

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}பார்வையாளர்
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}கடவுச்சொல்லினை நினைவில் வைத்திருக்காதே
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}நிற்வனத்திற்கு புதிய கடவுச்சொல்லினை கொடுக்கவும்
--- a/src/lang/thai.txt
+++ b/src/lang/thai.txt
@@ -2010,9 +2010,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}เซ
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}บริษัทมีการป้องกัน. กรุณากรอกพาสเวิร์ด

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}รายการลูกข่าย
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}ผู้ชม
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}บริษัทใหม่
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :รายการลูกข่าย
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :ผู้ชม
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :บริษัทใหม่

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :เตะ
@@ -2025,8 +2025,6 @@ STR_NETWORK_SERVER                                              :เซิฟเ
 STR_NETWORK_CLIENT                                              :ลูกข่าย
 STR_NETWORK_SPECTATORS                                          :ผู้ชม

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}ผู้สังเกตุการณ์
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}ไม่ทำการเก็บพาสเวิร์ดที่กรอกไว้แล้ว
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}ตั้งพาสเวิร์ดของบริษัทใหม่
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -2061,9 +2061,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}伺服
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}公司受保護，輸入密碼

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}用戶端清單
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}旁觀者
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}新公司
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :用戶端清單
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :旁觀者
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :新公司

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :踢除
@@ -2076,8 +2076,6 @@ STR_NETWORK_SERVER                                              :伺服器
 STR_NETWORK_CLIENT                                              :用戶端
 STR_NETWORK_SPECTATORS                                          :旁觀者

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}旁觀者
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}不要儲存所輸入的密碼
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}為公司設定新的密碼
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -2065,9 +2065,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Sunucu k
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Şirket korumalı. Parola girin

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Oyuncu listesi
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Gözlemle
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Yeni şirket
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Oyuncu listesi
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Gözlemle
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Yeni şirket

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :At
@@ -2080,8 +2080,6 @@ STR_NETWORK_SERVER                                              :Sunucu
 STR_NETWORK_CLIENT                                              :İstemci
 STR_NETWORK_SPECTATORS                                          :İzleyiciler

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}İzleyici
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Girilen parolayı kaydetme
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Yeni parolayı şirkete ver
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -1050,6 +1050,7 @@ STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Південн
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Власна...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Грузинські ларі (GEL)
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Іранський ріал (IRR)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Російський новий рубель (RUB)
 ############ end of currency region

 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Сторона руху транспорту
@@ -2189,9 +2190,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Серв
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Компанія захищена паролем. Введіть пароль

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Список клієнтів
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Спостерігати
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Нова компанія
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Список клієнтів
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Спостерігати
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Нова компанія

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Відключити гравця
@@ -2204,8 +2205,6 @@ STR_NETWORK_SERVER                                              :Сервер
 STR_NETWORK_CLIENT                                              :Клієнт
 STR_NETWORK_SPECTATORS                                          :Спостерігачі

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Глядач
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Не запам'ятовувати введений пароль
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Дати компанії новий пароль
@@ -2812,6 +2811,10 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002-2019 команда OpenTTD

 # Framerate display window
+STR_FRAMERATE_DATA_POINTS                                       :{BLACK}Дані отримано з {COMMA} вимірюван {P "ня" "нь" "нь" }
+STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
+STR_FRAMERATE_MS_WARN                                           :{YELLOW}{DECIMAL} ms
+STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} кадр{P "" "и" "ів"}/сек
 ############ Leave those lines in this order!!
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
@@ -4582,6 +4585,7 @@ STR_BASESOUNDS_DOS_DESCRIPTION                                  :Оригіна
 STR_BASESOUNDS_WIN_DESCRIPTION                                  :Оригінальний набір звуків з Transport Tycoon Deluxe Windows edition.
 STR_BASESOUNDS_NONE_DESCRIPTION                                 :Порожній набір звуків.
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Оригінальна музика з Transport Tycoon Deluxe Windows edition.
+STR_BASEMUSIC_DOS_DESCRIPTION                                   :Оригінальна музика Transport Tycoon Deluxe(DOS)
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Порожній набір музики.

 ##id 0x2000
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -1976,7 +1976,6 @@ STR_NETWORK_SERVER                                              :Tsjinner
 STR_NETWORK_CLIENT                                              :Kliïnt
 STR_NETWORK_SPECTATORS                                          :Taskôgers

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Taskôger

 # Network set password
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Jou it bedriuw it nije wachtwurd
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -1789,8 +1789,6 @@ STR_NETWORK_SERVER                                              :سرویس ده
 STR_NETWORK_CLIENT                                              :سرویس گیرنده
 STR_NETWORK_SPECTATORS                                          :تماشاگران

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}تماشگر
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}رمز وارد شده را به خاطر نسپار
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}دادن رمز جدید به شرکت
--- a/src/lang/vietnamese.txt
+++ b/src/lang/vietnamese.txt
@@ -2077,9 +2077,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server y
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Công ty yêu cầu xác thực. Nhập mật khẩu

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Danh sách máy trạm
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Xem
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Công ty mới
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Danh sách máy trạm
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Xem
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Công ty mới

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Đá
@@ -2092,8 +2092,6 @@ STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Máy trạm
 STR_NETWORK_SPECTATORS                                          :Người xem

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Người xem
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Không được ghi mật khẩu đã nhập
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Nhập mật khẩu mới cho công ty
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -2064,9 +2064,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Mae'r gw
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Mae'r cwmni wedi'i ddiogelu. rhowch y cyfrinair.

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Rhestr Cleientiaid
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Gwylio
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Cwmni newydd
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Rhestr Cleientiaid
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Gwylio
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Cwmni newydd

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Cicio
@@ -2079,8 +2079,6 @@ STR_NETWORK_SERVER                                              :Gweinydd
 STR_NETWORK_CLIENT                                              :Gwestai
 STR_NETWORK_SPECTATORS                                          :Gwylwyr

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Gwyliwr
-
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Peidio cadw'r cyfrinair a roddwyd
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Rhoi'r cyfrinair newydd i'r cwmni
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -194,6 +194,7 @@ enum {
 	GHK_RESET_OBJECT_TO_PLACE,
 	GHK_DELETE_WINDOWS,
 	GHK_DELETE_NONVITAL_WINDOWS,
+	GHK_DELETE_ALL_MESSAGES,
 	GHK_REFRESH_SCREEN,
 	GHK_CRASH,
 	GHK_MONEY,
@@ -322,6 +323,7 @@ struct MainWindow : Window
 			case GHK_RESET_OBJECT_TO_PLACE: ResetObjectToPlace(); break;
 			case GHK_DELETE_WINDOWS: DeleteNonVitalWindows(); break;
 			case GHK_DELETE_NONVITAL_WINDOWS: DeleteAllNonVitalWindows(); break;
+			case GHK_DELETE_ALL_MESSAGES: DeleteAllMessages(); break;
 			case GHK_REFRESH_SCREEN: MarkWholeScreenDirty(); break;

 			case GHK_CRASH: // Crash the game
@@ -498,6 +500,7 @@ static Hotkey global_hotkeys[] = {
 	Hotkey(WKC_ESC, "reset_object_to_place", GHK_RESET_OBJECT_TO_PLACE),
 	Hotkey(WKC_DELETE, "delete_windows", GHK_DELETE_WINDOWS),
 	Hotkey(WKC_DELETE | WKC_SHIFT, "delete_all_windows", GHK_DELETE_NONVITAL_WINDOWS),
+	Hotkey(WKC_DELETE | WKC_CTRL, "delete_all_messages", GHK_DELETE_ALL_MESSAGES),
 	Hotkey('R' | WKC_CTRL, "refresh_screen", GHK_REFRESH_SCREEN),
 #if defined(_DEBUG)
 	Hotkey('0' | WKC_ALT, "crash_game", GHK_CRASH),
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1839,7 +1839,7 @@ static void PopupClientList(ClientID client_id, int x, int y)
 static const NWidgetPart _nested_client_list_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY),
-		NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_NETWORK_COMPANY_LIST_CLIENT_LIST, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		NWidget(WWT_STICKYBOX, COLOUR_GREY),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, WID_CL_PANEL), SetMinimalSize(250, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM), SetResize(1, 1), EndContainer(),
--- a/src/order_base.h
+++ b/src/order_base.h
@@ -25,7 +25,7 @@
 #include <memory>
 #include <vector>

-typedef Pool<Order, OrderID, 256, 64000> OrderPool;
+typedef Pool<Order, OrderID, 256, 0xFF0000> OrderPool;
 typedef Pool<OrderList, OrderListID, 128, 64000> OrderListPool;
 extern OrderPool _order_pool;
 extern OrderListPool _orderlist_pool;
--- a/src/order_type.h
+++ b/src/order_type.h
@@ -15,7 +15,7 @@
 #include "core/enum_type.hpp"

 typedef byte VehicleOrderID;  ///< The index of an order within its current vehicle (not pool related)
-typedef uint16 OrderID;
+typedef uint32 OrderID;
 typedef uint16 OrderListID;
 typedef uint16 DestinationID;
 typedef uint32 TimetableTicks;
@@ -26,7 +26,7 @@ static const VehicleOrderID INVALID_VEH_ORDER_ID = 0xFF;
 static const VehicleOrderID MAX_VEH_ORDER_ID     = INVALID_VEH_ORDER_ID - 1;

 /** Invalid order (sentinel) */
-static const OrderID INVALID_ORDER = 0xFFFF;
+static const OrderID INVALID_ORDER = 0xFFFFFF;

 /**
 * Maximum number of orders in implicit-only lists before we start searching
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -3540,7 +3540,7 @@ int TicksToLeaveDepot(const Train *v)
 */
 static VehicleEnterTileStatus VehicleEnter_Track(Vehicle *u, TileIndex tile, int x, int y)
 {
-	/* this routine applies only to trains in depot tiles */
+	/* This routine applies only to trains in depot tiles. */
 	if (u->type != VEH_TRAIN || !IsRailDepotTile(tile)) return VETSB_CONTINUE;

 	Train *v = Train::From(u);
@@ -3565,7 +3565,7 @@ static VehicleEnterTileStatus VehicleEnter_Track(Vehicle *u, TileIndex tile, int

 	if (v->IsFrontEngine() && v->current_order.IsType(OT_LOADING_ADVANCE)) abort_load_through(true);

-	/* depot direction */
+	/* Depot direction. */
 	DiagDirection dir = GetRailDepotDirection(tile);

 	/* Calculate the point where the following wagon should be activated. */
--- a/src/script/api/script_group.cpp
+++ b/src/script/api/script_group.cpp
@@ -29,7 +29,7 @@

 /* static */ ScriptGroup::GroupID ScriptGroup::CreateGroup(ScriptVehicle::VehicleType vehicle_type)
 {
-	if (!ScriptObject::DoCommand(0, (::VehicleType)vehicle_type, 0, CMD_CREATE_GROUP, NULL, &ScriptInstance::DoCommandReturnGroupID)) return GROUP_INVALID;
+	if (!ScriptObject::DoCommand(0, (::VehicleType)vehicle_type, INVALID_GROUP, CMD_CREATE_GROUP, NULL, &ScriptInstance::DoCommandReturnGroupID)) return GROUP_INVALID;

 	/* In case of test-mode, we return GroupID 0 */
 	return (ScriptGroup::GroupID)0;
--- a/src/script/api/script_order.hpp
+++ b/src/script/api/script_order.hpp
@@ -578,6 +578,7 @@ public:

 	/**
 	 * Removes the given vehicle from a shared orders list.
+	 * After unsharing orders, the orders list of the vehicle is empty.
 	 * @param vehicle_id The vehicle to remove from the shared order list.
 	 * @pre ScriptVehicle::IsValidVehicle(vehicle_id).
 	 * @return True if and only if the unsharing succeeded.
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -530,9 +530,21 @@ static Track ChooseShipTrack(Ship *v, TileIndex tile, DiagDirection enterdir, Tr
 	return track;
 }

-static inline TrackBits GetAvailShipTracks(TileIndex tile, DiagDirection dir)
+/**
+ * Get the available water tracks on a tile for a ship entering a tile.
+ * @param tile The tile about to enter.
+ * @param dir The entry direction.
+ * @param trackdir The trackdir the ship has on the old tile.
+ * @return The available trackbits on the next tile.
+ */
+static inline TrackBits GetAvailShipTracks(TileIndex tile, DiagDirection dir, Trackdir trackdir)
 {
-	return GetTileShipTrackStatus(tile) & DiagdirReachesTracks(dir);
+	TrackBits tracks = GetTileShipTrackStatus(tile) & DiagdirReachesTracks(dir);
+
+	/* Do not remove 90 degree turns for OPF, as it isn't able to find paths taking it into account. */
+	if (_settings_game.pf.forbid_90_deg && _settings_game.pf.pathfinder_for_ships != VPF_OPF) tracks &= ~TrackCrossesTracks(TrackdirToTrack(trackdir));
+
+	return tracks;
 }

 static const byte _ship_subcoord[4][6][3] = {
@@ -690,7 +702,7 @@ static void CheckDistanceBetweenShips(TileIndex tile, Ship *v, TrackBits tracks,

 			if (HasVehicleOnPos(tile_check, &scc, FindShipOnTile)) continue;

-			TrackBits bits = GetAvailShipTracks(tile_check, _ship_search_directions[track][diagdir]);
+			TrackBits bits = GetTileShipTrackStatus(tile_check) & DiagdirReachesTracks(_ship_search_directions[track][diagdir]);
 			if (!IsDiagonalTrack(track)) bits &= TRACK_BIT_CROSS;  // No 90 degree turns.

 			if (bits != INVALID_TRACK_BIT && bits != TRACK_BIT_NONE) {
@@ -847,7 +859,7 @@ static void ShipController(Ship *v)

 			DiagDirection diagdir = DiagdirBetweenTiles(gp.old_tile, gp.new_tile);
 			assert(diagdir != INVALID_DIAGDIR);
-			tracks = GetAvailShipTracks(gp.new_tile, diagdir);
+			tracks = GetAvailShipTracks(gp.new_tile, diagdir, v->GetVehicleTrackdir());
 			if (tracks == TRACK_BIT_NONE) goto reverse_direction;

 			/* Choose a direction, and continue if we find one */
--- a/src/station_base.h
+++ b/src/station_base.h
@@ -488,6 +488,8 @@ public:

 	void UpdateVirtCoord();

+	void AfterStationTileSetChange(bool adding, StationType type);
+
 	/* virtual */ uint GetPlatformLength(TileIndex tile, DiagDirection dir) const;
 	/* virtual */ uint GetPlatformLength(TileIndex tile) const;
 	void RecomputeIndustriesNear();
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -721,6 +721,43 @@ static void DeleteStationIfEmpty(BaseStation *st)
 	UpdateStationSignCoord(st);
 }

+/**
+ * After adding/removing tiles to station, update some station-related stuff.
+ * @param adding True if adding tiles, false if removing them.
+ * @param type StationType being modified.
+ */
+void Station::AfterStationTileSetChange(bool adding, StationType type)
+{
+	this->UpdateVirtCoord();
+	this->RecomputeIndustriesNear();
+	DirtyCompanyInfrastructureWindows(this->owner);
+	if (adding) InvalidateWindowData(WC_STATION_LIST, this->owner, 0);
+
+	switch (type) {
+		case STATION_RAIL:
+			SetWindowWidgetDirty(WC_STATION_VIEW, this->index, WID_SV_TRAINS);
+			break;
+		case STATION_AIRPORT:
+			break;
+		case STATION_TRUCK:
+		case STATION_BUS:
+			SetWindowWidgetDirty(WC_STATION_VIEW, this->index, WID_SV_ROADVEHS);
+			break;
+		case STATION_DOCK:
+			SetWindowWidgetDirty(WC_STATION_VIEW, this->index, WID_SV_SHIPS);
+			break;
+		default: NOT_REACHED();
+	}
+
+	if (adding) {
+		UpdateStationAcceptance(this, false);
+		InvalidateWindowData(WC_SELECT_STATION, 0, 0);
+	} else {
+		DeleteStationIfEmpty(this);
+	}
+
+}
+
 CommandCost ClearTile_Station(TileIndex tile, DoCommandFlag flags);

 /**
@@ -1494,14 +1531,8 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32
 		}

 		st->MarkTilesDirty(false);
-		st->UpdateVirtCoord();
-		UpdateStationAcceptance(st, false);
-		st->RecomputeIndustriesNear();
+		st->AfterStationTileSetChange(true, STATION_RAIL);
 		ZoningMarkDirtyStationCoverageArea(st);
-		InvalidateWindowData(WC_SELECT_STATION, 0, 0);
-		InvalidateWindowData(WC_STATION_LIST, st->owner, 0);
-		SetWindowWidgetDirty(WC_STATION_VIEW, st->index, WID_SV_TRAINS);
-		DirtyCompanyInfrastructureWindows(st->owner);
 	}

 	return cost;
@@ -1965,7 +1996,6 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 				MakeRoadStop(cur_tile, st->owner, st->index, rs_type, rts, ddir);
 			}
 			Company::Get(st->owner)->infrastructure.station++;
-			DirtyCompanyInfrastructureWindows(st->owner);

 			MarkTileDirtyByTile(cur_tile);
 		}
@@ -1973,12 +2003,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 	}

 	if (st != NULL) {
-		st->UpdateVirtCoord();
-		UpdateStationAcceptance(st, false);
-		st->RecomputeIndustriesNear();
-		InvalidateWindowData(WC_SELECT_STATION, 0, 0);
-		InvalidateWindowData(WC_STATION_LIST, st->owner, 0);
-		SetWindowWidgetDirty(WC_STATION_VIEW, st->index, WID_SV_ROADVEHS);
+		st->AfterStationTileSetChange(true, type ? STATION_TRUCK: STATION_BUS);
 	}
 	return cost;
 }
@@ -2074,7 +2099,6 @@ static CommandCost RemoveRoadStop(TileIndex tile, DoCommandFlag flags)
 			DoClearSquare(tile);
 		}

-		SetWindowWidgetDirty(WC_STATION_VIEW, st->index, WID_SV_ROADVEHS);
 		delete cur_stop;

 		/* Make sure no vehicle is going to the old roadstop */
@@ -2088,9 +2112,7 @@ static CommandCost RemoveRoadStop(TileIndex tile, DoCommandFlag flags)

 		st->rect.AfterRemoveTile(st, tile);

-		st->UpdateVirtCoord();
-		st->RecomputeIndustriesNear();
-		DeleteStationIfEmpty(st);
+		st->AfterStationTileSetChange(false, is_truck ? STATION_TRUCK: STATION_BUS);

 		/* Update the tile area of the truck/bus stop */
 		if (is_truck) {
@@ -2492,15 +2514,10 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 			UpdateStationSignCoord(st);
 		} else {
 			Company::Get(st->owner)->infrastructure.airport++;
-			DirtyCompanyInfrastructureWindows(st->owner);
-			st->UpdateVirtCoord();
 		}

-		UpdateStationAcceptance(st, false);
-		st->RecomputeIndustriesNear();
+		st->AfterStationTileSetChange(true, STATION_AIRPORT);
 		ZoningMarkDirtyStationCoverageArea(st);
-		InvalidateWindowData(WC_SELECT_STATION, 0, 0);
-		InvalidateWindowData(WC_STATION_LIST, st->owner, 0);
 		InvalidateWindowData(WC_STATION_VIEW, st->index, -1);

 		if (_settings_game.economy.station_noise_level) {
@@ -2567,11 +2584,9 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags)
 		}

 		Company::Get(st->owner)->infrastructure.airport--;
-		DirtyCompanyInfrastructureWindows(st->owner);

-		st->UpdateVirtCoord();
-		st->RecomputeIndustriesNear();
-		DeleteStationIfEmpty(st);
+		st->AfterStationTileSetChange(false, STATION_AIRPORT);
+
 		DeleteNewGRFInspectWindow(GSF_AIRPORTS, st->index);
 	}

@@ -2723,17 +2738,11 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 			Company::Get(st->owner)->infrastructure.water++;
 		}
 		Company::Get(st->owner)->infrastructure.station += 2;
-		DirtyCompanyInfrastructureWindows(st->owner);

 		MakeDock(slope_tile, st->owner, st->index, direction, wc);

-		st->UpdateVirtCoord();
-		UpdateStationAcceptance(st, false);
-		st->RecomputeIndustriesNear();
+		st->AfterStationTileSetChange(true, STATION_DOCK);
 		ZoningMarkDirtyStationCoverageArea(st);
-		InvalidateWindowData(WC_SELECT_STATION, 0, 0);
-		InvalidateWindowData(WC_STATION_LIST, st->owner, 0);
-		SetWindowWidgetDirty(WC_STATION_VIEW, st->index, WID_SV_SHIPS);
 	}

 	return CommandCost(EXPENSES_CONSTRUCTION, _price[PR_BUILD_STATION_DOCK]);
@@ -2797,12 +2806,8 @@ static CommandCost RemoveDock(TileIndex tile, DoCommandFlag flags)
 		}

 		Company::Get(st->owner)->infrastructure.station -= 2;
-		DirtyCompanyInfrastructureWindows(st->owner);

-		SetWindowWidgetDirty(WC_STATION_VIEW, st->index, WID_SV_SHIPS);
-		st->UpdateVirtCoord();
-		st->RecomputeIndustriesNear();
-		DeleteStationIfEmpty(st);
+		st->AfterStationTileSetChange(false, STATION_DOCK);

 		/* All ships that were going to our station, can't go to it anymore.
 		 * Just clear the order, then automatically the next appropriate order
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -225,39 +225,42 @@ static const int CTMN_SPECTATOR   = -4; ///< Show a company window as spectator
 * @param w The toolbar window.
 * @param widget The button widget id.
 * @param grey A bitbask of which items to mark as disabled.
- * @param include_spectator If true, a spectator option is included in the list.
 */
-static void PopupMainCompanyToolbMenu(Window *w, int widget, int grey = 0, bool include_spectator = false)
+static void PopupMainCompanyToolbMenu(Window *w, int widget, int grey = 0)
 {
 	DropDownList *list = new DropDownList();

+	switch (widget) {
+		case WID_TN_COMPANIES:
 #ifdef ENABLE_NETWORK
-	if (_networking) {
-		if (widget == WID_TN_COMPANIES) {
+			if (!_networking) break;
+
 			/* Add the client list button for the companies menu */
 			*list->Append() = new DropDownListStringItem(STR_NETWORK_COMPANY_LIST_CLIENT_LIST, CTMN_CLIENT_LIST, false);
-		}

-		if (include_spectator) {
-			if (widget == WID_TN_COMPANIES) {
 			if (_local_company == COMPANY_SPECTATOR) {
 				*list->Append() = new DropDownListStringItem(STR_NETWORK_COMPANY_LIST_NEW_COMPANY, CTMN_NEW_COMPANY, NetworkMaxCompaniesReached());
 			} else {
 				*list->Append() = new DropDownListStringItem(STR_NETWORK_COMPANY_LIST_SPECTATE, CTMN_SPECTATE, NetworkMaxSpectatorsReached());
 			}
-			} else {
-				*list->Append() = new DropDownListStringItem(STR_NETWORK_TOOLBAR_LIST_SPECTATOR, CTMN_SPECTATOR, false);
-			}
-		}
-	}
 #endif /* ENABLE_NETWORK */
+			break;
+
+		case WID_TN_STORY:
+			*list->Append() = new DropDownListStringItem(STR_STORY_BOOK_SPECTATOR, CTMN_SPECTATOR, false);
+			break;
+
+		case WID_TN_GOAL:
+			*list->Append() = new DropDownListStringItem(STR_GOALS_SPECTATOR, CTMN_SPECTATOR, false);
+			break;
+	}

 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
 		if (!Company::IsValidID(c)) continue;
 		*list->Append() = new DropDownListCompanyItem(c, false, HasBit(grey, c));
 	}

-	PopupMainToolbMenu(w, widget, list, _local_company == COMPANY_SPECTATOR ? CTMN_CLIENT_LIST : (int)_local_company);
+	PopupMainToolbMenu(w, widget, list, _local_company == COMPANY_SPECTATOR ? (widget == WID_TN_COMPANIES ? CTMN_CLIENT_LIST : CTMN_SPECTATOR) : (int)_local_company);
 }


@@ -610,7 +613,7 @@ static CallBackFunction MenuClickFinances(int index)

 static CallBackFunction ToolbarCompaniesClick(Window *w)
 {
-	PopupMainCompanyToolbMenu(w, WID_TN_COMPANIES, 0, true);
+	PopupMainCompanyToolbMenu(w, WID_TN_COMPANIES, 0);
 	return CBF_NONE;
 }

@@ -656,7 +659,7 @@ static CallBackFunction MenuClickCompany(int index)

 static CallBackFunction ToolbarStoryClick(Window *w)
 {
-	PopupMainCompanyToolbMenu(w, WID_TN_STORY, 0, true);
+	PopupMainCompanyToolbMenu(w, WID_TN_STORY, 0);
 	return CBF_NONE;
 }

@@ -676,7 +679,7 @@ static CallBackFunction MenuClickStory(int index)

 static CallBackFunction ToolbarGoalClick(Window *w)
 {
-	PopupMainCompanyToolbMenu(w, WID_TN_GOAL, 0, true);
+	PopupMainCompanyToolbMenu(w, WID_TN_GOAL, 0);
 	return CBF_NONE;
 }

@@ -1032,7 +1035,7 @@ static CallBackFunction MenuClickMusicWindow(int index)

 static CallBackFunction ToolbarNewspaperClick(Window *w)
 {
-	PopupMainToolbMenu(w, WID_TN_MESSAGES, STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT, 2);
+	PopupMainToolbMenu(w, WID_TN_MESSAGES, STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT, 3);
 	return CBF_NONE;
 }

@@ -1047,6 +1050,7 @@ static CallBackFunction MenuClickNewspaper(int index)
 	switch (index) {
 		case 0: ShowLastNewsMessage(); break;
 		case 1: ShowMessageHistory();  break;
+		case 2: DeleteAllMessages();   break;
 	}
 	return CBF_NONE;
 }
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -39,6 +39,7 @@
 #include "framerate_type.h"
 #include "network/network_func.h"
 #include "guitimer_func.h"
+#include "news_func.h"

 #include "safeguards.h"

@@ -3408,6 +3409,17 @@ restart_search:
 	}
 }

+/**
+ * Delete all messages and their corresponding window (if any).
+ */
+void DeleteAllMessages()
+{
+	InitNewsItemStructs();
+	InvalidateWindowData(WC_STATUS_BAR, 0, SBI_NEWS_DELETED); // invalidate the statusbar
+	InvalidateWindowData(WC_MESSAGE_HISTORY, 0); // invalidate the message history
+	DeleteWindowById(WC_NEWS_WINDOW, 0); // close newspaper or general message window if shown
+}
+
 /**
 * Delete all windows that are used for construction of vehicle etc.
 * Once done with that invalidate the others to ensure they get refreshed too.
--- a/src/window_func.h
+++ b/src/window_func.h
@@ -40,6 +40,7 @@ void InvalidateWindowClassesData(WindowClass cls, int data = 0, bool gui_scope =

 void DeleteNonVitalWindows();
 void DeleteAllNonVitalWindows();
+void DeleteAllMessages();
 void DeleteConstructionWindows();
 void HideVitalWindows();
 void ShowVitalWindows();