(svn r1239) -Feature: Added gui option of setting company password. It can be found in the 'company information' window

-Spiced up 'set company_pw' a bit, where if no pw is typed, it shows the current one.
-Added a space between company name and player; looks better

19 files changed, 22 insertions, 19 deletions

diff --git a/lang/american.txt b/lang/american.txt
index 8a4878812..87f445cee 100644
--- a/lang/american.txt
+++ b/lang/american.txt
@@ -1954,7 +1954,7 @@ STR_683B_HOSTILE						:Hostile
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Player {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}New Face
 STR_7005_COLOR_SCHEME						:{BLACK}Color Scheme
diff --git a/lang/catalan.txt b/lang/catalan.txt
index 2a2a65732..6cc66d4ee 100644
--- a/lang/catalan.txt
+++ b/lang/catalan.txt
@@ -1944,7 +1944,7 @@ STR_683B_HOSTILE						:Hostil
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Jugador {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Nova Cara
 STR_7005_COLOR_SCHEME						:{BLACK}Esquema de Colors
diff --git a/lang/czech.txt b/lang/czech.txt
index 155a123bc..a29c1a285 100644
--- a/lang/czech.txt
+++ b/lang/czech.txt
@@ -1954,7 +1954,7 @@ STR_683B_HOSTILE						:zaujatý
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(hrac {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Nový oblicej
 STR_7005_COLOR_SCHEME						:{BLACK}Barva
diff --git a/lang/danish.txt b/lang/danish.txt
index 5fbefe949..e292dd6d5 100644
--- a/lang/danish.txt
+++ b/lang/danish.txt
@@ -1803,7 +1803,7 @@ STR_683B_HOSTILE						:Fjendtlig
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Spiller {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Nyt Ansigt
 STR_7005_COLOR_SCHEME						:{BLACK}Farvetema
diff --git a/lang/dutch.txt b/lang/dutch.txt
index f5d775b78..a1d335f4d 100644
--- a/lang/dutch.txt
+++ b/lang/dutch.txt
@@ -1944,7 +1944,7 @@ STR_683B_HOSTILE						:Negatief
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Speler {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Nieuw gezicht
 STR_7005_COLOR_SCHEME						:{BLACK}Kleurenschema
diff --git a/lang/english.txt b/lang/english.txt
index 6a96eb690..e879172f5 100644
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -1954,7 +1954,7 @@ STR_683B_HOSTILE						:Hostile
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Player {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}New Face
 STR_7005_COLOR_SCHEME						:{BLACK}Colour Scheme
@@ -2071,6 +2071,9 @@ STR_RELOCATE_COMPANY_HEADQUARTERS				:{BLACK}Rebuild company headquarters elsewh
 STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS			:{WHITE}Can't build company headquarters...
 STR_7072_VIEW_HQ						:{BLACK}View HQ
 STR_RELOCATE_HQ							:{BLACK}Relocate HQ
+STR_COMPANY_PASSWORD          :{BLACK}Password
+STR_COMPANY_PASSWORD_TOOLTIP  :{BLACK}Password-protect your company to prevent unauthorised users from joining. Use '*' to empty password.
+STR_SET_COMPANY_PASSWORD      :Set company password
 STR_7073_WORLD_RECESSION_FINANCIAL				:{BIGFONT}{BLACK}World Recession!{}{}Financial experts fear worst as economy slumps!
 STR_7074_RECESSION_OVER_UPTURN_IN				:{BIGFONT}{BLACK}Recession Over!{}{}Upturn in trade gives confidence to industries as economy strengthens!
 STR_7075_TOGGLE_LARGE_SMALL_WINDOW				:{BLACK}Toggle large/small window size
diff --git a/lang/finnish.txt b/lang/finnish.txt
index d70a3ef04..1c442e107 100644
--- a/lang/finnish.txt
+++ b/lang/finnish.txt
@@ -1936,7 +1936,7 @@ STR_683B_HOSTILE						:Vihamielinen
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Pelaaja {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Uudet kasvot
 STR_7005_COLOR_SCHEME						:{BLACK}Väriteema
diff --git a/lang/french.txt b/lang/french.txt
index ea3ec21e8..40f9d113d 100644
--- a/lang/french.txt
+++ b/lang/french.txt
@@ -1954,7 +1954,7 @@ STR_683B_HOSTILE						:Hostile
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Joueur {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Nouveau visage
 STR_7005_COLOR_SCHEME						:{BLACK}Couleur
diff --git a/lang/galician.txt b/lang/galician.txt
index 785f10c3e..3b145010c 100644
--- a/lang/galician.txt
+++ b/lang/galician.txt
@@ -1881,7 +1881,7 @@ STR_683B_HOSTILE						:Hostil
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Xogador {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Nova Cara
 STR_7005_COLOR_SCHEME						:{BLACK}Esquema de Cor
diff --git a/lang/german.txt b/lang/german.txt
index 1c0861c5e..aa79fdbb7 100644
--- a/lang/german.txt
+++ b/lang/german.txt
@@ -1954,7 +1954,7 @@ STR_683B_HOSTILE						:Feindlich
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Spieler {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Neues Gesicht
 STR_7005_COLOR_SCHEME						:{BLACK}Farbauswahl
diff --git a/lang/hungarian.txt b/lang/hungarian.txt
index 031fc073b..14f435628 100644
--- a/lang/hungarian.txt
+++ b/lang/hungarian.txt
@@ -1954,7 +1954,7 @@ STR_683B_HOSTILE						:Ellenséges
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:({COMMA16}. játékos)
 STR_7004_NEW_FACE						:{BLACK}Új arc
 STR_7005_COLOR_SCHEME						:{BLACK}Szín váltása
diff --git a/lang/italian.txt b/lang/italian.txt
index cbf5230d8..8b2ade4fc 100644
--- a/lang/italian.txt
+++ b/lang/italian.txt
@@ -1803,7 +1803,7 @@ STR_683B_HOSTILE						:Ostile
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Giocatore {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Nuova Faccia
 STR_7005_COLOR_SCHEME						:{BLACK}Colore Societŕ
diff --git a/lang/norwegian.txt b/lang/norwegian.txt
index bde2a667a..a6044f88e 100644
--- a/lang/norwegian.txt
+++ b/lang/norwegian.txt
@@ -1922,7 +1922,7 @@ STR_683B_HOSTILE						:Fientlig
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Spiller {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Nytt ansikt
 STR_7005_COLOR_SCHEME						:{BLACK}Firmafarge
diff --git a/lang/polish.txt b/lang/polish.txt
index 69b75504d..8ae1910ff 100644
--- a/lang/polish.txt
+++ b/lang/polish.txt
@@ -1939,7 +1939,7 @@ STR_683B_HOSTILE						:Wrogie
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Gracz {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}nowa twarz
 STR_7005_COLOR_SCHEME						:{BLACK}Schemat koloru
diff --git a/lang/portuguese.txt b/lang/portuguese.txt
index cfdcfdca6..aa02c230b 100644
--- a/lang/portuguese.txt
+++ b/lang/portuguese.txt
@@ -1863,7 +1863,7 @@ STR_683B_HOSTILE						:Hostil
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Jogador {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Nova Cara
 STR_7005_COLOR_SCHEME						:{BLACK}Cores
diff --git a/lang/romanian.txt b/lang/romanian.txt
index 30b775db0..75ab25598 100644
--- a/lang/romanian.txt
+++ b/lang/romanian.txt
@@ -1944,7 +1944,7 @@ STR_683B_HOSTILE						:ostilă
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Jucătorul {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Schimbă foto
 STR_7005_COLOR_SCHEME						:{BLACK}Culoare
diff --git a/lang/slovak.txt b/lang/slovak.txt
index bb924de1b..c0cc749be 100644
--- a/lang/slovak.txt
+++ b/lang/slovak.txt
@@ -1909,7 +1909,7 @@ STR_683B_HOSTILE						:Nepriatelsky
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Hrac {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Nova tvar
 STR_7005_COLOR_SCHEME						:{BLACK}Farebna schema
diff --git a/lang/spanish.txt b/lang/spanish.txt
index 6f65fb271..0bc856ee9 100644
--- a/lang/spanish.txt
+++ b/lang/spanish.txt
@@ -1942,7 +1942,7 @@ STR_683B_HOSTILE						:Hostil
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Jugador {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Nueva Cara
 STR_7005_COLOR_SCHEME						:{BLACK}Esquema Color
diff --git a/lang/swedish.txt b/lang/swedish.txt
index d8c4a2bf4..887d5c483 100644
--- a/lang/swedish.txt
+++ b/lang/swedish.txt
@@ -1942,7 +1942,7 @@ STR_683B_HOSTILE						:Fientlig
 
 ##id 0x7000
 STR_7000							:
-STR_7001							:{WHITE}{STRING}{BLACK}{STRING}
+STR_7001							:{WHITE}{STRING} {BLACK}{STRING}
 STR_7002_PLAYER							:(Spelare {COMMA16})
 STR_7004_NEW_FACE						:{BLACK}Nytt ansikte
 STR_7005_COLOR_SCHEME						:{BLACK}Färgval