(svn r15835) -Codechange: Prevent using the return value of DrawString as much as possible.

6 files changed, 6 insertions, 22 deletions

diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt
index 691a40242..5d8171cd0 100644
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -851,12 +851,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Transpor
 STR_2024                                                        :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsydzjes
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subsydzjes dy't oanbean wurde:
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} fan {STRING} nei {STRING}
-STR_2028_BY                                                     :{YELLOW} (foar {DATE_SHORT})
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} fan {STRING} nei {STRING}{YELLOW} (foar {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Gjin
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Tsjinsten dy't al subsydzje krije:
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} fan {STATION} nei {STATION}{YELLOW} ({COMPANY}
-STR_202D_UNTIL                                                  :{YELLOW}, oant {DATE_SHORT})
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} fan {STATION} nei {STATION}{YELLOW} ({COMPANY}{YELLOW}, oant {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subsydzje oanbieding ferrûn:{}{}{STRING} fan {STRING} nei {STRING} sil no net in subsydzje krije.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsydzje ôfrûn:{}{}{STRING} tsjinst fan {STATION} nei {STATION} krijt gjin subsydzje mear.
 STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsydzje oanbean:{}{}Earste{STRING} tsjinst fan {STRING} nei {STRING} krijt in jier subsydzje fan 'e gemeente!
diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt
index c3c22a4af..30a326cfb 100644
--- a/src/lang/unfinished/greek.txt
+++ b/src/lang/unfinished/greek.txt
@@ -1552,12 +1552,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Ποσο
 STR_2024                                                        :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Χρηματοδοτήσεις
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Τρέχουσες χρηματοδοτήσεις για υπηρεσίες παίρνοντας:
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} από {STRING} πρός {STRING}
-STR_2028_BY                                                     :{YELLOW} (έως {DATE_SHORT})
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} από {STRING} πρός {STRING}{YELLOW} (έως {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Κανένα
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Υπηρεσίες που έχουν χρηματοδοτηθεί:
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} από το σταθμό {STATION} προς το σταθμό {STATION}{YELLOW} ({COMPANY}
-STR_202D_UNTIL                                                  :{YELLOW}, έως {DATE_SHORT})
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} από το σταθμό {STATION} προς το σταθμό {STATION}{YELLOW} ({COMPANY}{YELLOW}, έως {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Έληξε προσφορά χρηματοδότησης:{}{}{STRING} από {STRING} πρός {STRING} δεν θα προσελκύουν χρηματοδότηση πια.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Η χρηματοδότηση αποσύρθηκε:{}{}{STRING} υπηρεσία {STATION} προς {STATION} δεν χρηματοδοτείται πια.
 STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Προσφορά χρηματοδότησης υπηρεσίας:{}{}Η πρώτη υπηρεσία για {STRING} από {STRING} προς {STRING} επιχορηγείται για ένα έτος από την τοπική αρχή!
diff --git a/src/lang/unfinished/malay.txt b/src/lang/unfinished/malay.txt
index 5355850d9..6da6469dd 100644
--- a/src/lang/unfinished/malay.txt
+++ b/src/lang/unfinished/malay.txt
@@ -1005,7 +1005,6 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} m
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Penarafan syarikat pengangkutan:
 STR_2024                                                        :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsidi
-STR_202D_UNTIL                                                  :{YELLOW}, sehingga {DATE_SHORT})
 STR_2038_FLATS                                                  :Pangsapuri
 STR_203C_THEATER                                                :Panggung Wayang
 STR_203D_STADIUM                                                :Stadium
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index 3eab78ce4..41f307ae2 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -710,10 +710,6 @@ STR_201E_STADIUM                                                :ورزشگاه
 STR_201F_OLD_HOUSES                                             :خانه قدیمی
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK} امتیازات شرکت
 STR_2024                                                        :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} از {STRING} به {STRING}
-STR_2028_BY                                                     :{YELLOW} (by {DATE_SHORT})
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} از {STATION} به {STATION}{YELLOW} ({COMPANY}
-STR_202D_UNTIL                                                  :{YELLOW}, تا {DATE_SHORT})
 STR_2036_COTTAGES                                               :کلبه ها
 STR_2037_HOUSES                                                 :خانه ها
 STR_2039_TALL_OFFICE_BLOCK                                      :ساختمان اداری بلند
@@ -1578,8 +1574,6 @@ STR_AI_RESET                                                    :{BLACK}بازن
 STR_AI_HUMAN_PLAYER                                             :بازیکن آدمیزاد
 STR_AI_RANDOM_AI                                                :انتخاب هوش مصنوعی به صورت اتفاقی
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}پارامترهای هوش مصنوعی
-STR_AI_AUTHOR                                                   :نویسنده:
-STR_AI_VERSION                                                  :version:
 ########
 
 ############ town controlled noise level
diff --git a/src/lang/unfinished/serbian.txt b/src/lang/unfinished/serbian.txt
index 5d9bca6fd..b3c112f0d 100644
--- a/src/lang/unfinished/serbian.txt
+++ b/src/lang/unfinished/serbian.txt
@@ -1034,12 +1034,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Kotiranj
 STR_2024                                                        :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subvencije
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subvencije u toku (u vezi preuzimanja navedenog tovara):
-STR_2027_FROM_TO                                                :{ORANGE}{STRING} iz naselja {STRING} u naselje {STRING}
-STR_2028_BY                                                     :{YELLOW} (pre {DATE_SHORT})
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} iz naselja {STRING} u naselje {STRING}{YELLOW} (pre {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Nema
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Odobrene subvencije:
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} između stanica {STATION} i {STATION}{YELLOW} ({COMPANY}
-STR_202D_UNTIL                                                  :{YELLOW}, do {DATE_SHORT})
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} između stanica {STATION} i {STATION}{YELLOW} ({COMPANY}{YELLOW}, do {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Ponuda subvencije istekla:{}{}{STRING} iz naselja {STRING} u naselje {STRING} je zatvorena za dalje interesente.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subvencija povučena:{}{}{STRING} usluga transporta između stanica {STATION} i {STATION} više nije u opticaju.
 STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Ponuda subvencije:{}{}Preduzimač koji prvi preveze {STRING.gen} od naselja {STRING} do naselja {STRING} stiče pravo na dodatni profit tokom sledeća 24 meseca!
diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt
index 7eb2f3b98..d9c9e9b9f 100644
--- a/src/lang/unfinished/thai.txt
+++ b/src/lang/unfinished/thai.txt
@@ -800,10 +800,7 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} �
 STR_2024                                                        :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}เงินอุดหนุน
 STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}ให้เงินอุดหนุนสำหรับการบริการ:
-STR_2028_BY                                                     :{YELLOW} (by {DATE_SHORT})
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}การบริการได้เงินอุดหนุนเรียบร้อยแล้ว:
-STR_202C_FROM_TO                                                :{ORANGE}{STRING} เดินทางจาก{STATION} ถึง {STATION}{YELLOW} ({COMPANY}
-STR_202D_UNTIL                                                  :{YELLOW}, จนถึง {DATE_SHORT})
 
 
 ##id 0x2800