(svn r16102) -Codechange: unify the vehicle info strings; reduce the number of duplicate strings and unifies the GUIs quite a bit

7 files changed, 0 insertions, 47 deletions

diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt
index b7b835030..d755bb345 100644
--- a/src/lang/unfinished/greek.txt
+++ b/src/lang/unfinished/greek.txt
@@ -259,8 +259,6 @@ STR_013C_CARGO                                                  :{BLACK}Φορτ
 STR_013D_INFORMATION                                            :{BLACK}Πληροφορίες
 STR_013E_CAPACITIES                                             :{BLACK}Χωρητικότητες
 STR_TOTAL_CARGO                                                 :{BLACK}Συνολικό Φορτίο
-STR_013F_CAPACITY                                               :{BLACK}Χωρητικότητα: {LTBLUE}{CARGO}{STRING}
-STR_CAPACITY_MULT                                               :{BLACK}Χωριτηκότητα: {LTBLUE}{CARGO}{STRING} (x{NUM})
 STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Συνολική χωρητικότητα φορτίου του τραίνου:
 STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt
index 4339e9199..9104cc3b5 100644
--- a/src/lang/unfinished/ido.txt
+++ b/src/lang/unfinished/ido.txt
@@ -171,7 +171,6 @@ STR_0130_RENAME                                                 :{BLACK}Rinomiza
 STR_013C_CARGO                                                  :{BLACK}Kargajo
 STR_013D_INFORMATION                                            :{BLACK}Informo
 STR_013E_CAPACITIES                                             :{BLACK}Kapacesi
-STR_013F_CAPACITY                                               :{BLACK}Kapaceso: {LTBLUE}{CARGO}{STRING}
 STR_0140_NEW_GAME                                               :{BLACK}Nova Ludo
 STR_0141_LOAD_GAME                                              :{BLACK}Charjas Ludo
 
diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt
index 75d20df34..d9887efb5 100644
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -257,8 +257,6 @@ STR_013C_CARGO                                                  :{BLACK}Това
 STR_013D_INFORMATION                                            :{BLACK}Информација
 STR_013E_CAPACITIES                                             :{BLACK}Капацитети
 STR_TOTAL_CARGO                                                 :{BLACK}Вкупно Товар
-STR_013F_CAPACITY                                               :{BLACK}Капацитет: {LTBLUE}{CARGO}{STRING}
-STR_CAPACITY_MULT                                               :{BLACK}Капацитет: {LTBLUE}{CARGO}{STRING} (x{NUM})
 STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Вкупен капацитет на овој воз:
 STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
@@ -843,17 +841,10 @@ STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Не м�
 STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Авион
 STR_A00A                                                        :{WHITE}{VEHICLE}
 STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Details)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Старост: {LTBLUE}{STRING}{BLACK}   Трошок за оперирање: {LTBLUE}{CURRENCY}/година
-STR_A00E_MAX_SPEED                                              :{BLACK}Макс. брзина: {LTBLUE}{VELOCITY}
-STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Профит оваа година: {LTBLUE}{CURRENCY}  (минатата година: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Сигурност: {LTBLUE}{COMMA}%  {BLACK}Кварови од последното сервисирање до сега: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{ENGINE}{BLACK}   Изградба: {LTBLUE}{NUM}{BLACK} Вредност: {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Не може да се прати авионот во гаража...
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Авион на патот
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Не може да сопре/тргне авионот...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Авионот е во лет
-STR_A019_CAPACITY                                               :{BLACK}Капацитет: {LTBLUE}{CARGO}, {CARGO}{STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Капацитет: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Авионот мора да се сопре во хангар
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Не може да се продаде авионот...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Изградба на аеродром
@@ -870,7 +861,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Прик
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Прикажи го авионот на средина
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Прати го авионот во хангар. CTRL+клик ќе го прати само на сервис
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Прикажи детали за авионот
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Цена: {CURRENCY} Макс. брзина: {VELOCITY}{}Капацитет: {COMMA} патници, {COMMA} торби пошта{}Трошок за оперирање: {CURRENCY}/година
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Име на авионот
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Не може да се именува авионот...
diff --git a/src/lang/unfinished/malay.txt b/src/lang/unfinished/malay.txt
index 8e0738aad..56c3f0ac8 100644
--- a/src/lang/unfinished/malay.txt
+++ b/src/lang/unfinished/malay.txt
@@ -219,8 +219,6 @@ STR_013C_CARGO                                                  :{BLACK}Kargo
 STR_013D_INFORMATION                                            :{BLACK}Maklumat
 STR_013E_CAPACITIES                                             :{BLACK}Kapasiti
 STR_TOTAL_CARGO                                                 :{BLACK}Jumlah Kargo
-STR_013F_CAPACITY                                               :{BLACK}Kapasiti: {LTBLUE}{CARGO}{STRING}
-STR_CAPACITY_MULT                                               :{BLACK}Kapasiti: {LTBLUE}{CARGO}{STRING} (x{NUM})
 STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Jumlah kapasiti kargo keretapi ini:
 STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
@@ -1141,8 +1139,6 @@ STR_02BF_CUSTOM                                                 :Custom
 
 
 ##id 0xA000
-STR_A019_CAPACITY                                               :{BLACK}Kapasiti: {LTBLUE}{CARGO}, {CARGO}{STRING}
-STR_A01A_CAPACITY                                               :{BLACK}Kapasiti: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING}
 STR_A01E_BUILD_AIRPORT                                          :{BLACK}Bina Lapangan Terbang
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nama kapal terbang
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index 534b795e5..65efe2463 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -188,7 +188,6 @@ STR_013B_OWNED_BY                                               :{WHITE} صاح�
 STR_013C_CARGO                                                  :{BLACK}محموله
 STR_013D_INFORMATION                                            :{BLACK}اطلاعات
 STR_013E_CAPACITIES                                             :{BLACK}ضرفیت ها
-STR_013F_CAPACITY                                               :{BLACK}ضرفیت: {LTBLUE}{CARGO}{STRING}
 STR_0140_NEW_GAME                                               :{BLACK}بازی جدید
 STR_0141_LOAD_GAME                                              :{BLACK}ادامه بازی های قبلی
 
@@ -1312,9 +1311,6 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}لیست
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}لغو دستور فعلی و شروع بعدی. Ctrl+Click دستور انتخاب شده را لغو می کند
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}پاک کردن دستور مشخص شده
 STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}وارد کردن دستور جدید قبل از دستور مشخص شده. یا اضافه کردن آن به آخر لیست
-STR_885C_BROKEN_DOWN                                            :{RED}از کار افتاده
-STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}سود این سال: {LTBLUE}{CURRENCY}  (سال قبل: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}قابلیت: {LTBLUE}{COMMA}%  {BLACK}دفعات خراب شدن از آخرین سرویس {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}متوقف شده
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}در هنگام خطر نمی توان علامت عبور قطار را داد
 STR_8863_CRASHED                                                :{RED}تصادف کرده!
@@ -1340,11 +1336,6 @@ STR_9006_NEW_ROAD_VEHICLES                                      :{WHITE}ماشی
 STR_9007_BUILD_VEHICLE                                          :{BLACK}ساخت وسیله نقلیه
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}نمی شود ماشین ساخت...
 STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (اطلاعات)
-STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}سن: {LTBLUE}{STRING}{BLACK}   هزینه ی جا به جایی: {LTBLUE}{CURRENCY}/yr
-STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}سود امسال : {LTBLUE}{CURRENCY}  (lپارسال: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}ضریب اطمینان: {LTBLUE}{COMMA}%  {BLACK}خرابی ها بعد از آخرین سرویس: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{ENGINE}{BLACK}  ساخته شده: {LTBLUE}{NUM}{BLACK} قیمت: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY                                               :{BLACK}ضرفیت: {LTBLUE}{CARGO}{STRING}
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}نمیشود ماشین را فروخت...
 
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}نام گذاری ماشین
@@ -1365,12 +1356,6 @@ STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}نمی �
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}قطار در راه است
 STR_980F                                                        :{WHITE}{VEHICLE}
 STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (اطلاعات)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}سن: {LTBLUE}{STRING}{BLACK}   هزینه ناوبری: {LTBLUE}{CURRENCY}/yr
-STR_9813_MAX_SPEED                                              :{BLACK}حد اکثر سرعت: {LTBLUE}{VELOCITY}
-STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}سود امسال: {LTBLUE}{CURRENCY}  (lپارسال: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}ضریب اطمینان: {LTBLUE}{COMMA}%  {BLACK}خرابی ها بعد از آخرین سرویس: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE                                            :{LTBLUE}{ENGINE}{BLACK}   ساخت: {LTBLUE}{NUM}{BLACK} قیمت: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}ظرفیت: {LTBLUE}{CARGO}{STRING}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}نمی شود کشتی را حرکت داد / متوقف کرد ...
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}ساخت بندر
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}کشی ها -برای اطلاعات بر روی کشتی کلیک کنید
@@ -1385,7 +1370,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}نمای
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}نمای اصلی از جایگاه کشتی
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}فرستادن کشتی به لنگرگاه. ctrl+click فقط سرویس میکند
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}نمایش مشخصات کشتی
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}بها : {CURRENCY} حد اکثر سرعت:{VELOCITY}{}ظرفیت: {CARGO}{}هزینه راه اندازی {CURRENCY}/سال
 STR_982F_NAME_SHIP                                              :{BLACK}نام گذاری کشتی
 
 STR_9831_NAME_SHIP                                              :{WHITE}نام گذاری کشتی
@@ -1418,17 +1402,11 @@ STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}نمی �
 STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} هواپیما
 STR_A00A                                                        :{WHITE}{VEHICLE}
 STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (مشخصات)
-STR_A00E_MAX_SPEED                                              :{BLACK}حداکثر سرعت:  {LTBLUE}{VELOCITY}
-STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}سود امسال:{LTBLUE}{CURRENCY} (سال قبل {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}قابلیت اطمینان: {LTBLUE}{COMMA}%  {BLACK}از کار افتادگی از آخرین سرویس: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{ENGINE}{BLACK} ساخته شده :{LTBLUE}{NUM}{BLACK}  قیمت:  {LTBLUE}{CURRENCY}
 STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}نمیتوان هواپیما را به آشیانه فرستاد. . .
 STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}{VEHICLE}در آشیانه در حال انتظار است
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}هواپیما در راه است
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}نمیتوان هواپاما را متوقف/آغاز به کار کرد
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}هواپاما در حال پرواز است
-STR_A019_CAPACITY                                               :{BLACK}ظرفیت: {LTBLUE}{CARGO}, {CARGO}{STRING}
-STR_A01A_CAPACITY                                               :{BLACK}ظرفیت: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}هواپیما باید در آشیانه متوقف شود
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}نمیتوان هواپیما را فروخت
 STR_A01D_AIRPORT_CONSTRUCTION                                   :ساختمان فرودگاه
@@ -1445,7 +1423,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}نمای
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}نمای اصلی از جایگاه هواپیما
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}ارسال هواپیما به آشیانه. Ctrl+Click  فقط سرویس می کند
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}نمایش مشخصات هوا پیما
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}بها: {CURRENCY} حد اکثر سرعت: {VELOCITY}{}ظرفیت: {COMMA} مسافر, {COMMA} بسته های نامه{} هزینه براه اندازی : {CURRENCY}/سال
 
 STR_A030_NAME_AIRCRAFT                                          :{WHITE}نامگذاری هواپیما
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}. . . نمیتوان نام هواپیما را انتخاب کرد
diff --git a/src/lang/unfinished/serbian.txt b/src/lang/unfinished/serbian.txt
index bb8730507..e500dc226 100644
--- a/src/lang/unfinished/serbian.txt
+++ b/src/lang/unfinished/serbian.txt
@@ -398,8 +398,6 @@ STR_013C_CARGO                                                  :{BLACK}Tovar
 STR_013D_INFORMATION                                            :{BLACK}Informacija
 STR_013E_CAPACITIES                                             :{BLACK}Kapaciteti
 STR_TOTAL_CARGO                                                 :{BLACK}Zbir Tovar
-STR_013F_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{CARGO}{STRING}
-STR_CAPACITY_MULT                                               :{BLACK}Kapacitet: {LTBLUE}{CARGO}{STRING} (x{NUM})
 STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Zbir tovar kapacitet nad ova trenirati:
 STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
@@ -2106,9 +2104,6 @@ STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Nova Že
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Napraviti Letelicu
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Letelice se ne može napraviti
 STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Leteluca
-STR_A00E_MAX_SPEED                                              :{BLACK}Maks. Brzina: {LTBLUE}{VELOCITY}
-STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit ove godine: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pouzdanost: {LTBLUE}{COMMA}%  {BLACK}Kvarovi od prošle posete: {LTBLUE}{COMMA}
 
 
 
diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt
index 05aa8a5ef..162c37380 100644
--- a/src/lang/unfinished/thai.txt
+++ b/src/lang/unfinished/thai.txt
@@ -257,8 +257,6 @@ STR_013B_OWNED_BY                                               :{WHITE}...เ�
 STR_013C_CARGO                                                  :{BLACK}สินค้า
 STR_013D_INFORMATION                                            :{BLACK}ข้อมูล
 STR_013E_CAPACITIES                                             :{BLACK}ปริมาณที่รับได้
-STR_013F_CAPACITY                                               :{BLACK}ความจุ: {LTBLUE}{CARGO}{STRING}
-STR_CAPACITY_MULT                                               :{BLACK}ความจุ: {LTBLUE}{CARGO}{STRING} (x{NUM})
 STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}ความจุสินค้าทั้งหมดของรถไฟขบวนนี้:
 STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})