# HG changeset patch # User yexo # Date 2009-03-24 20:03:02 # Node ID e22b88c37c9deda2e7a4893227002c642c604780 # Parent 06f279671c69805791b5e58640cfaa7b2d25764e (svn r15835) -Codechange: Prevent using the return value of DrawString as much as possible. diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -95,13 +95,11 @@ struct AIListWindow : public Window { /* Some info about the currently selected AI. */ if (selected_info != NULL) { int y = this->widget[AIL_WIDGET_INFO_BG].top + 6; - int x = DrawString(this->widget[AIL_WIDGET_LIST].left + 4, this->widget[AIL_WIDGET_LIST].right - 4, y, STR_AI_AUTHOR, TC_BLACK); - DrawString(x + 5, this->widget[AIL_WIDGET_LIST].right - 4, y, selected_info->GetAuthor(), TC_BLACK); + SetDParamStr(0, selected_info->GetAuthor()); + DrawString(4, this->widget[AIL_WIDGET_INFO_BG].right - 4, y, STR_AI_AUTHOR, TC_BLACK); y += 13; - x = DrawString(this->widget[AIL_WIDGET_LIST].left + 4, this->widget[AIL_WIDGET_LIST].right - 4, y, STR_AI_VERSION, TC_BLACK); - static char buf[8]; - sprintf(buf, "%d", selected_info->GetVersion()); - DrawString(x + 5, this->widget[AIL_WIDGET_LIST].right - 4, y, buf, TC_BLACK); + SetDParam(0, selected_info->GetVersion()); + DrawString(4, this->widget[AIL_WIDGET_INFO_BG].right - 4, y, STR_AI_VERSION, TC_BLACK); y += 13; SetDParamStr(0, selected_info->GetDescription()); DrawStringMultiLine(4, this->width - 8, y, this->widget[AIL_WIDGET_INFO_BG].bottom, STR_JUST_RAW_STRING); diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1664,12 +1664,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsidiee STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subsidiee op aanbod vir diens opneming: -STR_2027_FROM_TO :{ORANGE}{STRING} van {STRING} tot {STRING} -STR_2028_BY :{YELLOW} (voor {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} van {STRING} tot {STRING}{YELLOW} (voor {DATE_SHORT}) STR_202A_NONE :{ORANGE}Geen STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Dienste reeds gesubsidieer: -STR_202C_FROM_TO :{ORANGE}{STRING} van {STATION} tot {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, tot {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} van {STATION} tot {STATION}{YELLOW} ({COMPANY}{YELLOW}, tot {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Aanbod van subsidie verval:{}{}{STRING} van {STRING} tot {STRING} sal nou nie 'n subsidie aantrek nie. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subsidie terugtrek:{}{}{STRING} diens van {STATION} tot {STATION} is nie meer gesubsideieer nie. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Diens subsidie aanbod:{}{}Eerste {STRING} diens van {STRING} tot {STRING} sal 'n jaar se subsidie van die plaaslike raad kry! @@ -3100,9 +3098,9 @@ STR_LOADGAME_REMOVED_TRAMS STR_CURRENCY_WINDOW :{WHITE}Gewoonte koers STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Wissel koers: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Afskeier -STR_CURRENCY_PREFIX :{LTBLUE}Vervoegsel: -STR_CURRENCY_SUFFIX :{LTBLUE}Agtervoegsel: +STR_CURRENCY_SEPARATOR :{LTBLUE}Afskeier {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Vervoegsel: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Agtervoegsel: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Verwissel na Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Verwissel na Euro: {ORANGE}nooit STR_CURRENCY_PREVIEW :{LTBLUE}Voorskou: {ORANGE}{CURRENCY} diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -1714,12 +1714,8 @@ 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_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_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} سوف يعطي زيادة ارباح في السنة القادمة. @@ -3178,9 +3174,6 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}اللعبة حفظت بنسخة لا تدعم الترام. كل ما يتعلق بالترام حذف. STR_CURRENCY_WINDOW :{WHITE}عمله مخصصه STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}معامل التبديل: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}فاصل: -STR_CURRENCY_PREFIX :{LTBLUE}رمز البداية: -STR_CURRENCY_SUFFIX :{LTBLUE}رمز اللاحق: STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}حول إلى يورو : {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}حول إلى يورو : {ORANGE}أبدا STR_CURRENCY_PREVIEW :{LTBLUE}عرض: {ORANGE}{CURRENCY} @@ -3581,8 +3574,6 @@ STR_AI_RESET :{BLACK} اعادة ضبط STR_AI_HUMAN_PLAYER :لاعب انساني STR_AI_RANDOM_AI :ذكاء صناعي عشوائي STR_AI_SETTINGS_CAPTION :{WHITE} خصائص الذكاء الصناعي -STR_AI_AUTHOR :المحرر: -STR_AI_VERSION :النسخة: STR_AI_PLEASE_REPORT_CRASH :{WHITE} واحد من الذكاء الصناعي فشل. الرجاء ابلاغ المبرمج عنه مصحوبا بصورة من شاشة مصحح الاخطاء. ######## diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1714,12 +1714,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Avaliações das empresas STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsídios STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ofertas de transporte subsidiados -STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} para {STRING} -STR_2028_BY :{YELLOW} (em {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} para {STRING}{YELLOW} (em {DATE_SHORT}) STR_202A_NONE :{ORANGE}Nenhum STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Transporte subsidiados: -STR_202C_FROM_TO :{ORANGE}{STRING} de {STATION} para {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, até {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} de {STATION} para {STATION}{YELLOW} ({COMPANY}{YELLOW}, até {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}A oferta do subsídio expirou:{}{} Transporte de {STRING} de {STRING} para {STRING} não será mais subsidiado. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subsídio removido:{}{} Transporte de {STRING} de {STATION} para {STATION} não será mais subsidiado. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Oferta de transporte subsidiado:{}{} Primeiro transporte de {STRING} de {STRING} para {STRING} receberá o subsídio de um ano da autoridade local! @@ -3178,9 +3176,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Jogo foi salvo numa versão sem suporte a bondes. Todos os bondes foram removidos. STR_CURRENCY_WINDOW :{WHITE}Moeda Modificada STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Taxa de câmbio: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Separador: -STR_CURRENCY_PREFIX :{LTBLUE}Prefixo: -STR_CURRENCY_SUFFIX :{LTBLUE}Sufixo: +STR_CURRENCY_SEPARATOR :{LTBLUE}Separador: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefixo: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Sufixo: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Mudar para Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Mudar para Euro: {ORANGE}nunca STR_CURRENCY_PREVIEW :{LTBLUE}Prevêr: {ORANGE}{CURRENCY} @@ -3582,8 +3580,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Jogador Humano STR_AI_RANDOM_AI :IA Randômica STR_AI_SETTINGS_CAPTION :{WHITE}Parâmetros da IA -STR_AI_AUTHOR :Progamador: -STR_AI_VERSION :Versão: +STR_AI_AUTHOR :Progamador: {STRING} +STR_AI_VERSION :Versão: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Uma das IA's travou. Favor relatar ao autor da IA com uma screenshot da Janela de Debug da IA. ######## diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1693,12 +1693,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} ще спечели едногодишна субсидия от местните власти! @@ -3155,9 +3153,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Играта бе записана във версия без поддръжка на трамваи. Всички трамваи са изтрити. STR_CURRENCY_WINDOW :{WHITE}Парична единица STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Обменен курс: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Разделител: -STR_CURRENCY_PREFIX :{LTBLUE}Представка: -STR_CURRENCY_SUFFIX :{LTBLUE}Надставка: +STR_CURRENCY_SEPARATOR :{LTBLUE}Разделител: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Представка: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Надставка: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Преобразуване в евро: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Преобразуване в евро: {ORANGE}никога STR_CURRENCY_PREVIEW :{LTBLUE}Преглед: {ORANGE}{CURRENCY} @@ -3549,8 +3547,8 @@ STR_AI_CLOSE :{BLACK}Затвари STR_AI_HUMAN_PLAYER :Човешки играч STR_AI_RANDOM_AI :Случаен AI STR_AI_SETTINGS_CAPTION :{WHITE}AI Параметри -STR_AI_AUTHOR :Автор: -STR_AI_VERSION :Версия: +STR_AI_AUTHOR :Автор: {STRING} +STR_AI_VERSION :Версия: {NUM} ######## ############ town controlled noise level diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subvencions STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subvencions per prestació de serveis oferts: -STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} a {STRING} -STR_2028_BY :{YELLOW} (per {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} a {STRING}{YELLOW} (per {DATE_SHORT}) STR_202A_NONE :{ORANGE}Cap STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Serveis ja subvencionats: -STR_202C_FROM_TO :{ORANGE}{STRING} des de {STATION} fins a {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, fins a {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} des de {STATION} fins a {STATION}{YELLOW} ({COMPANY}{YELLOW}, fins a {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Oferiment de subvenció caducada: {}{}{STRING} des de {STRING} fins a {STRING} s'ha declarat desert. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subvenció retirada:{}{}{STRING} des de {STATION} fins a {STATION} ja no està subvencionat. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Subvenció per un servei oferta:{}{} El primer servei de {STRING} des de {STRING} fins a {STRING} tindrà una subvenció d'un any de l'autoritat local! @@ -3177,9 +3175,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}El joc s'ha desat en una versió sense suport de tramvies. Tots els tramvies s'han eliminat. STR_CURRENCY_WINDOW :{WHITE}Moneda personalitzada STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Canvi de moneda: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Separador: -STR_CURRENCY_PREFIX :{LTBLUE}Prefix: -STR_CURRENCY_SUFFIX :{LTBLUE}Sufix: +STR_CURRENCY_SEPARATOR :{LTBLUE}Separador: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefix: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Sufix: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Canvi a Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Canvi a Euro: {ORANGE}mai STR_CURRENCY_PREVIEW :{LTBLUE}Vista prèvia: {ORANGE}{CURRENCY} @@ -3581,8 +3579,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Jugador humà STR_AI_RANDOM_AI :IA Aleatòria STR_AI_SETTINGS_CAPTION :{WHITE}Paràmetres IA -STR_AI_AUTHOR :Autor: -STR_AI_VERSION :Versió: +STR_AI_AUTHOR :Autor: {STRING} +STR_AI_VERSION :Versió: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Una de les IAs s'ha penjat. Si us plau reporta això a l'autor de la IA amb una captura de pantalla de la finestra de depuració IA. ######## diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1779,12 +1779,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subvencije STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ponuđene subvencije za pružanje usluga: -STR_2027_FROM_TO :{ORANGE}{STRING} od {STRING} do {STRING} -STR_2028_BY :{YELLOW} (do {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} od {STRING} do {STRING}{YELLOW} (do {DATE_SHORT}) STR_202A_NONE :{ORANGE}Ništa STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Usluge subvencionirane: -STR_202C_FROM_TO :{ORANGE}{STRING} iz {STATION} prema {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, do {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} iz {STATION} prema {STATION}{YELLOW} ({COMPANY}{YELLOW}, do {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Istekla je ponuda subvencije:{}{}Prijevoz {STRING.gen} od {STRING} do {STRING} više ne će biti subvencioniran. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subvencija je povučena:{}{}Prijevoz {STRING.gen} od postaje {STATION} do postaje {STATION} više nije subvencioniran. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Ponuđena je subvencija:{}{}Prvi koji preveze {STRING.aku} od {STRING} do {STRING} primat će jednogodišnju subvenciju od lokalne samouprave! @@ -3243,9 +3241,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Igra je bila spremljena u verziji bez podrške za tramvaje. Zbog toga su svi tramvaji uklonjeni. STR_CURRENCY_WINDOW :{WHITE}Proizvoljna valuta STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Devizni tečaj: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Razdjelnik: -STR_CURRENCY_PREFIX :{LTBLUE}Prefiks: -STR_CURRENCY_SUFFIX :{LTBLUE}Sufiks: +STR_CURRENCY_SEPARATOR :{LTBLUE}Razdjelnik: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefiks: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Sufiks: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Prebaci se na euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Prebaci se na euro: {ORANGE}nikad STR_CURRENCY_PREVIEW :{LTBLUE}Prikaz: {ORANGE}{CURRENCY} @@ -3647,8 +3645,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Ljudski igrač STR_AI_RANDOM_AI :Nasumična UI STR_AI_SETTINGS_CAPTION :{WHITE}Parametri UI -STR_AI_AUTHOR :Autor: -STR_AI_VERSION :Verzija: +STR_AI_AUTHOR :Autor: {STRING} +STR_AI_VERSION :Verzija: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Jedan od igrača sa UI se srušio. Molimo vas da prijavite ovo autoru UI sa screenshotom AI Debug prozora ######## diff --git a/src/lang/czech.txt b/src/lang/czech.txt --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1781,12 +1781,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Hodnocení společností: STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Dotace STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Nabídnuté dotace pro službu: -STR_2027_FROM_TO :{ORANGE}{STRING.big} z {STRING} do {STRING} -STR_2028_BY :{YELLOW} (do {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING.big} z {STRING} do {STRING}{YELLOW} (do {DATE_SHORT}) STR_202A_NONE :{ORANGE}Nic STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Již přiznané dotace: -STR_202C_FROM_TO :{ORANGE}{STRING.big} z {STATION} do {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, do {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING.big} z {STATION} do {STATION}{YELLOW} ({COMPANY}{YELLOW}, do {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Nabídka dotace přepravy vypršela:{}{}Dotace dopravy {STRING.gen} z{NBSP}{STRING} do {STRING} nebude dále nabízena. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Ukončení dotování dopravy:{}{}Dotace pro {STRING} z{NBSP}{STATION} do {STATION} již nebude dále poskytována. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Nabídka dotace:{}{}Doprava {STRING.gen} z{NBSP}{STRING} do {STRING} bude jeden rok dotována místní správou! @@ -3251,9 +3249,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Hra byla uložena ve verzi bez podpory tramvají. Všechny tramvaje se odstraní. STR_CURRENCY_WINDOW :{WHITE}Vlastní měna STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Kurz měny: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Oddělovač: -STR_CURRENCY_PREFIX :{LTBLUE}Předpona: -STR_CURRENCY_SUFFIX :{LTBLUE}Přípona: +STR_CURRENCY_SEPARATOR :{LTBLUE}Oddělovač: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Předpona: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Přípona: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Přechod k euru: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Přechod k euru: {ORANGE}nikdy STR_CURRENCY_PREVIEW :{LTBLUE}Náhled: {ORANGE}{CURRENCY} @@ -3655,8 +3653,8 @@ STR_AI_RESET :{BLACK}Obnovit nastavení STR_AI_HUMAN_PLAYER :Lidský hráč STR_AI_RANDOM_AI :Náhodná AI STR_AI_SETTINGS_CAPTION :{WHITE}Parametery AI -STR_AI_AUTHOR :Autor: -STR_AI_VERSION :Verze: +STR_AI_AUTHOR :Autor: {STRING} +STR_AI_VERSION :Verze: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Některá z bežících AI skončila s chybou. Prosím oznamte toto autorovi AI spolu se screenshotem okna Ladění AI. ######## diff --git a/src/lang/danish.txt b/src/lang/danish.txt --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transportselskabsbedømmelse: STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Tilskudsordninger STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Tilskudsordninger i licitation: -STR_2027_FROM_TO :{ORANGE}{STRING} fra {STRING} til {STRING} -STR_2028_BY :{YELLOW} (inden {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} fra {STRING} til {STRING}{YELLOW} (inden {DATE_SHORT}) STR_202A_NONE :{ORANGE}Ingen STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Tilskudsordninger der allerede er vundet: -STR_202C_FROM_TO :{ORANGE}{STRING} fra {STATION} til {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, indtil {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} fra {STATION} til {STATION}{YELLOW} ({COMPANY}{YELLOW}, indtil {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Licitation af tilskudsordning udløbet:{}{}{STRING} fra {STRING} til {STRING} vil ikke længere udløse tilskud. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Tilskudsordning tilbagetrukket:{}{}{STRING} fragt fra {STATION} til {STATION} modtager ikke længere tilskud. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Tilskudsordning i licitation:{}{}Første {STRING} fragt fra {STRING} til {STRING} vil udløse et års tilskud fra de lokale myndigheder! @@ -3177,9 +3175,9 @@ STR_LOADGAME_REMOVED_TRAMS STR_CURRENCY_WINDOW :{WHITE}Brugerdefineret møntfod STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Kurs: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Tilskuer: -STR_CURRENCY_PREFIX :{LTBLUE}Præfiks: -STR_CURRENCY_SUFFIX :{LTBLUE}Endetillæg: +STR_CURRENCY_SEPARATOR :{LTBLUE}Tilskuer: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Præfiks: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Endetillæg: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Skift til Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Skift til Euro: {ORANGE}aldrig STR_CURRENCY_PREVIEW :{LTBLUE}Eksempel: {ORANGE}{CURRENCY} @@ -3581,8 +3579,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Menneskelig spiller STR_AI_RANDOM_AI :Tilfældig computerspiller STR_AI_SETTINGS_CAPTION :{WHITE}Computerspiller-parametre -STR_AI_AUTHOR :Skaber: -STR_AI_VERSION :Version: +STR_AI_AUTHOR :Skaber: {STRING} +STR_AI_VERSION :Version: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}En computerstyret spiller gik ned. Rapporter det venligst til udvikleren af computerspilleren med et skærmbilledet af computerspiller-debugvinduet. ######## diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsidies STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Beschikbare subsidies: -STR_2027_FROM_TO :{ORANGE}{STRING} van {STRING} naar {STRING} -STR_2028_BY :{YELLOW} (voor {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} van {STRING} naar {STRING}{YELLOW} (voor {DATE_SHORT}) STR_202A_NONE :{ORANGE}Geen STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Bestaande subsidies: -STR_202C_FROM_TO :{ORANGE}{STRING} van {STATION} naar {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, tot {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} van {STATION} naar {STATION}{YELLOW} ({COMPANY}{YELLOW}, tot {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Subsidieaanbod is verlopen:{}{}{STRING} van {STRING} naar {STRING} wordt nu niet meer gesubsidieerd. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subsidie teruggetrokken:{}{}{STRING}route van {STATION} naar {STATION} is nu niet meer gesubsidieerd. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Subsidie aangeboden:{}{}Eerste {STRING}route van {STRING} naar {STRING} krijgt een jaar lang subsidie van de gemeente! @@ -3177,9 +3175,9 @@ STR_LOADGAME_REMOVED_TRAMS STR_CURRENCY_WINDOW :{WHITE}Aangepaste valuta STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Wisselkoers: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Scheidingsteken: -STR_CURRENCY_PREFIX :{LTBLUE}Voorvoegsel: -STR_CURRENCY_SUFFIX :{LTBLUE}Achtervoegsel: +STR_CURRENCY_SEPARATOR :{LTBLUE}Scheidingsteken: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Voorvoegsel: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Achtervoegsel: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Overgaan op de Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Overgaan op de Euro: {ORANGE}nooit STR_CURRENCY_PREVIEW :{LTBLUE}Voorbeeld: {ORANGE}{CURRENCY} @@ -3581,8 +3579,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Menselijke speler STR_AI_RANDOM_AI :Willekeurige AI STR_AI_SETTINGS_CAPTION :{WHITE}AI Parameters -STR_AI_AUTHOR :Maker: -STR_AI_VERSION :Versie: +STR_AI_AUTHOR :Maker: {STRING} +STR_AI_VERSION :Versie: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Een van de draaiende AI's is gecrashed. Meldt dit bij de schrijver van deze AI met een schermprint van het AI Debugscherm. ######## diff --git a/src/lang/english.txt b/src/lang/english.txt --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsidies STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subsidies on offer for services taking: -STR_2027_FROM_TO :{ORANGE}{STRING} from {STRING2} to {STRING2} -STR_2028_BY :{YELLOW} (by {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} from {STRING2} to {STRING2}{YELLOW} (by {DATE_SHORT}) STR_202A_NONE :{ORANGE}None STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Services already subsidised: -STR_202C_FROM_TO :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, until {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({COMPANY}{YELLOW}, until {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Offer of subsidy expired:{}{}{STRING} from {STRING2} to {STRING2} will now not attract a subsidy. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subsidy withdrawn:{}{}{STRING} service from {STATION} to {STATION} is no longer subsidised. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Service subsidy offered:{}{}First {STRING} service from {STRING2} to {STRING2} will attract a year's subsidy from the local authority! @@ -3177,9 +3175,9 @@ STR_LOADGAME_REMOVED_TRAMS STR_CURRENCY_WINDOW :{WHITE}Custom currency STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Exchange rate: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Separator: -STR_CURRENCY_PREFIX :{LTBLUE}Prefix: -STR_CURRENCY_SUFFIX :{LTBLUE}Suffix: +STR_CURRENCY_SEPARATOR :{LTBLUE}Separator: {RAW_STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefix: {RAW_STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Suffix: {RAW_STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Switch to Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Switch to Euro: {ORANGE}never STR_CURRENCY_PREVIEW :{LTBLUE}Preview: {ORANGE}{CURRENCY} @@ -3581,8 +3579,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Human player STR_AI_RANDOM_AI :Random AI STR_AI_SETTINGS_CAPTION :{WHITE}AI Parameters -STR_AI_AUTHOR :Author: -STR_AI_VERSION :Version: +STR_AI_AUTHOR :Author: {RAW_STRING} +STR_AI_VERSION :Version: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}One of the running AIs crashed. Please report this to the AI author with a screenshot of the AI Debug Window. ######## diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsidies STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subsidies on offer for services taking: -STR_2027_FROM_TO :{ORANGE}{STRING} from {STRING} to {STRING} -STR_2028_BY :{YELLOW} (by {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} from {STRING} to {STRING}{YELLOW} (by {DATE_SHORT}) STR_202A_NONE :{ORANGE}None STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Services already subsidized: -STR_202C_FROM_TO :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, until {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({COMPANY}{YELLOW}, until {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Offer of subsidy expired:{}{}{STRING} from {STRING} to {STRING} will now not attract a subsidy. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subsidy withdrawn:{}{}{STRING} service from {STATION} to {STATION} is no longer subsidized. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Service subsidy offered:{}{}First {STRING} service from {STRING} to {STRING} will attract a year's subsidy from the local authority! @@ -3177,9 +3175,9 @@ STR_LOADGAME_REMOVED_TRAMS STR_CURRENCY_WINDOW :{WHITE}Custom currency STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Exchange rate: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Separator: -STR_CURRENCY_PREFIX :{LTBLUE}Prefix: -STR_CURRENCY_SUFFIX :{LTBLUE}Suffix: +STR_CURRENCY_SEPARATOR :{LTBLUE}Separator: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefix: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Suffix: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Switch to Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Switch to Euro: {ORANGE}never STR_CURRENCY_PREVIEW :{LTBLUE}Preview: {ORANGE}{CURRENCY} @@ -3581,8 +3579,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Human player STR_AI_RANDOM_AI :Random AI STR_AI_SETTINGS_CAPTION :{WHITE}AI Parameters -STR_AI_AUTHOR :Author: -STR_AI_VERSION :Version: +STR_AI_AUTHOR :Author: {STRING} +STR_AI_VERSION :Version: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}One of the running AIs crashed. Please report this to the AI author with a screenshot of the AI Debug Window. ######## diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1503,12 +1503,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subvencioj STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subvencioj haveblas por jenaj servoj: -STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} al {STRING} -STR_2028_BY :{YELLOW} (antaŭ {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} al {STRING}{YELLOW} (antaŭ {DATE_SHORT}) STR_202A_NONE :{ORANGE}Neniu STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Servoj subvenciataj: -STR_202C_FROM_TO :{ORANGE}{STRING} de {STATION} al {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, ĝis {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} de {STATION} al {STATION}{YELLOW} ({COMPANY}{YELLOW}, ĝis {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Subvencia oferto ne plu validas:{}{}{STRING} de {STRING} al {STRING} ne estos subvenciata. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subvencio retiriĝis:{}{}Servo de {STRING} de {STATION} al {STATION} ne plu estas subvenciata. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Subvencia oferto:{}{}Unua servo de {STRING} de {STRING} al {STRING} ricevos subvencion de jaro de la lokaj estroj! @@ -2782,9 +2780,9 @@ STR_NEWGRF_DISABLED_WARNING :{WHITE}Manka(j) GRF-dosiero(j) malŝaltiĝis STR_CURRENCY_WINDOW :{WHITE}Alia monunuo STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Interŝanĝa valoro: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Dividilo: -STR_CURRENCY_PREFIX :{LTBLUE}Prefikso: -STR_CURRENCY_SUFFIX :{LTBLUE}Sufikso: +STR_CURRENCY_SEPARATOR :{LTBLUE}Dividilo: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefikso: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Sufikso: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Ŝanĝu al Eŭroj: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Ŝanĝu al Eŭroj: {ORANGE}neniam STR_CURRENCY_PREVIEW :{LTBLUE}Antaŭvido: {ORANGE}{CURRENCY} diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1711,12 +1711,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Ettevõtete hinnangud: STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Toetused STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Pakutavad toetused teenusepakkumise eest: -STR_2027_FROM_TO :{ORANGE}{STRING} kohast {STRING} kohta {STRING} -STR_2028_BY :{YELLOW} (kuni {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} kohast {STRING} kohta {STRING}{YELLOW} (kuni {DATE_SHORT}) STR_202A_NONE :{ORANGE}Mitte ühtegi STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Juba toetatavad veoteenused: -STR_202C_FROM_TO :{ORANGE}{STRING} kohast {STATION} kohta {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, kuni {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} kohast {STATION} kohta {STATION}{YELLOW} ({COMPANY}{YELLOW}, kuni {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Toetuse pakkumine lõppes: {}{}{STRING.g} kohast {STRING} kohta {STRING} veoste eest ei maksta enam toetusi. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Toetuse maksmise aeg sai läbi:{}{}{STRING}kohast {STATION} kohta {STATION} eest ei maksta enam edaspidi toetust. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Veoteenusele pakutakse toetust:{}{}{STRING.g}veo eest linnast {STRING} linna {STRING}. Esimesele teenusepakkujale makstakse aasta läbi toetusi! @@ -3155,9 +3153,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Mäng salvestati trammide toetuseta versioonis. Kõik trammid eemaldati. STR_CURRENCY_WINDOW :{WHITE}Isiklik valuuta STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Vahetuskurss: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Vahemärk: -STR_CURRENCY_PREFIX :{LTBLUE}Eesliide: -STR_CURRENCY_SUFFIX :{LTBLUE}Lõpuliide: +STR_CURRENCY_SEPARATOR :{LTBLUE}Vahemärk: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Eesliide: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Lõpuliide: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Vaheta üle eurole: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Vaheta üle eurole: {ORANGE}Mitte kunagi STR_CURRENCY_PREVIEW :{LTBLUE}Eelvaade: {ORANGE}{CURRENCY} @@ -3539,8 +3537,8 @@ STR_AI_CANCEL STR_AI_CLOSE :{BLACK}Sulge STR_AI_RESET :{BLACK}Nulli STR_AI_HUMAN_PLAYER :Inimmängija -STR_AI_AUTHOR :Autor: -STR_AI_VERSION :Versioon: +STR_AI_AUTHOR :Autor: {STRING} +STR_AI_VERSION :Versioon: {NUM} ######## ############ town controlled noise level diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Kuljetusyhtiön arvioinnit: STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Tuet STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Tarjotut tuet: -STR_2027_FROM_TO :{ORANGE}{STRING} välille {STRING}-{STRING} -STR_2028_BY :{YELLOW} ({DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} välille {STRING}-{STRING}{YELLOW} ({DATE_SHORT}) STR_202A_NONE :{ORANGE}Ei mitään STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Käytetyt tuet- -STR_202C_FROM_TO :{ORANGE}{STRING} välille {STATION}-{STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, {DATE_SHORT} asti) +STR_202C_FROM_TO :{ORANGE}{STRING} välille {STATION}-{STATION}{YELLOW} ({COMPANY}{YELLOW}, {DATE_SHORT} asti) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Tuki päättynyt:{}{}{STRING} väli {STRING} - {STRING} ei ole enää tuettu. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Tuki vedetty pois:{}{}{STRING} kuljetuspalvelu välille {STATION}-{STATION} ei ole enää tuettu. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Tuki tarjottu:{}{}Ensimmäinen {STRING}kuljetus välillä {STRING} - {STRING} saa vuoden mittaisen tuen paikallisviranomaisilta! @@ -3177,9 +3175,9 @@ STR_LOADGAME_REMOVED_TRAMS STR_CURRENCY_WINDOW :{WHITE}Oma valuutta STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Vaihtokurssi: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Välimerkki: -STR_CURRENCY_PREFIX :{LTBLUE}Etuliite: -STR_CURRENCY_SUFFIX :{LTBLUE}Jälkiliite: +STR_CURRENCY_SEPARATOR :{LTBLUE}Välimerkki: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Etuliite: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Jälkiliite: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Vaihda euroon: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Vaihda euroon: {ORANGE}ei koskaan STR_CURRENCY_PREVIEW :{LTBLUE}Esikatselu: {ORANGE}{CURRENCY} @@ -3581,8 +3579,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Ihmispelaaja STR_AI_RANDOM_AI :Sattumanvarainen tekoäly STR_AI_SETTINGS_CAPTION :{WHITE}Tekoälyn parametrit -STR_AI_AUTHOR :Tekijä: -STR_AI_VERSION :Versio: +STR_AI_AUTHOR :Tekijä: {STRING} +STR_AI_VERSION :Versio: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Yksi käynnissä olevista tekoälyistä kaatui. Ole hyvä ja kerro tästä tekoälyn tekijälle, sekä ota kuvankaappaus Tekoalyn Virheenkorjaus ikkunasta. ######## diff --git a/src/lang/french.txt b/src/lang/french.txt --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1714,12 +1714,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Qualité de service des compagnies: STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subventions STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Offres de subvention pour le transport de: -STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} à {STRING} -STR_2028_BY :{YELLOW} (avant {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} à {STRING}{YELLOW} (avant {DATE_SHORT}) STR_202A_NONE :{ORANGE}Aucune STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Subventions déjà accordées: -STR_202C_FROM_TO :{ORANGE}{STRING} de {STATION} à {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, jusqu'à {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} de {STATION} à {STATION}{YELLOW} ({COMPANY}{YELLOW}, jusqu'à {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Offre de subvention expirée:{}{}Le transport de {STRING} entre {STRING} et {STRING} n'est désormais plus subventionné. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Abandon de la subvention:{}{}Le transport de {STRING} entre {STATION} et {STATION} n'est plus subventionné. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Offre de subvention:{}{}Le premier service de {STRING} entre {STRING} et {STRING} sera subventionné pendant un an! @@ -3178,9 +3176,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Partie sauvegardée avec une version sans support des tramways. Tous les tramways ont été supprimés. STR_CURRENCY_WINDOW :{WHITE}Devise personnalisée STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Taux de change : {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Séparateur : -STR_CURRENCY_PREFIX :{LTBLUE}Préfixe : -STR_CURRENCY_SUFFIX :{LTBLUE}Suffixe : +STR_CURRENCY_SEPARATOR :{LTBLUE}Séparateur : {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Préfixe : {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Suffixe : {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Passer à l'Euro : {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Passer à l'Euro : {ORANGE}jamais STR_CURRENCY_PREVIEW :{LTBLUE}Prévisualisation : {ORANGE}{CURRENCY} @@ -3582,8 +3580,8 @@ STR_AI_RESET :{BLACK}Réinitialiser STR_AI_HUMAN_PLAYER :Joueur Humain STR_AI_RANDOM_AI :IA aléatoire STR_AI_SETTINGS_CAPTION :{WHITE}Paramètres IA -STR_AI_AUTHOR :Auteur: -STR_AI_VERSION :Version: +STR_AI_AUTHOR :Auteur: {STRING} +STR_AI_VERSION :Version: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}L'une des IA a rencontré un problème. Merci de rapporter ceci à l'auteur de l'IA avec une capture d'écran de la fenêtre de débogage d'IA. ######## diff --git a/src/lang/galician.txt b/src/lang/galician.txt --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1637,12 +1637,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Puntuacións das compañías de transporte: STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsidios STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Sibsidios en oferta para sevicios que transporten: -STR_2027_FROM_TO :{ORANGE}{STRING} dende {STRING} ata {STRING} -STR_2028_BY :{YELLOW} (antes de {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} dende {STRING} ata {STRING}{YELLOW} (antes de {DATE_SHORT}) STR_202A_NONE :{ORANGE}Ningún STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Servicios que xa teñen subsidio: -STR_202C_FROM_TO :{ORANGE}{STRING} dende {STATION} ata {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, ata {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} dende {STATION} ata {STATION}{YELLOW} ({COMPANY}{YELLOW}, ata {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Oferta de subsidio esgotada:{}{}{STRING} dende {STRING} ata {STRING} non será subsidiada. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subsidio retirado:{}{}O servicio de transporte de {STRING} dende {STATION} ata {STATION} xa non ten subsidio. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}¡Oferta de subsidio:{}{}O primeiro servicio de transporte de {STRING} dende {STRING} ata {STRING} será subsidiado pola autoridade local! @@ -3081,9 +3079,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}A partida grabouse nunha versión sen soporte para tranvías. Quitáronse tódolos tranvías. STR_CURRENCY_WINDOW :{WHITE}Moeda persoalizada STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Taxa de cambio: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Separador: -STR_CURRENCY_PREFIX :{LTBLUE}Prefixo: -STR_CURRENCY_SUFFIX :{LTBLUE}Sufixo: +STR_CURRENCY_SEPARATOR :{LTBLUE}Separador: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefixo: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Sufixo: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Cambiar a Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Camiar a Euro: {ORANGE}nunca STR_CURRENCY_PREVIEW :{LTBLUE}Vista previa: {ORANGE}{CURRENCY} diff --git a/src/lang/german.txt b/src/lang/german.txt --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1714,12 +1714,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subventionen STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subventionsangebot für: -STR_2027_FROM_TO :{ORANGE}{STRING} von {STRING} nach {STRING} -STR_2028_BY :{YELLOW} (bis {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} von {STRING} nach {STRING}{YELLOW} (bis {DATE_SHORT}) STR_202A_NONE :{ORANGE}Keine STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Bereits vergebene Subventionen: -STR_202C_FROM_TO :{ORANGE}{STRING} von {STATION} nach {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, bis {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} von {STATION} nach {STATION}{YELLOW} ({COMPANY}{YELLOW}, bis {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Subventionsangebot abgelaufen:{}{}{STRING}transport von {STRING} nach {STRING} wird nicht mehr subventioniert. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subventionsende:{}{}{STRING}transport von {STATION} nach {STATION} wird nicht mehr subventioniert. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Subventionsangebot:{}{}Erster {STRING}transport von {STRING} nach {STRING} wird ein Jahr von den örtlichen Behörden subventioniert! @@ -3178,9 +3176,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Spiel wurde in einer Version ohne Straßenbahnunterstützung gespeichert. Alle Straßenbahnen wurden entfernt. STR_CURRENCY_WINDOW :{WHITE}Eigene Währung STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Wechselkurs: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Trennsymbol: -STR_CURRENCY_PREFIX :{LTBLUE}Präfix: -STR_CURRENCY_SUFFIX :{LTBLUE}Suffix: +STR_CURRENCY_SEPARATOR :{LTBLUE}Trennsymbol: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Präfix: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Suffix: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Umstellung auf Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Umstellung auf Euro: {ORANGE}nie STR_CURRENCY_PREVIEW :{LTBLUE}Vorschau: {ORANGE}{CURRENCY} @@ -3582,8 +3580,8 @@ STR_AI_RESET :{BLACK}Rücksetzen STR_AI_HUMAN_PLAYER :menschlicher Spieler STR_AI_RANDOM_AI :Zufällige KI STR_AI_SETTINGS_CAPTION :{WHITE}KI Parameter -STR_AI_AUTHOR :Autor: -STR_AI_VERSION :Version: +STR_AI_AUTHOR :Autor: {STRING} +STR_AI_VERSION :Version: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Einer der laufenden KIs ist abgestürzt. Es ist nett, den Fehler dem Autor der KI mittels eines Screenshots vom KI-Debug-Fenster unter Angabe der OpenTTD-Versionsnummer zu melden. ######## diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -1700,12 +1700,8 @@ 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}{1:STRING} ל {STRING} מ {NBSP} {0:STRING} -STR_2028_BY :{YELLOW} ( {DATE_SHORT} עד תאריך) STR_202A_NONE :{ORANGE}אין STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK} :שירותים מסובסדים -STR_202C_FROM_TO :{YELLOW} ({3:COMPANY}) {ORANGE} {2:STATION} ל {NBSP}{1:STATION} מ {NBSP}{0:STRING} -STR_202D_UNTIL :{YELLOW}{DATE_SHORT}) עד STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}.פג תוקפה של הצעה למתן סובסידיה{}{}{NBSP}לא תזכה עוד לסבסוד{NBSP} {2:STRING} ל {NBSP}{1:STRING} מ {NBSP}{0:STRING} הובלת STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}.פג תוקפה של סובסידיה{}{}{NBSP}לא תסובסד עוד{NBSP} {2:STATION} ל {NBSP}{1:STATION} מ {NBSP}{0:STRING} הובלת STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}.הצעה למתן סובסידיה{}{}{NBSP}!יזכה לסובסידיה בת שנה מהרשות המקומית {NBSP} {2:STRING} ל {NBSP}{1:STRING} מ {NBSP}{0:STRING} שירות הובלה ראשון של @@ -3161,9 +3157,6 @@ STR_LOADGAME_REMOVED_TRAMS STR_CURRENCY_WINDOW :{WHITE}מטבע מותאם אישית STR_CURRENCY_EXCHANGE_RATE :{ORANGE}{0:CURRENCY} =£{1:COMMA} {LTBLUE} :שער חליפין -STR_CURRENCY_SEPARATOR :{LTBLUE} :מפריד -STR_CURRENCY_PREFIX :{LTBLUE} :קידומת -STR_CURRENCY_SUFFIX :{LTBLUE} :סיומת STR_CURRENCY_SWITCH_TO_EURO :{ORANGE}{NUM} {LTBLUE} :החלפה ליורו STR_CURRENCY_SWITCH_TO_EURO_NEVER :{ORANGE} ללא {LTBLUE} :החלפה ליורו STR_CURRENCY_PREVIEW :{ORANGE}{CURRENCY}{LTBLUE} :צפיה מקדימה @@ -3563,8 +3556,6 @@ STR_AI_RESET :{BLACK}אתחל STR_AI_HUMAN_PLAYER :שחקן אנושי STR_AI_RANDOM_AI :בינה מלאכותית אקראית STR_AI_SETTINGS_CAPTION :{WHITE}פרמטרים של בינה מלאכותית -STR_AI_AUTHOR ::מחבר -STR_AI_VERSION :: גירסה ######## ############ town controlled noise level diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1747,12 +1747,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Vélemény a szállítási cégekről: STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Támogatások STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Támogatás jár -STR_2027_FROM_TO :{ORANGE}{STRING} szállításáért {STRING} és {STRING} között -STR_2028_BY :{YELLOW} ({DATE_SHORT}ig) +STR_2027_FROM_TO :{ORANGE}{STRING} szállításáért {STRING} és {STRING} között{YELLOW} ({DATE_SHORT}ig) STR_202A_NONE :{ORANGE}--- STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Már támogatást kap -STR_202C_FROM_TO :{ORANGE}{STRING} szállításáért {STATION} és {STATION} között {YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW} ({DATE_SHORT}ig) +STR_202C_FROM_TO :{ORANGE}{STRING} szállításáért {STATION} és {STATION} között {YELLOW} ({COMPANY}{YELLOW} ({DATE_SHORT}ig) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}A támogatás határideje lejárt:{}{}{STRING} szállításáért {STRING} és {STRING} között már nem jár támogatás. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Támogatás visszavonva:{}{}{STRING} szállítása {STATION} és {STATION} között már nem támogatott. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Támogatási ajánlat:{}{}Az első {STRING} szállító {STRING} és {STRING} között egy éves támogatást kap a helyi önkormányzattól! @@ -3248,9 +3246,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}A játék olyan verzióban lett elmentve, ami nem támogatja a villamosokat . Az összes villamos törölve lett. STR_CURRENCY_WINDOW :{WHITE}Saját pénznem STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Értékarány: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Elválasztó: -STR_CURRENCY_PREFIX :{LTBLUE}Előtag: -STR_CURRENCY_SUFFIX :{LTBLUE}Előtag: +STR_CURRENCY_SEPARATOR :{LTBLUE}Elválasztó: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Előtag: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Előtag: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Euróra váltás: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Euróra váltás: {ORANGE}soha STR_CURRENCY_PREVIEW :{LTBLUE}Előnézet: {ORANGE}{CURRENCY} @@ -3652,8 +3650,8 @@ STR_AI_RESET :{BLACK}Visszaállítás STR_AI_HUMAN_PLAYER :Játékos STR_AI_RANDOM_AI :Véletlenszerűen választott MI STR_AI_SETTINGS_CAPTION :{WHITE}MI paraméterek -STR_AI_AUTHOR :Készítő: -STR_AI_VERSION :Verzió: +STR_AI_AUTHOR :Készítő: {STRING} +STR_AI_VERSION :Verzió: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Az egyik futó MI futása közben hiba történt. Kérjük jelezd ezt az MI készítőjének az MI nyomkövetés ablakról készített képpel. ######## diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1708,12 +1708,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Einkunnir flutningsfyrirtækis: STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Samstarfssamningar STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Samstarfssamningar í boði fyrir eftirfarandi þjónustur: -STR_2027_FROM_TO :{ORANGE}{STRING} frá {STRING} til {STRING} -STR_2028_BY :{YELLOW} (til {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} frá {STRING} til {STRING}{YELLOW} (til {DATE_SHORT}) STR_202A_NONE :{ORANGE}Enginn STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Samningar þegar í gildi: -STR_202C_FROM_TO :{ORANGE}{STRING} frá {STATION} til {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, þangað til {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} frá {STATION} til {STATION}{YELLOW} ({COMPANY}{YELLOW}, þangað til {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Tilboð til samstarfssamnings runnið út:{}{}{STRING} frá {STRING} til {STRING} mun ekki vera samningsbundið. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Samsarfssamningur gerður ógildur:{}{} {STRING}flutningur frá {STATION} til {STATION} er ekki lengur samningsbundinn. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Nýtt tilboð til samstarfssamnings: {}{}Fyrsti {STRING}flutningur frá {STRING} til {STRING} mun stofna til eins árs samstarfssamnings við bæjaryfirvöld! @@ -3153,9 +3151,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Leikurinn var vistaður í útgáfu án sporvagna. Allir sporvagnar hafa verið fjarlægðir. STR_CURRENCY_WINDOW :{WHITE}Sérvalinn gjaldeyrir STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Gengi: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Aðskilnaðarmerki: -STR_CURRENCY_PREFIX :{LTBLUE}Forskeyti: -STR_CURRENCY_SUFFIX :{LTBLUE}Viðskeyti: +STR_CURRENCY_SEPARATOR :{LTBLUE}Aðskilnaðarmerki: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Forskeyti: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Viðskeyti: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Skipta í Evrur: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Skipta í Evrur: {ORANGE}aldrei STR_CURRENCY_PREVIEW :{LTBLUE}Dæmi: {ORANGE}{CURRENCY} @@ -3535,8 +3533,8 @@ STR_AI_ACCEPT :{BLACK}Í lagi STR_AI_CANCEL :{BLACK}Hætta við STR_AI_CLOSE :{BLACK}Loka STR_AI_HUMAN_PLAYER :Menskur spilari -STR_AI_AUTHOR :Höfundur: -STR_AI_VERSION :Útgáfa: +STR_AI_AUTHOR :Höfundur: {STRING} +STR_AI_VERSION :Útgáfa: {NUM} ######## ############ town controlled noise level diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsidi STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Penawaran subsidi jasa transportasi: -STR_2027_FROM_TO :{ORANGE}{STRING} dari {STRING} ke {STRING} -STR_2028_BY :{YELLOW} (sebelum {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} dari {STRING} ke {STRING}{YELLOW} (sebelum {DATE_SHORT}) STR_202A_NONE :{ORANGE}Belum ada STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Jasa transportasi bersubsidi: -STR_202C_FROM_TO :{ORANGE}{STRING} dari {STATION} ke {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, hingga {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} dari {STATION} ke {STATION}{YELLOW} ({COMPANY}{YELLOW}, hingga {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Penawaran subsidi berakhir:{}{}Jasa transportasi {STRING} dari {STRING} ke {STRING} mulai sekarang tidak lagi mendapat subsidi. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subsidi selesai:{}{}Jasa transportasi {STRING} dari {STATION} ke {STATION} tidak lagi mendapat subsidi. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Penawaran subsidi:{}{}Jasa transportasi {STRING} pertama dari {STRING} ke {STRING} akan mendapat subsidi selama setahun dari pemkot setempat! @@ -3177,9 +3175,9 @@ STR_LOADGAME_REMOVED_TRAMS STR_CURRENCY_WINDOW :{WHITE}Atur Mata Uang STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Nilai tukar: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Pemisah: -STR_CURRENCY_PREFIX :{LTBLUE}Awalan: -STR_CURRENCY_SUFFIX :{LTBLUE}Akhiran: +STR_CURRENCY_SEPARATOR :{LTBLUE}Pemisah: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Awalan: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Akhiran: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Menggunakan Euro tahun: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Menggunakan Euro: {ORANGE}tidak pernah STR_CURRENCY_PREVIEW :{LTBLUE}Contoh: {ORANGE}{CURRENCY} @@ -3581,8 +3579,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Pemain Manusia STR_AI_RANDOM_AI :AI Acak STR_AI_SETTINGS_CAPTION :{WHITE}Parameter AI -STR_AI_AUTHOR :Pembuat: -STR_AI_VERSION :Versi: +STR_AI_AUTHOR :Pembuat: {STRING} +STR_AI_VERSION :Versi: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Salah satu AI gagal. Laporkan ini kepada AI Author dengan potongan layar dari Jendela Debug AI. ######## diff --git a/src/lang/italian.txt b/src/lang/italian.txt --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1715,12 +1715,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Sussidi STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Sussidi offerti per la realizzazione di servizi: -STR_2027_FROM_TO :{ORANGE}{STRING} da {STRING} a {STRING} -STR_2028_BY :{YELLOW} (entro {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} da {STRING} a {STRING}{YELLOW} (entro {DATE_SHORT}) STR_202A_NONE :{ORANGE}Nessuno STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Servizi già sovvenzionati: -STR_202C_FROM_TO :{ORANGE}{STRING} da {STATION} a {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, fino al {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} da {STATION} a {STATION}{YELLOW} ({COMPANY}{YELLOW}, fino al {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Offerta di sussidio scaduta:{}{}Il trasporto di {STRING} da {STRING} a {STRING} non darà più diritto a sovvenzioni. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Sussidio terminato:{}{}Il trasporto di {STRING} da {STATION} a {STATION} non è più sovvenzionato. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Offerta di sussidio:{}{}Il primo servizio di {STRING} da {STRING} a {STRING} riceverà un'anno di sovvenzioni dall'autorità locale! @@ -3179,9 +3177,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}La partita è stata salvata in una versione senza il supporto per i tram. Tutte le tranvie sono state rimosse. STR_CURRENCY_WINDOW :{WHITE}Valuta personalizzata STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Cambio: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Separatore: -STR_CURRENCY_PREFIX :{LTBLUE}Prefisso: -STR_CURRENCY_SUFFIX :{LTBLUE}Suffisso: +STR_CURRENCY_SEPARATOR :{LTBLUE}Separatore: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefisso: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Suffisso: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Passa all'Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Passa all'Euro: {ORANGE}Mai STR_CURRENCY_PREVIEW :{LTBLUE}Anteprima: {ORANGE}{CURRENCY} @@ -3583,8 +3581,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Giocatore umano STR_AI_RANDOM_AI :IA casuale STR_AI_SETTINGS_CAPTION :{WHITE}Parametri IA -STR_AI_AUTHOR :Autore: -STR_AI_VERSION :Versione: +STR_AI_AUTHOR :Autore: {STRING} +STR_AI_VERSION :Versione: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Una delle IA in funzione è andata in crash. Si prega di inviare una segnalazione all'autore della IA con uno screenshot della finestra Debug IA. ######## diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1695,12 +1695,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}行き{}先駆の一便は一年間助成金を受ける！ @@ -3142,9 +3140,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}このゲームは路面電車に対応していないバージョンで保存されましたので、すべての路面電車が削除されました。 STR_CURRENCY_WINDOW :{WHITE}カスタム通貨 STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}為替レート：{ORANGE}{CURRENCY} ＝ £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}分離記号： -STR_CURRENCY_PREFIX :{LTBLUE}接頭文字： -STR_CURRENCY_SUFFIX :{LTBLUE}接尾文字： +STR_CURRENCY_SEPARATOR :{LTBLUE}分離記号： {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}接頭文字： {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}接尾文字： {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}ユーロに切替え：{ORANGE}{NUM}年 STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}ユーロに切替え：{ORANGE}しない STR_CURRENCY_PREVIEW :{LTBLUE}プレビュー：{ORANGE}{CURRENCY} @@ -3543,8 +3541,8 @@ STR_AI_RESET :{BLACK}リセット STR_AI_HUMAN_PLAYER :人間のプレヤー STR_AI_RANDOM_AI :ランダムな AI STR_AI_SETTINGS_CAPTION :{WHITE}AI のパラメータ -STR_AI_AUTHOR :作成者： -STR_AI_VERSION :バージョン： +STR_AI_AUTHOR :作成者： {STRING} +STR_AI_VERSION :バージョン： {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}実行中の AI の一つは予期せずに終了しました。AI の作者に AI デバッグのウインドウのスクリーンショットが含む電子メールをご送信ください。 ######## diff --git a/src/lang/korean.txt b/src/lang/korean.txt --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1714,12 +1714,9 @@ 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}{1:STRING}에서 {2:STRING}까지 {0:STRING} 수송 -STR_2028_BY :{YELLOW} ({DATE_SHORT}까지) STR_202A_NONE :{ORANGE}없음 STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}이미 지급된 보조금: -STR_202C_FROM_TO :{ORANGE}{1:STATION}에서 {2:STATION}까지 {0:STRING} 수송{YELLOW} ({3:COMPANY} -STR_202D_UNTIL :{YELLOW}, {DATE_SHORT}까지) +STR_202C_FROM_TO :{ORANGE}{1:STATION}에서 {2:STATION}까지 {0:STRING} 수송{YELLOW} ({3:COMPANY}{YELLOW}, {DATE_SHORT}까지) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}보조금 제공 계약 파기:{}{}{1:STRING}에서 {2:STRING}까지의 {0:STRING} 수송은 더이상 보조금을 지급하지 않습니다. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}보조금 제공 철회:{}{}지역 당국은 {1:STATION}에서 {2:STATION}까지의 {0:STRING} 수송에 대한 보조금을 철회하였습니다. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}보조금 제공 안내:{}{}처음으로 {1:STRING}에서 {2:STRING}까지의 {0:STRING}을/를 수송하는 회사는 지역 당국으로부터 보조금을 받게 될 것입니다! @@ -3178,9 +3175,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}전차를 지원하지 않는 버전으로 게임이 저장되었습니다. 모든 전차는 제거되었습니다. STR_CURRENCY_WINDOW :{WHITE}사용자 화폐 단위 STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}환율: {ORANGE}{CURRENCY} = {COMMA}파운드 -STR_CURRENCY_SEPARATOR :{LTBLUE}단위구분: -STR_CURRENCY_PREFIX :{LTBLUE}접두어: -STR_CURRENCY_SUFFIX :{LTBLUE}접미어: +STR_CURRENCY_SEPARATOR :{LTBLUE}단위구분: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}접두어: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}접미어: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}유로화로 전환: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}유로화로 전환: {ORANGE}안함 STR_CURRENCY_PREVIEW :{LTBLUE}미리보기: {ORANGE}{CURRENCY} @@ -3582,8 +3579,8 @@ STR_AI_RESET :{BLACK}초기화 STR_AI_HUMAN_PLAYER :사용자 플레이어 STR_AI_RANDOM_AI :무작위 인공지능 STR_AI_SETTINGS_CAPTION :{WHITE}인공지능 파라미터 -STR_AI_AUTHOR :저자: -STR_AI_VERSION :버젼: +STR_AI_AUTHOR :저자: {STRING} +STR_AI_VERSION :버젼: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}작동중인 인공지능 중 하나가 충돌했습니다. 인공지능 디버그 창에서 스샷을 찍어 인공지능 작가에게 보고하십시오. ######## diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transporta uzņēmumu reitingi: STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsīdijas STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Piedāvājumā esošās subsīdijas par pakalpojumu nodrošināšanu: -STR_2027_FROM_TO :{ORANGE}{STRING} no {STRING} līdz {STRING} -STR_2028_BY :{YELLOW} (no {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} no {STRING} līdz {STRING}{YELLOW} (no {DATE_SHORT}) STR_202A_NONE :{ORANGE}Neviens STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Pašlaik subsidētie pakalpojumi: -STR_202C_FROM_TO :{ORANGE}{STRING} no {STATION} uz {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, līdz {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} no {STATION} uz {STATION}{YELLOW} ({COMPANY}{YELLOW}, līdz {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Subsīdijas piedāvājums beidzies:{}{}{STRING} no {STRING} uz {STRING} vairāk netiks subsidēts. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subsidēšana atcelta:{}{}{STRING} pārvadājumi no {STATION} uz {STATION} vairs netiek subsidēti. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Subsīdijas piedāvājums:{}{}Pirmais {STRING} pārvadātājs no {STRING} uz {STRING} vienu gadu saņems pašvaldības subsīdijas! @@ -3176,9 +3174,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Spēle bija saglabāta bez tramvaju atbalsta. Visi tramvaji tikuši aizvākti. STR_CURRENCY_WINDOW :{WHITE}Cita valūta STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Maiņas kurss: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Atdalītājs: -STR_CURRENCY_PREFIX :{LTBLUE}Prefikss: -STR_CURRENCY_SUFFIX :{LTBLUE}Suffikss: +STR_CURRENCY_SEPARATOR :{LTBLUE}Atdalītājs: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefikss: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Suffikss: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Pariet uz Eiro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Pariet uz Eiro: {ORANGE}nekad STR_CURRENCY_PREVIEW :{LTBLUE}Priekšskatījums: {ORANGE}{CURRENCY} @@ -3580,8 +3578,8 @@ STR_AI_RESET :{BLACK}Pārspiest STR_AI_HUMAN_PLAYER :Spēlētājs-cilvēks STR_AI_RANDOM_AI :Nejaušš Al STR_AI_SETTINGS_CAPTION :{WHITE}Ala Parametri -STR_AI_AUTHOR :Autors: -STR_AI_VERSION :Versija: +STR_AI_AUTHOR :Autors: {STRING} +STR_AI_VERSION :Versija: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Viens no mākslīgā intelekta spēlētājiem nobruka. Lūdzu paziņojiet par šo gadījumu mākslīgā intelekta autoram, pievienojot ekrānšāviņu ar mākslīgā intelekta atkļūdošanas logu. ######## diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1728,12 +1728,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transporto kompanijų reitingai: STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsidijos STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Dar nepanaudotos subsidijos: -STR_2027_FROM_TO :{ORANGE}{STRING} iš {STRING} į {STRING} -STR_2028_BY :{YELLOW} (iki {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} iš {STRING} į {STRING}{YELLOW} (iki {DATE_SHORT}) STR_202A_NONE :{ORANGE}Niekas STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Jau subsidijuojama: -STR_202C_FROM_TO :{ORANGE}{STRING} iš {STATION} į {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, iki {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} iš {STATION} į {STATION}{YELLOW} ({COMPANY}{YELLOW}, iki {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Subsidijų pasiūlymas baigėsi:{}{}{STRING.ko} pervežimas iš {STRING.ko} į {STRING.ka} daugiau nebesubsidijuojamas. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subsidijų laikas baigėsi:{}{}{STRING.ko} transportavimas iš {STATION} į {STATION} daugiau nebesubsidijuojama. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Subsidijų pasiūlymas:{}{}Pirmasis pervežęs {STRING.ka} iš {STRING} į {STRING} gaus metinę vietinės valdžios subsidiją! @@ -3166,9 +3164,9 @@ STR_NEWGRF_BROKEN_VEHICLE_LENGTH :{WHITE}Tai pakeičia transporto priemonės ilgį '{1:ENGINE}' kai ji nėra depe. STR_CURRENCY_WINDOW :{WHITE}Pasirinkti valiuta STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Keitimo santykis: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Skyriklis: -STR_CURRENCY_PREFIX :{LTBLUE}Priesdelis: -STR_CURRENCY_SUFFIX :{LTBLUE}Pavadinimas: +STR_CURRENCY_SEPARATOR :{LTBLUE}Skyriklis: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Priesdelis: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Pavadinimas: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Pereiti prie Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Pereiti prie Euro: {ORANGE}niekada STR_CURRENCY_PREVIEW :{LTBLUE}Perziura: {ORANGE}{CURRENCY} @@ -3539,8 +3537,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Žaidėjas Žmogus STR_AI_RANDOM_AI :Atsitiktinis DI STR_AI_SETTINGS_CAPTION :{WHITE}AI Parametrai -STR_AI_AUTHOR :Autorius: -STR_AI_VERSION :Versija: +STR_AI_AUTHOR :Autorius: {STRING} +STR_AI_VERSION :Versija: {NUM} ######## ############ town controlled noise level diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -1602,12 +1602,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subventiounen STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subventiounen fir den Service: -STR_2027_FROM_TO :{ORANGE}{STRING} vun {STRING} op {STRING} -STR_2028_BY :{YELLOW} (by {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} vun {STRING} op {STRING}{YELLOW} (by {DATE_SHORT}) STR_202A_NONE :{ORANGE}Keng STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Servicer mat Subventiounen: -STR_202C_FROM_TO :{ORANGE}{STRING} vun {STATION} op {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, bis {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} vun {STATION} op {STATION}{YELLOW} ({COMPANY}{YELLOW}, bis {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Subventioun oofgelaaf:{}{}{STRING} vun {STRING} op {STRING} gët nët méi subventionéiert. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subventioun entzunn:{}{}{STRING} Service vun {STATION} op {STATION} gët nët méi subventionéiert. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Subventioun offréiert:{}{}Eischten {STRING} Service vun {STRING} op {STRING} gëtt mat énger Subventioun vun 1 Joër belount.! @@ -3104,8 +3102,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Mënschlechen Spiller STR_AI_RANDOM_AI :Zoufälleg KI STR_AI_SETTINGS_CAPTION :{WHITE}KI Anstellungen -STR_AI_AUTHOR :Autor: -STR_AI_VERSION :Versioun: +STR_AI_AUTHOR :Autor: {STRING} +STR_AI_VERSION :Versioun: {NUM} ######## ############ town controlled noise level diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1696,12 +1696,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsidier STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subsidietilbud: -STR_2027_FROM_TO :{ORANGE}{STRING} fra {STRING} til {STRING} -STR_2028_BY :{YELLOW} (innen {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} fra {STRING} til {STRING}{YELLOW} (innen {DATE_SHORT}) STR_202A_NONE :{ORANGE}Ingen STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Tjenester som allerede subsidieres: -STR_202C_FROM_TO :{ORANGE}{STRING} fra {STATION} til {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, inntil {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} fra {STATION} til {STATION}{YELLOW} ({COMPANY}{YELLOW}, inntil {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Subsidietilbud har gått ut:{}{}{STRING} fra {STRING} til {STRING} vil ikke lenger gi subsidier. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subsidie trukket tilbake:{}{}Frakt av {STRING} fra {STATION} til {STATION} subsidieres ikke lenger. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Subsidietilbud:{}{}Første frakt av {STRING} fra {STRING} til {STRING} vil subsidieres i et år av bystyret! @@ -3154,9 +3152,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Spillet ble lagret i versjon uten trikk støtte. Alle trikker har blitt fjernet. STR_CURRENCY_WINDOW :{WHITE}Vanlig valuta STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Valutakurs: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Deler: -STR_CURRENCY_PREFIX :{LTBLUE}Prefiks: -STR_CURRENCY_SUFFIX :{LTBLUE}Suffiks: +STR_CURRENCY_SEPARATOR :{LTBLUE}Deler: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefiks: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Suffiks: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Bytt til euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Bytt til euro: {ORANGE}aldri STR_CURRENCY_PREVIEW :{LTBLUE}Forhåndsvis: {ORANGE}{CURRENCY} @@ -3551,7 +3549,7 @@ STR_AI_CLOSE STR_AI_RESET :{BLACK}Tilbakestill STR_AI_RANDOM_AI :Tilfeldig AI STR_AI_SETTINGS_CAPTION :{WHITE}AI-parametere -STR_AI_VERSION :Versjon +STR_AI_VERSION :Versjon {NUM} ######## ############ town controlled noise level diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1714,12 +1714,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsidiar STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Tilbydde subsidiar: -STR_2027_FROM_TO :{ORANGE}{STRING} frå {STRING} til {STRING} -STR_2028_BY :{YELLOW} (innan {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} frå {STRING} til {STRING}{YELLOW} (innan {DATE_SHORT}) STR_202A_NONE :{ORANGE}Ingen STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Tenester som er subsidierte frå før: -STR_202C_FROM_TO :{ORANGE}{STRING} frå {STATION} til {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, til {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} frå {STATION} til {STATION}{YELLOW} ({COMPANY}{YELLOW}, til {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Tilbod om subsidie har gått ut:{}{}{STRING} frå {STRING} til {STRING} vil ikkje lenger vere subsidiert. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subsidie trekt attende:{}{}Transport av {STRING} frå {STATION} til {STATION} er ikkje subsidiert lenger. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Subsidie-tilbod:{}{}Første transport av {STRING} frå {STRING} til {STRING} vil vere subsidiert i eit år av bystyret! @@ -3178,9 +3176,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Spelet har blitt lagra i ein versjon utan støtte for trikk. Alle trikkar har blitt fjerna. STR_CURRENCY_WINDOW :{WHITE}Vanleg valuta STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Valutakurs: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Separator: -STR_CURRENCY_PREFIX :{LTBLUE}Prefiks: -STR_CURRENCY_SUFFIX :{LTBLUE}Suffiks: +STR_CURRENCY_SEPARATOR :{LTBLUE}Separator: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefiks: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Suffiks: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Byt til euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Byt til euro: {ORANGE}aldri STR_CURRENCY_PREVIEW :{LTBLUE}Eksempel: {ORANGE}{CURRENCY} @@ -3582,8 +3580,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Menneskeleg spelar STR_AI_RANDOM_AI :Vilkårleg AI STR_AI_SETTINGS_CAPTION :{WHITE}AI Parametrar -STR_AI_AUTHOR :Forfattar: -STR_AI_VERSION :Versjon: +STR_AI_AUTHOR :Forfattar: {STRING} +STR_AI_VERSION :Versjon: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Ein AI har krasja. Venleg rapporter dette til produsenten av AIen med eit skjermbilete av "AI Debug"-vindauget. ######## diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Ubsidiessay STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ubsidiessay onway offerway orfay ervicessay akingtay: -STR_2027_FROM_TO :{ORANGE}{STRING} omfray {STRING} otay {STRING} -STR_2028_BY :{YELLOW} (ybay {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} omfray {STRING} otay {STRING}{YELLOW} (ybay {DATE_SHORT}) STR_202A_NONE :{ORANGE}Onenay STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Ervicessay alreadyway ubsidisedsay: -STR_202C_FROM_TO :{ORANGE}{STRING} omfray {STATION} otay {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, untilway {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} omfray {STATION} otay {STATION}{YELLOW} ({COMPANY}{YELLOW}, untilway {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Offerway ofway ubsidysay expiredway:{}{}{STRING} omfray {STRING} otay {STRING} illway ownay otnay attractway away ubsidysay. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Ubsidysay ithdrawnway:{}{}{STRING} ervicesay omfray {STATION} otay {STATION} isway onay ongerlay ubsidisedsay. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Ervicesay ubsidysay offeredway:{}{}Irstfay {STRING} ervicesay omfray {STRING} otay {STRING} illway attractway away ear'syay ubsidysay omfray ethay ocallay authorityway! @@ -3177,9 +3175,9 @@ STR_LOADGAME_REMOVED_TRAMS STR_CURRENCY_WINDOW :{WHITE}Ustomcay urrencycay STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Exchangeway ateray: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Eparatorsay: -STR_CURRENCY_PREFIX :{LTBLUE}Efixpray: -STR_CURRENCY_SUFFIX :{LTBLUE}Uffixsay: +STR_CURRENCY_SEPARATOR :{LTBLUE}Eparatorsay: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Efixpray: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Uffixsay: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Itchsway otay Euroway: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Itchsway otay Euroway: {ORANGE}evernay STR_CURRENCY_PREVIEW :{LTBLUE}Eviewpray: {ORANGE}{CURRENCY} @@ -3581,8 +3579,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Umanhay ayerplay STR_AI_RANDOM_AI :Andomray AIWAY STR_AI_SETTINGS_CAPTION :{WHITE}AIWAY Arameterspay -STR_AI_AUTHOR :Authorway: -STR_AI_VERSION :Ersionvay: +STR_AI_AUTHOR :Authorway: {STRING} +STR_AI_VERSION :Ersionvay: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Oneway ofway ethay unningray AIsway ashedcray. Easeplay eportray isthay otay ethay AIWAY authorway ithway away eenshotscray ofway ethay AIWAY Ebugday Indowway. ######## diff --git a/src/lang/polish.txt b/src/lang/polish.txt --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1755,12 +1755,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsydia STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Oferta subsydiów dla usługi przewozu: -STR_2027_FROM_TO :{ORANGE}{STRING} z {STRING} do {STRING} -STR_2028_BY :{YELLOW} (do {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} z {STRING} do {STRING}{YELLOW} (do {DATE_SHORT}) STR_202A_NONE :{ORANGE}Żadne STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Usługi już subsydiowane: -STR_202C_FROM_TO :{ORANGE}{STRING} z {STATION} do {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, do {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} z {STATION} do {STATION}{YELLOW} ({COMPANY}{YELLOW}, do {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Subsydiowanie wygasło:{}{}{STRING} z {STRING} do {STRING} już nie będzie dotowane. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Koniec dotacji:{}{}Przewóz {STRING.d} z {STATION} do {STATION} już nie jest subsydiowany. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Oferta usługi dotowanej:{}{}Pierwszy przewóz {STRING.d} z {STRING} do {STRING} będzie dotowany przez rok przez lokalne władze! @@ -3260,9 +3258,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Gra została zapisana w wersji nie obsługującej tramwajów. Wszystkie tramwaje zostały usunięte. STR_CURRENCY_WINDOW :{WHITE}Własna waluta STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Współczynnik wymiany: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Separator: -STR_CURRENCY_PREFIX :{LTBLUE}Prefiks: -STR_CURRENCY_SUFFIX :{LTBLUE}Sufiks: +STR_CURRENCY_SEPARATOR :{LTBLUE}Separator: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefiks: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Sufiks: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Przejście na Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Przejście na Euro: {ORANGE}nigdy STR_CURRENCY_PREVIEW :{LTBLUE}Podgląd: {ORANGE}{CURRENCY} @@ -3664,8 +3662,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Ludzki gracz STR_AI_RANDOM_AI :Losowe SI STR_AI_SETTINGS_CAPTION :{WHITE}Parametry SI -STR_AI_AUTHOR :Autor: -STR_AI_VERSION :Wersja: +STR_AI_AUTHOR :Autor: {STRING} +STR_AI_VERSION :Wersja: {NUM} ######## ############ town controlled noise level diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Avaliações da companhia de transporte STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subsídios STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Oferta de subsídios para os serviços: -STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} para {STRING} -STR_2028_BY :{YELLOW} (por {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} de {STRING} para {STRING}{YELLOW} (por {DATE_SHORT}) STR_202A_NONE :{ORANGE}Nenhum STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Serviços já subsidiados: -STR_202C_FROM_TO :{ORANGE}{STRING} de {STATION} para {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, até {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} de {STATION} para {STATION}{YELLOW} ({COMPANY}{YELLOW}, até {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}A oferta do subsídio expirou:{}{}{STRING} de {STRING} para {STRING} já não é subsidiado. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subsídio retirado:{}{}serviço de transporte de {STRING} de {STATION} para {STATION} já não é subsidiado. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Subsídio de ligação oferecido:{}{}Primeiro serviço de {STRING} de {STRING} para {STRING} atrairá o subsídio de um ano da autoridade local! @@ -3177,9 +3175,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}O jogo foi salvo numa versão sem suporte a eléctricos.Todos os eléctricos foram removidos. STR_CURRENCY_WINDOW :{WHITE}Moeda Modificada STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Taxa de troca: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Separador: -STR_CURRENCY_PREFIX :{LTBLUE}Prefixo: -STR_CURRENCY_SUFFIX :{LTBLUE}Sufixo: +STR_CURRENCY_SEPARATOR :{LTBLUE}Separador: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefixo: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Sufixo: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Mudar para Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Mudar para Euro: {ORANGE}nunca STR_CURRENCY_PREVIEW :{LTBLUE}Prevêr: {ORANGE}{CURRENCY} @@ -3581,8 +3579,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Jogador humano STR_AI_RANDOM_AI :AI Aleatória STR_AI_SETTINGS_CAPTION :{WHITE}Parâmetros da AI -STR_AI_AUTHOR :Autor: -STR_AI_VERSION :Versão: +STR_AI_AUTHOR :Autor: {STRING} +STR_AI_VERSION :Versão: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Um dos jogadores computador teve um erro. Por favor relate isto ao autor do jogador com uma imagem da janela de depuramento de erros. ######## diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1713,12 +1713,9 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subvenţii (F6) STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Subvenţii disponibile: -STR_2027_FROM_TO :{ORANGE}- {STRING} de la {STRING} la {STRING} -STR_2028_BY :{YELLOW} (data limită: {DATE_SHORT}) STR_202A_NONE :{ORANGE}- nici una STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Subvenţii acordate la ora actuală: -STR_202C_FROM_TO :{ORANGE}- {STRING} de la {STATION} la {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, până în {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}- {STRING} de la {STATION} la {STATION}{YELLOW} ({COMPANY}{YELLOW}, până în {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Ofertă expirată:{}{}Transportul de {STRING} de la {STRING} la {STRING} nu va mai primi subvenţie STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Ofertă închisă:{}{}Transportul de {STRING} de la {STATION} la {STATION} nu va mai fi subvenţionat STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Subvenţie oferită:{}{}Primul transport de {STRING} de la {STRING} la {STRING} va primi o subvenţie pe un an din partea autorităţilor locale @@ -3177,9 +3174,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Jocul a fost salvat într-o versiune fără suport pentru tramvaie. Toate tramvaiele au fost eliminate. STR_CURRENCY_WINDOW :{WHITE}Monedă proprie STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Curs de schimb: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Separator: -STR_CURRENCY_PREFIX :{LTBLUE}Prefix: -STR_CURRENCY_SUFFIX :{LTBLUE}Sufix: +STR_CURRENCY_SEPARATOR :{LTBLUE}Separator: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefix: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Sufix: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Aderă la Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Aderă la Euro: {ORANGE}niciodată STR_CURRENCY_PREVIEW :{LTBLUE}Previzualizare: {ORANGE}{CURRENCY} @@ -3581,8 +3578,8 @@ STR_AI_RESET :{BLACK}Resetează STR_AI_HUMAN_PLAYER :Jucator uman STR_AI_RANDOM_AI :IA aleator STR_AI_SETTINGS_CAPTION :{WHITE}Parametri IA -STR_AI_AUTHOR :Autor: -STR_AI_VERSION :Versiune: +STR_AI_AUTHOR :Autor: {STRING} +STR_AI_VERSION :Versiune: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}O Inteligentă Artificială s-a oprit în mod eronat. Raportează această problemă autorului împreună cu o captură de ecran a ferestrei Depanare IA ######## diff --git a/src/lang/russian.txt b/src/lang/russian.txt --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1715,12 +1715,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.p} по маршруту из {STRING} в {STRING} -STR_2028_BY :{YELLOW} (по {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING.p} по маршруту из {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} получит годовую субсидию от местных властей! @@ -3190,9 +3188,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Игра была сохранена в игре без поддержки трамваев. Все трамваи были отключены. STR_CURRENCY_WINDOW :{WHITE}Своя валюта STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Обменный курс: {ORANGE}{CURRENCY} = £{COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Разделитель: -STR_CURRENCY_PREFIX :{LTBLUE}Префикс: -STR_CURRENCY_SUFFIX :{LTBLUE}Суффикс: +STR_CURRENCY_SEPARATOR :{LTBLUE}Разделитель: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Префикс: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Суффикс: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Переход на евро: {ORANGE}с {NUM} года STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Переход на евро: {ORANGE}никогда STR_CURRENCY_PREVIEW :{LTBLUE}Образец: {ORANGE}{CURRENCY} @@ -3594,8 +3592,8 @@ STR_AI_RESET :{BLACK}Сброс STR_AI_HUMAN_PLAYER :Человек STR_AI_RANDOM_AI :Случ. ИИ STR_AI_SETTINGS_CAPTION :{WHITE}Параметры ИИ -STR_AI_AUTHOR :Автор: -STR_AI_VERSION :Версия: +STR_AI_AUTHOR :Автор: {STRING} +STR_AI_VERSION :Версия: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Один из запущенных ИИ выполнил недопустимую операцию и был закрыт. Пожалуйста сообщите об этом автору ИИ приложив скриншот окна ИИ отладки. ######## diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1707,12 +1707,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} 的公司将获得地方政府为期一年的财政补贴！ @@ -3167,9 +3165,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}游戏保存为了无电车版. 所有电车都被去掉了。 STR_CURRENCY_WINDOW :{WHITE}自定义货币 STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}兑换汇率： {ORANGE}{CURRENCY} = ￡ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}分隔符： -STR_CURRENCY_PREFIX :{LTBLUE}前缀： -STR_CURRENCY_SUFFIX :{LTBLUE}后缀： +STR_CURRENCY_SEPARATOR :{LTBLUE}分隔符： {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}前缀： {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}后缀： {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}转换为欧元： {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}转换为欧元： {ORANGE}不转换 STR_CURRENCY_PREVIEW :{LTBLUE}预览：{ORANGE}{CURRENCY} @@ -3571,8 +3569,8 @@ STR_AI_RESET :{BLACK}重设 STR_AI_HUMAN_PLAYER :玩家 STR_AI_RANDOM_AI :随机 AI STR_AI_SETTINGS_CAPTION :{WHITE}AI 特征 -STR_AI_AUTHOR :作者: -STR_AI_VERSION :版本: +STR_AI_AUTHOR :作者: {STRING} +STR_AI_VERSION :版本: {NUM} ######## ############ town controlled noise level diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1780,12 +1780,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Dotacie STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ponuknute dotacie: -STR_2027_FROM_TO :{ORANGE}{STRING} z {STRING} do {STRING} -STR_2028_BY :{YELLOW} ({DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} z {STRING} do {STRING}{YELLOW} ({DATE_SHORT}) STR_202A_NONE :{ORANGE}Ziadne STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}V sucasnosti poskytovane dotacie: -STR_202C_FROM_TO :{ORANGE}{STRING} z {STATION} do {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, do {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} z {STATION} do {STATION}{YELLOW} ({COMPANY}{YELLOW}, do {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Ponuka dotacie skoncila:{}{}Preprava {STRING.g} z {STRING} do {STRING} uz nebude dotovana. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Dotacia ukoncena:{}{}Preprava {STRING.g} z {STATION} do {STATION} uz viac nebude dotovana. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Ponuka dotacie:{}{}Prva preprava {STRING.g} z {STRING} do {STRING} bude dotovana miestnou spravou! @@ -3244,9 +3242,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Hra bola uložená vo verzii bez elektriciek. Vsetky elektricky boli odstránené. STR_CURRENCY_WINDOW :{WHITE}Vlastná mena STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Kurz meny: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Oddelovac: -STR_CURRENCY_PREFIX :{LTBLUE}Predpona: -STR_CURRENCY_SUFFIX :{LTBLUE}Prípona: +STR_CURRENCY_SEPARATOR :{LTBLUE}Oddelovac: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Predpona: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Prípona: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Prechod na Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Prechod na Euro: {ORANGE}nikdy STR_CURRENCY_PREVIEW :{LTBLUE}Nahlad: {ORANGE}{CURRENCY} @@ -3648,8 +3646,8 @@ STR_AI_RESET :{BLACK}Resetovať STR_AI_HUMAN_PLAYER :Človek STR_AI_RANDOM_AI :Náhodná AI STR_AI_SETTINGS_CAPTION :{WHITE}Parametre AI -STR_AI_AUTHOR :Autor: -STR_AI_VERSION :Verzia: +STR_AI_AUTHOR :Autor: {STRING} +STR_AI_VERSION :Verzia: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Jedna z AI padla. Prosím nahláste to autorovi AI a priložte screenshot Debugovacej obrazovky AI. ######## diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1755,12 +1755,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subvencije STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Ponudba subvencije za storitev: -STR_2027_FROM_TO :{ORANGE}Prevoz {STRING.r} iz {STRING} v {STRING} -STR_2028_BY :{YELLOW} (do {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}Prevoz {STRING.r} iz {STRING} v {STRING}{YELLOW} (do {DATE_SHORT}) STR_202A_NONE :{ORANGE}Brez STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Že subvencionirane storitve: -STR_202C_FROM_TO :{ORANGE}Prevoz {STRING.r} od {STATION} do {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, do {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}Prevoz {STRING.r} od {STATION} do {STATION}{YELLOW} ({COMPANY}{YELLOW}, do {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Ponudba subvencije potekla: {}{}Prevoz {STRING.r} od {STRING} do {STRING} ni več subvencioniran. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subvencija zaključena:{}{}Prevoz {STRING.r} od {STATION} do {STATION} ni več subvencioniran. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Nova ponujena subvencija:{}{}Prvi prevoz {STRING.r} od {STRING} do {STRING} bo{}subvencioniran s strani mestnega sveta! @@ -3257,9 +3255,9 @@ STR_LOADGAME_REMOVED_TRAMS STR_CURRENCY_WINDOW :{WHITE}Valuta po meri STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Menjalni tečaj: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Ločitev: -STR_CURRENCY_PREFIX :{LTBLUE}Predpona: -STR_CURRENCY_SUFFIX :{LTBLUE}Zapona: +STR_CURRENCY_SEPARATOR :{LTBLUE}Ločitev: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Predpona: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Zapona: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Preklop na Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Preklop na Euro: {ORANGE}nikoli STR_CURRENCY_PREVIEW :{LTBLUE}Predogled: {ORANGE}{CURRENCY} @@ -3661,8 +3659,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Igralec STR_AI_RANDOM_AI :Naključni UI STR_AI_SETTINGS_CAPTION :{WHITE}UI parametri -STR_AI_AUTHOR :Avtor: -STR_AI_VERSION :Verzija: +STR_AI_AUTHOR :Avtor: {STRING} +STR_AI_VERSION :Verzija: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Ena izmed zagnanih UI se je sesula. Prosim, javi to avtorju UI s priloženo sliko zaslona v orodju za čiščenje UI. ######## diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1714,12 +1714,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subvenciones STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Se ofrecen subvenciones por llevar: -STR_2027_FROM_TO :{ORANGE}{STRING} desde {STRING} a {STRING} -STR_2028_BY :{YELLOW} (antes de {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} desde {STRING} a {STRING}{YELLOW} (antes de {DATE_SHORT}) STR_202A_NONE :{ORANGE}Ninguna STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Líneas ya subvencionadas: -STR_202C_FROM_TO :{ORANGE}{STRING} desde {STATION} a {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, hasta {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} desde {STATION} a {STATION}{YELLOW} ({COMPANY}{YELLOW}, hasta {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Oferta de subsidio caducada:{}{}{STRING} de {STRING} a {STRING} ya no conlleva una subvención. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subvención retirada:{}{}Servicio de {STRING} desde {STATION} a {STATION} ya no está subvencionado. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Se ofrece subvención en la línea:{}{}El primer {STRING} que cubra la línea desde {STRING} a {STRING} recibirá una subvención durante un año por parte de las autoridades locales! @@ -3178,9 +3176,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}El juego ha sido grabado en una versión sin soporte de tranvía. Todos los tranvías serán eliminados. STR_CURRENCY_WINDOW :{WHITE}Moneda personalizada STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Tasa de cambio: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Separador: -STR_CURRENCY_PREFIX :{LTBLUE}Prefijo: -STR_CURRENCY_SUFFIX :{LTBLUE}Sufijo: +STR_CURRENCY_SEPARATOR :{LTBLUE}Separador: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefijo: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Sufijo: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Cambio al Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Cambio al Euro: {ORANGE}nunca STR_CURRENCY_PREVIEW :{LTBLUE}Previa: {ORANGE}{CURRENCY} @@ -3582,8 +3580,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Jugador Humano STR_AI_RANDOM_AI :IA aleatoria STR_AI_SETTINGS_CAPTION :{WHITE}Parámetros de la IA -STR_AI_AUTHOR :Autor: -STR_AI_VERSION :Versión: +STR_AI_AUTHOR :Autor: {STRING} +STR_AI_VERSION :Versión: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Una de las AI ejecutadas ha fallado. Por favor, reporte el fallo al autor de la misma desde la ventana AI Debug. ######## diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Transportföretags värderingar: STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Subventioner STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Aktuella subventioner: -STR_2027_FROM_TO :{ORANGE}{STRING} från {STRING} till {STRING} -STR_2028_BY :{YELLOW} (tills {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} från {STRING} till {STRING}{YELLOW} (tills {DATE_SHORT}) STR_202A_NONE :{ORANGE}Inga STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Redan subventionerade rutter: -STR_202C_FROM_TO :{ORANGE}{STRING} från {STATION} till {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, tills {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} från {STATION} till {STATION}{YELLOW} ({COMPANY}{YELLOW}, tills {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Subventionen har gått ut:{}{}{STRING} från {STRING} till {STRING} är inte längre subventionerad STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Subventionen gäller inte mer:{}{}{STRING} från {STATION} till {STATION} är inte längre subventionerad STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Ny subvention:{}{}Första transporten av {STRING} från {STRING} till {STRING} får ett års subvention från kommunen! @@ -3177,9 +3175,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Spelet sparades i en version som ej stöder spårvagn. Alla spårvagnar har tagits bort STR_CURRENCY_WINDOW :{WHITE}Egen valuta STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Växlingskurs: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Avskiljare: -STR_CURRENCY_PREFIX :{LTBLUE}Prefix: -STR_CURRENCY_SUFFIX :{LTBLUE}Ändelse: +STR_CURRENCY_SEPARATOR :{LTBLUE}Avskiljare: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Prefix: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Ändelse: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Går över till Euro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Går över till Euro: {ORANGE}aldrig STR_CURRENCY_PREVIEW :{LTBLUE}Förhandsgranska: {ORANGE}{CURRENCY} @@ -3581,8 +3579,8 @@ STR_AI_RESET :{BLACK}Återställ STR_AI_HUMAN_PLAYER :Mänsklig spelare STR_AI_RANDOM_AI :Slumpa datorspelare STR_AI_SETTINGS_CAPTION :{WHITE}Datorspelarens parametrar -STR_AI_AUTHOR :Upphovsman: -STR_AI_VERSION :Version: +STR_AI_AUTHOR :Upphovsman: {STRING} +STR_AI_VERSION :Version: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}En av AI'erna som körs har krachat. Vänligen raportera detta till AIs skapare med en screenshot på "AI Debug Fönsteret". ######## diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1706,12 +1706,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} 的公司將得到地方政府補助一年！ @@ -3165,9 +3163,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}此存檔版本不支援路面電車，已移除所有路面電車 STR_CURRENCY_WINDOW :{WHITE}自訂幣值 STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}匯率：{ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}分隔符號： -STR_CURRENCY_PREFIX :{LTBLUE}前置字： -STR_CURRENCY_SUFFIX :{LTBLUE}後置字： +STR_CURRENCY_SEPARATOR :{LTBLUE}分隔符號： {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}前置字： {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}後置字： {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}改用歐元：{ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}改用歐元：{ORANGE}永不改用 STR_CURRENCY_PREVIEW :{LTBLUE}預覽：{ORANGE}{CURRENCY} @@ -3569,8 +3567,8 @@ STR_AI_RESET :{BLACK}重設 STR_AI_HUMAN_PLAYER :人類玩家 STR_AI_RANDOM_AI :隨機 AI STR_AI_SETTINGS_CAPTION :{WHITE}AI 參數 -STR_AI_AUTHOR :作者： -STR_AI_VERSION :版本： +STR_AI_AUTHOR :作者： {STRING} +STR_AI_VERSION :版本： {NUM} ######## ############ town controlled noise level diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Taşıma şirketi değerlendirmeleri: STR_2024 :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Sübvansiyonlar STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Teklif edilmiş sübvansiyonlar: -STR_2027_FROM_TO :{ORANGE}{STRING} {STRING} -> {STRING} -STR_2028_BY :{YELLOW} ({DATE_SHORT} tarihinden itibaren) +STR_2027_FROM_TO :{ORANGE}{STRING} {STRING} -> {STRING}{YELLOW} ({DATE_SHORT} tarihinden itibaren) STR_202A_NONE :{ORANGE}Yok STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Verilen sübvansiyonlar: -STR_202C_FROM_TO :{ORANGE}{STRING} {STATION} -> {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, {DATE_SHORT} tarihine kadar) +STR_202C_FROM_TO :{ORANGE}{STRING} {STATION} -> {STATION}{YELLOW} ({COMPANY}{YELLOW}, {DATE_SHORT} tarihine kadar) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Sübvansiyon zamanı doldu: {}{}{STRING} {STRING} -> {STRING} artık fazla gelir getirmeyecek. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Sübvansiyon geri çekildi:{}{}{STRING} servisi {STATION} -> {STATION} arasında fazla gelir getirmeyecek. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Servis ihalesi önerildi: {}{} ilk {STRING} servisi {STRING} -> {STRING} arasında belediyeden prim alacak! @@ -3177,9 +3175,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Oyun tramvay desteği olmayan bir sürümde kaydedilmiş. Tüm tramvaylar kaldırılmıştır. STR_CURRENCY_WINDOW :{WHITE}Özel Para Birimi STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Çarpan: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Ayraç: -STR_CURRENCY_PREFIX :{LTBLUE}Önek: -STR_CURRENCY_SUFFIX :{LTBLUE}Sonek: +STR_CURRENCY_SEPARATOR :{LTBLUE}Ayraç: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Önek: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Sonek: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Euro'ya geç: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Euro'ya geç: {ORANGE}hiçbir zaman STR_CURRENCY_PREVIEW :{LTBLUE}Önizleme: {ORANGE}{CURRENCY} @@ -3581,8 +3579,8 @@ STR_AI_RESET :{BLACK}Yeniden başlat STR_AI_HUMAN_PLAYER :İnsan oyuncu STR_AI_RANDOM_AI :Rastgele YZ STR_AI_SETTINGS_CAPTION :{WHITE}YZ Parametreleri -STR_AI_AUTHOR :Yazar: -STR_AI_VERSION :Sürüm: +STR_AI_AUTHOR :Yazar: {STRING} +STR_AI_VERSION :Sürüm: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Çalışan YZ'lerden biri çakıldı. Lütfen bu durumu AI Hata Ayıklama Penceresi görüntüsüyle birlikte YZ'nin yazarına bildirin. ######## diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1838,12 +1838,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.r} з {STRING} до {STRING} -STR_2028_BY :{YELLOW} ({DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}Перевезення {STRING.r} з {STRING} до {STRING}{YELLOW} ({DATE_SHORT}) STR_202A_NONE :{ORANGE}немає STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Призначені субсидії: -STR_202C_FROM_TO :{ORANGE}Перевезення {STRING.r} з {STATION} до {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, по {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}Перевезення {STRING.r} з {STATION} до {STATION}{YELLOW} ({COMPANY}{YELLOW}, по {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Субсидію відмінено:{}{}Перевезення {STRING.r} з {STRING} до {STRING}. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Субсидія вже не надається:{}{}Перевезення {STRING.r} з {STATION} до {STATION}. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Пропонується річна субсидія {}{}компанії, яка першою привезе {STRING.z} з {STRING} до {STRING}! @@ -3339,9 +3337,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Гра була записана у версії без підтримки трамваїв. Усі трамваї були видалені. STR_CURRENCY_WINDOW :{WHITE}Вибір грошової одиниці STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Валютний курс: {ORANGE}{CURRENCY} = Ј {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Роздільник: -STR_CURRENCY_PREFIX :{LTBLUE}Префікс: -STR_CURRENCY_SUFFIX :{LTBLUE}Суфікс: +STR_CURRENCY_SEPARATOR :{LTBLUE}Роздільник: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Префікс: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Суфікс: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Перехід на євро: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Перехід на євро: {ORANGE}ні STR_CURRENCY_PREVIEW :{LTBLUE}Відображення: {ORANGE}{CURRENCY} @@ -3743,8 +3741,8 @@ STR_AI_RESET :{BLACK}Скидання STR_AI_HUMAN_PLAYER :Гравець-людина STR_AI_RANDOM_AI :Випадковий AI STR_AI_SETTINGS_CAPTION :{WHITE}Параметри AI -STR_AI_AUTHOR :Автор: -STR_AI_VERSION :Версія: +STR_AI_AUTHOR :Автор: {STRING} +STR_AI_VERSION :Версія: {NUM} STR_AI_PLEASE_REPORT_CRASH :{WHITE}Один з поточних AI зазнав краху. Будь ласка, повідомте про це автора AI зі знімком налагоджувального вікна AI. ######## diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -851,12 +851,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS 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 --- 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 --- a/src/lang/unfinished/malay.txt +++ b/src/lang/unfinished/malay.txt @@ -1005,7 +1005,6 @@ STR_2022_LOCAL_AUTHORITY 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 --- 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 --- a/src/lang/unfinished/serbian.txt +++ b/src/lang/unfinished/serbian.txt @@ -1034,12 +1034,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS 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 --- 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 diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -1713,12 +1713,10 @@ STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}Graddfeydd cwmnïau lleol: STR_2024 :{YELLOW}{COMPANY}{COMPANYNUM}: {ORANGE}{STRING} STR_2025_SUBSIDIES :{WHITE}Cymorthdaliadau STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}Cymorthdaliadau sy'n cael eu cynnig ar gyfer cludo: -STR_2027_FROM_TO :{ORANGE}{STRING} o {STRING} i {STRING} -STR_2028_BY :{YELLOW} (erbyn {DATE_SHORT}) +STR_2027_FROM_TO :{ORANGE}{STRING} o {STRING} i {STRING}{YELLOW} (erbyn {DATE_SHORT}) STR_202A_NONE :{ORANGE}Dim STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Gwasanaethau sydd eisoes yn derbyn cymhorthdal: -STR_202C_FROM_TO :{ORANGE}{STRING} o {STATION} i {STATION}{YELLOW} ({COMPANY} -STR_202D_UNTIL :{YELLOW}, tan {DATE_SHORT}) +STR_202C_FROM_TO :{ORANGE}{STRING} o {STATION} i {STATION}{YELLOW} ({COMPANY}{YELLOW}, tan {DATE_SHORT}) STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Cynnig cymhorthdal ar ben: {}{}Ni fydd cludo {STRING} o {STRING} i {STRING} bellach yn derbyn cymhorthdal. STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Cymhorthdal wedi'i dynnu'n ôl: {}{}Ni fydd y gwasanaeth {STRING} o {STATION} i {STATION} bellach yn derbyn cymhorthdal. STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Cymhorthdal yn cael ei gynnig:{}{}bydd y gwasanaeth {STRING} cyntaf o {STRING} i {STRING} yn derbyn blwyddyn o gymhorthdal oddi wrth yr awdurdod lleol! @@ -3173,9 +3171,9 @@ STR_LOADGAME_REMOVED_TRAMS :{WHITE}Cafodd y gêm ei gadw mewn fersiwn heb dram. Cafodd y tramiau eu dileu. STR_CURRENCY_WINDOW :{WHITE}Arian cyfaddas STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Cyfradd gyfnewid: {ORANGE}{CURRENCY} = £ {COMMA} -STR_CURRENCY_SEPARATOR :{LTBLUE}Gwahanydd: -STR_CURRENCY_PREFIX :{LTBLUE}Rhagddodiad: -STR_CURRENCY_SUFFIX :{LTBLUE}Olddodiad: +STR_CURRENCY_SEPARATOR :{LTBLUE}Gwahanydd: {STRING} +STR_CURRENCY_PREFIX :{LTBLUE}Rhagddodiad: {STRING} +STR_CURRENCY_SUFFIX :{LTBLUE}Olddodiad: {STRING} STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Newid i'r Ewro: {ORANGE}{NUM} STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Newid i'r Ewro: {ORANGE}byth STR_CURRENCY_PREVIEW :{LTBLUE}Rhagolwg: {ORANGE}{CURRENCY} @@ -3577,8 +3575,8 @@ STR_AI_RESET STR_AI_HUMAN_PLAYER :Chwaraewr dynol STR_AI_RANDOM_AI :AI ar hap STR_AI_SETTINGS_CAPTION :{WHITE}Paramedrau AI -STR_AI_AUTHOR :Awdur: -STR_AI_VERSION :Fersiwn: +STR_AI_AUTHOR :Awdur: {STRING} +STR_AI_VERSION :Fersiwn: {NUM} ######## ############ town controlled noise level diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1496,7 +1496,6 @@ struct CustomCurrencyWindow : Window { virtual void OnPaint() { int const right = this->width - 1; - int x; int y = 20; this->DrawWidgets(); @@ -1509,20 +1508,20 @@ struct CustomCurrencyWindow : Window { /* separator */ DrawFrameRect(10, y + 1, 29, y + 9, COLOUR_DARK_BLUE, GB(this->click, 2, 2) ? FR_LOWERED : FR_NONE); - x = DrawString(35, right, y + 1, STR_CURRENCY_SEPARATOR, TC_FROMSTRING); - DrawString(x + 4, right, y + 1, this->separator, TC_ORANGE); + SetDParamStr(0, this->separator); + DrawString(35, right, y + 1, STR_CURRENCY_SEPARATOR, TC_FROMSTRING); y += 12; /* prefix */ DrawFrameRect(10, y + 1, 29, y + 9, COLOUR_DARK_BLUE, GB(this->click, 4, 2) ? FR_LOWERED : FR_NONE); - x = DrawString(35, right, y + 1, STR_CURRENCY_PREFIX, TC_FROMSTRING); - DrawString(right, x + 4, y + 1, _custom_currency.prefix, TC_ORANGE); + SetDParamStr(0, _custom_currency.prefix); + DrawString(35, right, y + 1, STR_CURRENCY_PREFIX, TC_FROMSTRING); y += 12; /* suffix */ DrawFrameRect(10, y + 1, 29, y + 9, COLOUR_DARK_BLUE, GB(this->click, 6, 2) ? FR_LOWERED : FR_NONE); - x = DrawString(35, right, y + 1, STR_CURRENCY_SUFFIX, TC_FROMSTRING); - DrawString(x + 4, right, y + 1, _custom_currency.suffix, TC_ORANGE); + SetDParamStr(0, _custom_currency.suffix); + DrawString(35, right, y + 1, STR_CURRENCY_SUFFIX, TC_FROMSTRING); y += 12; /* switch to euro */ diff --git a/src/subsidy_gui.cpp b/src/subsidy_gui.cpp --- a/src/subsidy_gui.cpp +++ b/src/subsidy_gui.cpp @@ -118,17 +118,10 @@ struct SubsidyListWindow : Window { for (s = _subsidies; s != endof(_subsidies); s++) { if (s->cargo_type != CT_INVALID && s->age < 12) { - int x2; - /* Displays the two offered towns */ SetupSubsidyDecodeParam(s, 1); - x2 = DrawString(x + 2, right - 2, y, STR_2027_FROM_TO, TC_FROMSTRING); - - if (width - x2 > 10) { - /* Displays the deadline before voiding the proposal */ - SetDParam(0, _date - ymd.day + 384 - s->age * 32); - DrawString(x2, right, y, STR_2028_BY, TC_FROMSTRING); - } + SetDParam(7, _date - ymd.day + 384 - s->age * 32); + DrawString(x + 2, right - 2, y, STR_2027_FROM_TO, TC_FROMSTRING); y += 10; num++; @@ -147,20 +140,13 @@ struct SubsidyListWindow : Window { for (s = _subsidies; s != endof(_subsidies); s++) { if (s->cargo_type != CT_INVALID && s->age >= 12) { - int xt; - SetupSubsidyDecodeParam(s, 1); - SetDParam(3, GetStation(s->to)->owner); + SetDParam(4, _date - ymd.day + 768 - s->age * 32); /* Displays the two connected stations */ - xt = DrawString(x + 2, right - 2, y, STR_202C_FROM_TO, TC_FROMSTRING); + DrawString(x + 2, right - 2, y, STR_202C_FROM_TO, TC_FROMSTRING); - /* Displays the date where the granted subsidy will end */ - if ((xt > 3) && (width - xt) > 9 ) { // do not draw if previous drawing failed or if it will overlap on scrollbar - SetDParam(0, _date - ymd.day + 768 - s->age * 32); - DrawString(xt, right, y, STR_202D_UNTIL, TC_FROMSTRING); - } y += 10; num++; }