summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-10-07 19:35:05 +0000
committerrubidium <rubidium@openttd.org>2009-10-07 19:35:05 +0000
commit8c37da1be680852d5429da8d5519fa3f799575e3 (patch)
treed6c0f7f08911b14ef30d1e5da0b8e479c7dc8751
parent429449cab8b9d291b2f87d03ebce6c6b4c075e49 (diff)
downloadopenttd-8c37da1be680852d5429da8d5519fa3f799575e3.tar.xz
(svn r17741) -Feature-ish [FS#3116]: show the nickname of the person you're PMing
-rw-r--r--src/lang/afrikaans.txt1
-rw-r--r--src/lang/arabic_egypt.txt1
-rw-r--r--src/lang/brazilian_portuguese.txt1
-rw-r--r--src/lang/bulgarian.txt1
-rw-r--r--src/lang/catalan.txt1
-rw-r--r--src/lang/croatian.txt1
-rw-r--r--src/lang/czech.txt1
-rw-r--r--src/lang/danish.txt1
-rw-r--r--src/lang/dutch.txt1
-rw-r--r--src/lang/english.txt2
-rw-r--r--src/lang/english_US.txt1
-rw-r--r--src/lang/esperanto.txt1
-rw-r--r--src/lang/estonian.txt1
-rw-r--r--src/lang/finnish.txt1
-rw-r--r--src/lang/french.txt1
-rw-r--r--src/lang/galician.txt1
-rw-r--r--src/lang/german.txt1
-rw-r--r--src/lang/greek.txt1
-rw-r--r--src/lang/hebrew.txt1
-rw-r--r--src/lang/hungarian.txt1
-rw-r--r--src/lang/icelandic.txt1
-rw-r--r--src/lang/indonesian.txt1
-rw-r--r--src/lang/italian.txt1
-rw-r--r--src/lang/japanese.txt1
-rw-r--r--src/lang/korean.txt1
-rw-r--r--src/lang/latvian.txt1
-rw-r--r--src/lang/lithuanian.txt1
-rw-r--r--src/lang/luxembourgish.txt1
-rw-r--r--src/lang/norwegian_bokmal.txt1
-rw-r--r--src/lang/norwegian_nynorsk.txt1
-rw-r--r--src/lang/polish.txt1
-rw-r--r--src/lang/portuguese.txt1
-rw-r--r--src/lang/romanian.txt1
-rw-r--r--src/lang/russian.txt1
-rw-r--r--src/lang/serbian.txt1
-rw-r--r--src/lang/simplified_chinese.txt1
-rw-r--r--src/lang/slovak.txt1
-rw-r--r--src/lang/slovenian.txt1
-rw-r--r--src/lang/spanish.txt1
-rw-r--r--src/lang/swedish.txt1
-rw-r--r--src/lang/traditional_chinese.txt1
-rw-r--r--src/lang/turkish.txt1
-rw-r--r--src/lang/ukrainian.txt1
-rw-r--r--src/lang/unfinished/frisian.txt1
-rw-r--r--src/lang/welsh.txt1
-rw-r--r--src/network/network_chat_gui.cpp12
46 files changed, 12 insertions, 46 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index 66d29fe57..710edf414 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -1650,7 +1650,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Stel maa
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Stuur
STR_NETWORK_CHAT_COMPANY_CAPTION :[Span] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privaat] :
STR_NETWORK_CHAT_ALL_CAPTION :[All] :
STR_NETWORK_CHAT_COMPANY :[Span] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index 9614e7aa4..13b750544 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -1677,7 +1677,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}ادخل
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}ارسل
STR_NETWORK_CHAT_COMPANY_CAPTION :[فريق]
-STR_NETWORK_CHAT_CLIENT_CAPTION :[خاص]:
STR_NETWORK_CHAT_ALL_CAPTION :[الكل]:
STR_NETWORK_CHAT_COMPANY :[فريق]{STRING} : {WHITE}{STRING}
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 94950e868..f69b714b8 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -1680,7 +1680,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Definir
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Enviar
STR_NETWORK_CHAT_COMPANY_CAPTION :[Equipe] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privado] :
STR_NETWORK_CHAT_ALL_CAPTION :[Todos] :
STR_NETWORK_CHAT_COMPANY :[Equipe] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index 2771e420a..66d87bbae 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -1664,7 +1664,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Пост
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Изпращане
STR_NETWORK_CHAT_COMPANY_CAPTION :[Team] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Private] :
STR_NETWORK_CHAT_ALL_CAPTION :[All] :
STR_NETWORK_CHAT_COMPANY :[Team] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index 9c4f295ae..aa99273ee 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -1679,7 +1679,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Establei
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Envia
STR_NETWORK_CHAT_COMPANY_CAPTION :[Team] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privat] :
STR_NETWORK_CHAT_ALL_CAPTION :[All] :
STR_NETWORK_CHAT_COMPANY :[Team] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index 65aded49d..c35d96272 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -1735,7 +1735,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Postavi
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Pošalji
STR_NETWORK_CHAT_COMPANY_CAPTION :[Ekipa]:
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privatno] :
STR_NETWORK_CHAT_ALL_CAPTION :[Svima] :
STR_NETWORK_CHAT_COMPANY :[Ekipa] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 36a4366ce..01931becb 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -1742,7 +1742,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Nastav h
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Poslat
STR_NETWORK_CHAT_COMPANY_CAPTION :[Tým] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Osobní] :
STR_NETWORK_CHAT_ALL_CAPTION :[Všichni] :
STR_NETWORK_CHAT_COMPANY :[Tým] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 43a863f15..da3ba9772 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -1677,7 +1677,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Sæt sel
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Send
STR_NETWORK_CHAT_COMPANY_CAPTION :[Hold] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privat] :
STR_NETWORK_CHAT_ALL_CAPTION :[Alle] :
STR_NETWORK_CHAT_COMPANY :[Hold] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index d961ba387..e3a3584e5 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -1679,7 +1679,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Geef bed
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Verstuur
STR_NETWORK_CHAT_COMPANY_CAPTION :[Team] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Prive] :
STR_NETWORK_CHAT_ALL_CAPTION :[Iedereen] :
STR_NETWORK_CHAT_COMPANY :[Team] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/english.txt b/src/lang/english.txt
index dc5ac2419..16bf14219 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1679,7 +1679,7 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Set comp
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Send
STR_NETWORK_CHAT_COMPANY_CAPTION :[Team] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Private] :
+STR_NETWORK_CHAT_CLIENT_CAPTION :[Private] {RAW_STRING}:
STR_NETWORK_CHAT_ALL_CAPTION :[All] :
STR_NETWORK_CHAT_COMPANY :[Team] {RAW_STRING}: {WHITE}{RAW_STRING}
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index c553af4de..c5acef38e 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -1679,7 +1679,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Set comp
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Send
STR_NETWORK_CHAT_COMPANY_CAPTION :[Team] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Private] :
STR_NETWORK_CHAT_ALL_CAPTION :[All] :
STR_NETWORK_CHAT_COMPANY :[Team] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index 7b4cc3290..1413b8410 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -1623,7 +1623,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Agordu k
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Sendu
STR_NETWORK_CHAT_COMPANY_CAPTION :[Teamo] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Private] :
STR_NETWORK_CHAT_ALL_CAPTION :[Ĉiuj] :
STR_NETWORK_CHAT_COMPANY :[Teamo] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index 7db9af9d2..5d24463dc 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -1734,7 +1734,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Vali ett
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Saada
STR_NETWORK_CHAT_COMPANY_CAPTION :[Team] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Private] :
STR_NETWORK_CHAT_ALL_CAPTION :[All] :
STR_NETWORK_CHAT_COMPANY :[Team] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index 279807cf6..e2c2c99d6 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -1679,7 +1679,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Aseta yh
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Lähetä
STR_NETWORK_CHAT_COMPANY_CAPTION :[Joukkue] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Yksityinen] :
STR_NETWORK_CHAT_ALL_CAPTION :[Kaikki] :
STR_NETWORK_CHAT_COMPANY :[Joukkue] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/french.txt b/src/lang/french.txt
index 3fea170b0..69116cf9d 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -1680,7 +1680,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Choisir
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Envoyer
STR_NETWORK_CHAT_COMPANY_CAPTION :[Equipe] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privé] :
STR_NETWORK_CHAT_ALL_CAPTION :[Tous] :
STR_NETWORK_CHAT_COMPANY :[Equipe] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index 5869a0f5f..ab9b52eb5 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -1651,7 +1651,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Establec
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Enviar
STR_NETWORK_CHAT_COMPANY_CAPTION :[Equipo] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privado] :
STR_NETWORK_CHAT_ALL_CAPTION :[Todos] :
STR_NETWORK_CHAT_COMPANY :[Equipo] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/german.txt b/src/lang/german.txt
index e12d4144b..67e718a54 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -1680,7 +1680,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Firmenpa
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Abschicken
STR_NETWORK_CHAT_COMPANY_CAPTION :[Team] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privat] :
STR_NETWORK_CHAT_ALL_CAPTION :[Alle] :
STR_NETWORK_CHAT_COMPANY :[Team] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index 3c7d3c7d8..370dc0998 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -1677,7 +1677,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Θέστ
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Στείλε
STR_NETWORK_CHAT_COMPANY_CAPTION :[Ομάδα] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Προσωπικό] :
STR_NETWORK_CHAT_ALL_CAPTION :[Σε όλους] :
STR_NETWORK_CHAT_COMPANY :[Ομάδα] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index 2ab7675bb..b436bda53 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -1680,7 +1680,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}קבע
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}שלח
STR_NETWORK_CHAT_COMPANY_CAPTION :[קבוצה] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[פרטי] :
STR_NETWORK_CHAT_ALL_CAPTION :[לכולם] :
STR_NETWORK_CHAT_COMPANY :[קבוצה] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 1fc4eb4f7..76cb96359 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -1713,7 +1713,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Vállala
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Elküld
STR_NETWORK_CHAT_COMPANY_CAPTION :[Csapat] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privát] :
STR_NETWORK_CHAT_ALL_CAPTION :[Mindenkinek] :
STR_NETWORK_CHAT_COMPANY :[Csapat] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index 3772054e6..bb0c97789 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -1671,7 +1671,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Setja ly
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Senda
STR_NETWORK_CHAT_COMPANY_CAPTION :[Team] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Private] :
STR_NETWORK_CHAT_ALL_CAPTION :[All] :
STR_NETWORK_CHAT_COMPANY :[Team] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index 678224d59..9506d4e83 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -1679,7 +1679,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Atur Kat
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Kirim
STR_NETWORK_CHAT_COMPANY_CAPTION :[Tim] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privat] :
STR_NETWORK_CHAT_ALL_CAPTION :[Semua] :
STR_NETWORK_CHAT_COMPANY :[Tim] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 887b3014d..8a07d14f4 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -1681,7 +1681,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Imposta
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Invia
STR_NETWORK_CHAT_COMPANY_CAPTION :[Squadra] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privato] :
STR_NETWORK_CHAT_ALL_CAPTION :[Tutti] :
STR_NETWORK_CHAT_COMPANY :[Squadra] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 422141454..7585b3300 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -1640,7 +1640,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}会社
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}送信
STR_NETWORK_CHAT_COMPANY_CAPTION :『チーム』:
-STR_NETWORK_CHAT_CLIENT_CAPTION :『秘密』:
STR_NETWORK_CHAT_ALL_CAPTION :『全員』:
STR_NETWORK_CHAT_COMPANY :『チーム』{STRING}:{WHITE}{STRING}
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 271ff8a2f..2e0be56bf 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -1680,7 +1680,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}회사
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}보내기
STR_NETWORK_CHAT_COMPANY_CAPTION :[팀] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[귓속말] :
STR_NETWORK_CHAT_ALL_CAPTION :[모두] :
STR_NETWORK_CHAT_COMPANY :[팀] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index a91436189..422c78ed4 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -1679,7 +1679,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Uzstād
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Sūtīt
STR_NETWORK_CHAT_COMPANY_CAPTION :[Komanda] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privāti] :
STR_NETWORK_CHAT_ALL_CAPTION :[Visiem] :
STR_NETWORK_CHAT_COMPANY :[Komanda] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index d8c80b49d..2b8478f35 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -1699,7 +1699,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Įvesti
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Siųsti
STR_NETWORK_CHAT_COMPANY_CAPTION :[Komandai] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privačiai] :
STR_NETWORK_CHAT_ALL_CAPTION :[Visiems] :
STR_NETWORK_CHAT_COMPANY :[Komandai] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index 9f1b21a1a..086fc83ca 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -1667,7 +1667,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Setzt d'
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Schécken
STR_NETWORK_CHAT_COMPANY_CAPTION :[Team] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privat] :
STR_NETWORK_CHAT_ALL_CAPTION :[All] :
STR_NETWORK_CHAT_COMPANY :[Team] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 0e5dfe2d4..ab4968b0c 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -1670,7 +1670,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Velg fir
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Send
STR_NETWORK_CHAT_COMPANY_CAPTION :[Lag] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privat] :
STR_NETWORK_CHAT_ALL_CAPTION :[Alle] :
STR_NETWORK_CHAT_COMPANY :[Lag] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 7096a245d..eb6400ca3 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -1650,7 +1650,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Vel firm
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Send
STR_NETWORK_CHAT_COMPANY_CAPTION :[Lag] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privat] :
STR_NETWORK_CHAT_ALL_CAPTION :[Alle] :
STR_NETWORK_CHAT_COMPANY :[Lag] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index a9cc7a1c6..cb1e43b45 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -2059,7 +2059,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Ustaw ha
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Wyślij
STR_NETWORK_CHAT_COMPANY_CAPTION :[Zespół] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Prywatna] :
STR_NETWORK_CHAT_ALL_CAPTION :[Wszyscy] :
STR_NETWORK_CHAT_COMPANY :[Zespół] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index 7086c1d5f..49d6517de 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -1679,7 +1679,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Definir
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Enviar
STR_NETWORK_CHAT_COMPANY_CAPTION :[Equipa] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privado] :
STR_NETWORK_CHAT_ALL_CAPTION :[Todos] :
STR_NETWORK_CHAT_COMPANY :[Equipa] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index 2cef2623c..a2101e176 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -1679,7 +1679,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Alege pa
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Trimite
STR_NETWORK_CHAT_COMPANY_CAPTION :[Team] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Private] :
STR_NETWORK_CHAT_ALL_CAPTION :[All] :
STR_NETWORK_CHAT_COMPANY :[Team] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 41543dd54..3720d88b8 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -1833,7 +1833,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Уста
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Отправить
STR_NETWORK_CHAT_COMPANY_CAPTION :[Команда] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Лично] :
STR_NETWORK_CHAT_ALL_CAPTION :[Всем] :
STR_NETWORK_CHAT_COMPANY :[Команда] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index e04520eb9..82c0fd5e6 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -1864,7 +1864,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Postavi
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Pošalji
STR_NETWORK_CHAT_COMPANY_CAPTION :[Ekipi] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privatno] :
STR_NETWORK_CHAT_ALL_CAPTION :[Svima] :
STR_NETWORK_CHAT_COMPANY :[Ekipi] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index 09200ae45..2aa9a09a4 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -1679,7 +1679,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}设置
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}发送
STR_NETWORK_CHAT_COMPANY_CAPTION :[团队] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[私聊] :
STR_NETWORK_CHAT_ALL_CAPTION :[全体] :
STR_NETWORK_CHAT_COMPANY :[团队] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 1a3eb2994..f7f1365f3 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -1746,7 +1746,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Nastavte
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Poslat
STR_NETWORK_CHAT_COMPANY_CAPTION :[Tim] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Súkromne] :
STR_NETWORK_CHAT_ALL_CAPTION :[Všetkým] :
STR_NETWORK_CHAT_COMPANY :[Tim] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index 24252a590..a8b2b8661 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -1712,7 +1712,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Nastavi
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Pošlji
STR_NETWORK_CHAT_COMPANY_CAPTION :[Skupina] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privatno] :
STR_NETWORK_CHAT_ALL_CAPTION :[Vsi] :
STR_NETWORK_CHAT_COMPANY :[Skupina] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 766a7208e..908c8773f 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -1680,7 +1680,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Configur
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Enviar
STR_NETWORK_CHAT_COMPANY_CAPTION :[Equipo] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privado] :
STR_NETWORK_CHAT_ALL_CAPTION :[Todos] :
STR_NETWORK_CHAT_COMPANY :[Equipo] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index 9b0d611b5..12704b1b2 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -1670,7 +1670,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Ange fö
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Skicka
STR_NETWORK_CHAT_COMPANY_CAPTION :[Företaget] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privat] :
STR_NETWORK_CHAT_ALL_CAPTION :[Alla] :
STR_NETWORK_CHAT_COMPANY :[Företaget] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index 437bfb33b..b57e772e9 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -1679,7 +1679,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}設定
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}傳送
STR_NETWORK_CHAT_COMPANY_CAPTION :[團隊]:
-STR_NETWORK_CHAT_CLIENT_CAPTION :[私人]:
STR_NETWORK_CHAT_ALL_CAPTION :[全員] :
STR_NETWORK_CHAT_COMPANY :[團隊] {STRING}:{WHITE}{STRING}
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index d7688e4cd..7d2ef900d 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -1680,7 +1680,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Şirket
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Gönder
STR_NETWORK_CHAT_COMPANY_CAPTION :[Takım] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Özel] :
STR_NETWORK_CHAT_ALL_CAPTION :[Herkes] :
STR_NETWORK_CHAT_COMPANY :[Takım] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 048ba0776..bb782895f 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -1804,7 +1804,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Вста
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Відправити
STR_NETWORK_CHAT_COMPANY_CAPTION :[Команда] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Приватно] :
STR_NETWORK_CHAT_ALL_CAPTION :[Всім] :
STR_NETWORK_CHAT_COMPANY :[Команда] {STRING}: {WHITE}{STRING}
diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt
index c8b0bc444..20d434d3f 100644
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -1030,7 +1030,6 @@ STR_NETWORK_SERVER :Tsjinner
# Network chat
STR_NETWORK_CHAT_COMPANY_CAPTION :[Team] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Privee] :
STR_NETWORK_CHAT_COMPANY :[Team] {STRING}: {WHITE}{STRING}
STR_NETWORK_CHAT_TO_COMPANY :[Team] Oan {STRING}: {WHITE}{STRING}
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index 4c6d0dd2f..5893406b3 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -1670,7 +1670,6 @@ STR_COMPANY_VIEW_SET_PASSWORD :{BLACK}Gosod cy
# Network chat
STR_NETWORK_CHAT_SEND :{BLACK}Anfon
STR_NETWORK_CHAT_COMPANY_CAPTION :[Tîm] :
-STR_NETWORK_CHAT_CLIENT_CAPTION :[Preifat] :
STR_NETWORK_CHAT_ALL_CAPTION :[Pawb] :
STR_NETWORK_CHAT_COMPANY :[Tîm] {STRING}: {WHITE}{STRING}
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index 3d10b72d0..8e9b4cc66 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -452,13 +452,23 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *resize)
{
if (widget != NWCW_DESTINATION) return;
- *size = maxdim(*size, GetStringBoundingBox(this->dest_string));
+
+ if (this->dtype == DESTTYPE_CLIENT) {
+ SetDParamStr(0, NetworkFindClientInfoFromClientID((ClientID)this->dest)->client_name);
+ }
+ Dimension d = GetStringBoundingBox(this->dest_string);
+ d.width += WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT;
+ d.height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
+ *size = maxdim(*size, d);
}
virtual void DrawWidget(const Rect &r, int widget) const
{
if (widget != NWCW_DESTINATION) return;
+ if (this->dtype == DESTTYPE_CLIENT) {
+ SetDParamStr(0, NetworkFindClientInfoFromClientID((ClientID)this->dest)->client_name);
+ }
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, this->dest_string, TC_BLACK, SA_RIGHT);
}