diff options
Diffstat (limited to 'src')
62 files changed, 520 insertions, 520 deletions
diff --git a/src/ai/api/ai_industry.cpp b/src/ai/api/ai_industry.cpp index 3d7836cc2..686a5d3fe 100644 --- a/src/ai/api/ai_industry.cpp +++ b/src/ai/api/ai_industry.cpp @@ -28,7 +28,7 @@ char *industry_name = MallocT<char>(len); ::SetDParam(0, industry_id); - ::GetString(industry_name, STR_INDUSTRY, &industry_name[len - 1]); + ::GetString(industry_name, STR_INDUSTRY_NAME, &industry_name[len - 1]); return industry_name; } diff --git a/src/ai/api/ai_station.cpp b/src/ai/api/ai_station.cpp index 519c1076f..244033f58 100644 --- a/src/ai/api/ai_station.cpp +++ b/src/ai/api/ai_station.cpp @@ -36,7 +36,7 @@ char *station_name = MallocT<char>(len); ::SetDParam(0, Station::Get(station_id)->index); - ::GetString(station_name, STR_STATION, &station_name[len - 1]); + ::GetString(station_name, STR_STATION_NAME, &station_name[len - 1]); return station_name; } diff --git a/src/ai/api/ai_town.cpp b/src/ai/api/ai_town.cpp index 22e68234c..a1810a1c4 100644 --- a/src/ai/api/ai_town.cpp +++ b/src/ai/api/ai_town.cpp @@ -31,7 +31,7 @@ char *town_name = MallocT<char>(len); ::SetDParam(0, town_id); - ::GetString(town_name, STR_TOWN, &town_name[len - 1]); + ::GetString(town_name, STR_TOWN_NAME, &town_name[len - 1]); return town_name; } diff --git a/src/ai/api/ai_waypoint.cpp b/src/ai/api/ai_waypoint.cpp index b98274b63..21804dda7 100644 --- a/src/ai/api/ai_waypoint.cpp +++ b/src/ai/api/ai_waypoint.cpp @@ -33,7 +33,7 @@ char *waypoint_name = MallocT<char>(len); ::SetDParam(0, waypoint_id); - ::GetString(waypoint_name, STR_WAYPOINT_RAW, &waypoint_name[len - 1]); + ::GetString(waypoint_name, STR_WAYPOINT_NAME, &waypoint_name[len - 1]); return waypoint_name; } diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index 777a00bc7..8b02f260b 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -205,7 +205,7 @@ void GetNameOfOwner(Owner owner, TileIndex tile) } else { const Town *t = ClosestTownFromTile(tile, UINT_MAX); - SetDParam(0, STR_TOWN); + SetDParam(0, STR_TOWN_NAME); SetDParam(1, t->index); } } diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 48022dbd8..9b16f57de 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -1724,7 +1724,7 @@ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uin if ((flags & DC_EXEC) && _game_mode != GM_EDITOR && ind != NULL) { SetDParam(0, indspec->name); if (indspec->new_industry_text > STR_LAST_STRINGID) { - SetDParam(1, STR_TOWN); + SetDParam(1, STR_TOWN_NAME); SetDParam(2, ind->town->index); } else { SetDParam(1, ind->town->index); @@ -1929,7 +1929,7 @@ static void MaybeNewIndustry() SetDParam(0, ind_spc->name); if (ind_spc->new_industry_text > STR_LAST_STRINGID) { - SetDParam(1, STR_TOWN); + SetDParam(1, STR_TOWN_NAME); SetDParam(2, ind->town->index); } else { SetDParam(1, ind->town->index); @@ -2273,11 +2273,11 @@ static void ChangeIndustryProduction(Industry *i, bool monthly) } /* Set parameters of news string */ if (str > STR_LAST_STRINGID) { - SetDParam(0, STR_TOWN); + SetDParam(0, STR_TOWN_NAME); SetDParam(1, i->town->index); SetDParam(2, indspec->name); } else if (closeit) { - SetDParam(0, STR_INDUSTRY_FORMAT); + SetDParam(0, STR_FORMAT_INDUSTRY_NAME); SetDParam(1, i->town->index); SetDParam(2, indspec->name); } else { diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 571b26706..6e1d93c33 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -852,12 +852,12 @@ protected: static char buf[96]; SetDParam(0, (*a)->town->index); - GetString(buf, STR_TOWN, lastof(buf)); + GetString(buf, STR_TOWN_NAME, lastof(buf)); if (*b != last_industry) { last_industry = *b; SetDParam(0, (*b)->town->index); - GetString(buf_cache, STR_TOWN, lastof(buf_cache)); + GetString(buf_cache, STR_TOWN_NAME, lastof(buf_cache)); } return strcmp(buf, buf_cache); diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 5be14bd8b..0cb754f39 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1171,7 +1171,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Kies weg STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Redigeer wegpunt naam STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kan nie wegpunt naam verander nie... @@ -1736,10 +1736,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tepees STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Teepot-Huis STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Varkie-Bank -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Landargitekteur @@ -2128,7 +2128,7 @@ STR_CITY_APPROVAL_HOSTILE :Vyandelik ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Company {COMMA}) +STR_FORMAT_COMPANY_NUM :(Company {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nuwe Gesig STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Kleur Skema STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Kleur Skema @@ -3306,9 +3306,9 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lengte: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Area: {NUM} x {NUM}{}Hoogte verskil: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3338,7 +3338,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Groep {COMMA} +STR_FORMAT_GROUP_NAME :Groep {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Alle triene STR_GROUP_ALL_ROADS :Alle pad voertuie diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 06dd0a331..dfad803c9 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK} اخت STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}عدل اسم نقطة العبور STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}لا يمكن تعديل نقطة العبور @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :خيم STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :مبنى ابريق الشاي STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :بنك الخنزير -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{1:STRING} {0:TOWN} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :تصميم الخريطة @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :معاد ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :شركة {COMMA} +STR_FORMAT_COMPANY_NUM :شركة {COMMA} STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}وجة جديد STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}اللون STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}اللون @@ -3382,10 +3382,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}الطو STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}المساحة: {NUM} x {NUM}{}فرق الارتفاع{NUM} م ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3416,7 +3416,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :مجموعة{COMMA} +STR_FORMAT_GROUP_NAME :مجموعة{COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :جميع القطارات STR_GROUP_ALL_ROADS :جميع المركبات diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index c0b8ddbce..25f4d55d5 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1198,7 +1198,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Selecion STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Editar nome do ponto de controle STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Impossível alterar o nome do ponto de controle... @@ -1779,10 +1779,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Ocas STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Casa-bule STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Mealheiro -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{1:STRING} de {0:TOWN} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{1:STRING} de {0:TOWN} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Paisagem @@ -2172,7 +2172,7 @@ STR_CITY_APPROVAL_HOSTILE :Hostil ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Companhia {COMMA}) +STR_FORMAT_COMPANY_NUM :(Companhia {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Novo Rosto STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Cores STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Cores: @@ -3383,10 +3383,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Comprime STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Area: {NUM} x {NUM}{}Diferença de altura: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3417,7 +3417,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Agrupar {COMMA} +STR_FORMAT_GROUP_NAME :Agrupar {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Todos os trens STR_GROUP_ALL_ROADS :Todos os automóveis diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index e47f95c4c..677d7c941 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1177,7 +1177,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Избо STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Редакция името на пътна точка STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Не може да се променя името на пункта... @@ -1753,10 +1753,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Индианс STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Фабрика за чай STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Детска касичка -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{1:STRING} {0:TOWN} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Тераформиране @@ -2146,7 +2146,7 @@ STR_CITY_APPROVAL_HOSTILE :враждеб ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Компания {COMMA}) +STR_FORMAT_COMPANY_NUM :(Компания {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Ново лице STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Цветове STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Цветове: @@ -3328,10 +3328,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Дълж STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Площ: {NUM} x {NUM}{}Разлика във височината: {NUM} м ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3362,7 +3362,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Група {COMMA} +STR_FORMAT_GROUP_NAME :Група {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Всички влакове STR_GROUP_ALL_ROADS :Всички пътни превозни средства diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 6ba37773c..653eadb84 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Seleccio STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Edita nom de punt de control STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}No es pot canviar el nom del punt de control... @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipis STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Casa-Tetera STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Banc-Guardiola Porquet -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Paisatges @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :Hostil ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Companyia {COMMA}) +STR_FORMAT_COMPANY_NUM :(Companyia {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nova Cara STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Esquema de color STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Esquema de color: @@ -3382,10 +3382,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Llargada STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Àrea: {NUM} x {NUM}{}Diferència d'alçada: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3416,7 +3416,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grup {COMMA} +STR_FORMAT_GROUP_NAME :Grup {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Tots els trens STR_GROUP_ALL_ROADS :Tots els vehicles diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 7ff2b9849..868265eeb 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1253,7 +1253,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Odaberi STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Promijeni ime čvorišta STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nije moguće promijeniti ime čvorišta... @@ -1834,10 +1834,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Indijanski šat STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Čajnik za stanovanje STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Kasica-Prasica -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Uređivanje krajolika @@ -2227,7 +2227,7 @@ STR_CITY_APPROVAL_HOSTILE :Agresivan ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Tvrtka {COMMA}) +STR_FORMAT_COMPANY_NUM :(Tvrtka {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Novo lice STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Boja STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Boja: @@ -3407,10 +3407,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Dužina: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Područje:{NUM}x{NUM}Visinska razlika:{NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3441,7 +3441,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Groupa {COMMA} +STR_FORMAT_GROUP_NAME :Groupa {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Svi vlakovi STR_GROUP_ALL_ROADS :Sva cestovna vozila diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 538b78d1a..bcc40b187 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1265,7 +1265,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Vyber ty STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Přejmenovat stavědlo STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nemohu přejmenovat stavědlo... @@ -1846,10 +1846,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Teepee STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Dům konvička STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Banka prasátko -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{1:STRING} {0:TOWN} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Úpravy krajiny @@ -2239,7 +2239,7 @@ STR_CITY_APPROVAL_HOSTILE :zaujatý ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(společnost {COMMA}) +STR_FORMAT_COMPANY_NUM :(společnost {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nový obličej STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Barva STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Barevné schéma: @@ -3454,10 +3454,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Délka: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Oblast: {NUM} x {NUM}{}Výškový rozdíl: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3488,7 +3488,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Skupina {COMMA} +STR_FORMAT_GROUP_NAME :Skupina {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Všechny vlaky STR_GROUP_ALL_ROADS :Všechna silniční vozidla diff --git a/src/lang/danish.txt b/src/lang/danish.txt index de868ce3a..608ca8d81 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Vælg ud STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Omdøb kontrolsted STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kan ikke omdøbe kontrolsted... @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipi STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Tepottehus STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Sparegris -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Landskabsværktøjer @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :Fjendtlig ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Firma {COMMA}) +STR_FORMAT_COMPANY_NUM :(Firma {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nyt ansigt STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Farvetema STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Farvetema: @@ -3380,10 +3380,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Længde: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Areal: {NUM} x {NUM}{}Højdeforskel: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3414,7 +3414,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Gruppe {COMMA} +STR_FORMAT_GROUP_NAME :Gruppe {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Alle toge STR_GROUP_ALL_ROADS :Alle vejkøretøjer diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index ed972cf6c..43e86d82d 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Selectee STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Naam controlepost aanpassen STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kan naam controlepost niet aanpassen... @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tepees STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Theepothuis STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Varkensbank -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Terreinvorming @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :Negatief ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Bedrijf {COMMA}) +STR_FORMAT_COMPANY_NUM :(Bedrijf {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nieuw gezicht STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Kleurenschema STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Kleurenschema: @@ -3382,10 +3382,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lengte: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Gebied: {NUM} x {NUM}{}Hoogte verschil: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3416,7 +3416,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Groep {COMMA} +STR_FORMAT_GROUP_NAME :Groep {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Alle treinen STR_GROUP_ALL_ROADS :Alle voertuigen diff --git a/src/lang/english.txt b/src/lang/english.txt index c18d40ad0..e0e6c29de 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -762,9 +762,6 @@ STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fund new indust ############ range ends here STR_FUND_INDUSTRY_CAPTION :{WHITE}Fund new industry -STR_JUST_STRING :{STRING} -STR_JUST_RAW_STRING :{RAW_STRING} -STR_JUST_INT :{NUM} STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...can only be built in rainforest areas STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...can only be built in desert areas STR_STATUSBAR_PAUSED :{YELLOW}* * PAUSED * * @@ -1197,7 +1194,6 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Select w STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Edit waypoint name STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Can't change waypoint name... @@ -1778,11 +1774,6 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tepees STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Teapot-House STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Piggy-Bank -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} - ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Landscaping STR_LANDSCAPING_MENU_PLANT_TREES :Plant trees @@ -2177,7 +2168,6 @@ STR_CITY_APPROVAL_HOSTILE :Hostile ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Company {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}New Face STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Colour Scheme STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Colour Scheme: @@ -2210,7 +2200,6 @@ STR_FINANCES_TOTAL_CAPTION :{WHITE}Total: STR_COMPANY_NAME_COMPANY_NUM :{COMPANY} {COMPANYNUM} STR_GRAPH_INCOME_CAPTION :{WHITE}Income Graph STR_CURRCOMPACT :{CURRCOMPACT} -STR_JUST_COMMA :{COMMA} STR_GRAPH_OPERATING_PROFIT_CAPTION :{WHITE}Operating Profit Graph STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Bank Balance STR_FINANCES_LOAN_TITLE :{WHITE}Loan @@ -3383,17 +3372,6 @@ STR_MEASURE_AREA :{BLACK}Area: {N STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Length: {NUM}{}Height difference: {NUM} m STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Area: {NUM} x {NUM}{}Height difference: {NUM} m -############ Date formatting -STR_DATE_TINY :{RAW_STRING}-{RAW_STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:RAW_STRING}-{0:RAW_STRING} - -STR_JUST_DATE_TINY :{DATE_TINY} -STR_JUST_DATE_LONG :{DATE_LONG} -STR_JUST_DATE_ISO :{DATE_ISO} -######## - STR_FEEDER_CARGO_VALUE :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY} STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...this is a town owned road STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...road facing in the wrong direction @@ -3418,7 +3396,6 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Group {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :All trains STR_GROUP_ALL_ROADS :All road vehicles @@ -3447,12 +3424,35 @@ STR_GROUP_DELETE_TIP :{BLACK}Delete t STR_GROUP_RENAME_TIP :{BLACK}Rename the selected group STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Click to protect this group from global autoreplace +#### String control codes and their formatting STR_COMPANY_NAME :{COMPANY} STR_ENGINE_NAME :{ENGINE} STR_GROUP_NAME :{GROUP} +STR_INDUSTRY_NAME :{INDUSTRY} STR_PRESIDENT_NAME :{PRESIDENTNAME} STR_SIGN_NAME :{SIGN} +STR_STATION_NAME :{STATION} +STR_TOWN_NAME :{TOWN} STR_VEHICLE_NAME :{VEHICLE} +STR_WAYPOINT_NAME :{WAYPOINT} + +STR_JUST_COMMA :{COMMA} +STR_JUST_INT :{NUM} +STR_JUST_DATE_TINY :{DATE_TINY} +STR_JUST_DATE_SHORT :{DATE_SHORT} +STR_JUST_DATE_LONG :{DATE_LONG} +STR_JUST_DATE_ISO :{DATE_ISO} +STR_JUST_STRING :{STRING} +STR_JUST_RAW_STRING :{RAW_STRING} + +STR_FORMAT_DATE_TINY :{RAW_STRING}-{RAW_STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:RAW_STRING}-{0:RAW_STRING} + +STR_FORMAT_COMPANY_NUM :(Company {COMMA}) +STR_FORMAT_GROUP_NAME :Group {COMMA} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} STR_NAME_MUST_BE_UNIQUE :{WHITE}Name must be unique diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index fa38d4c03..8a414bbae 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1196,7 +1196,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Select w STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Edit waypoint name STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Can't change waypoint name... @@ -1777,10 +1777,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tepees STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Teapot-House STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Piggy-Bank -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Landscaping @@ -2170,7 +2170,7 @@ STR_CITY_APPROVAL_HOSTILE :Hostile ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Company {COMMA}) +STR_FORMAT_COMPANY_NUM :(Company {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}New Face STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Color Scheme STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Color Scheme: @@ -3379,10 +3379,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Length: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Area: {NUM} x {NUM}{}Height difference: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3413,7 +3413,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Group {COMMA} +STR_FORMAT_GROUP_NAME :Group {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :All trains STR_GROUP_ALL_ROADS :All road vehicles diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 96ab23a6c..3981fc329 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1198,7 +1198,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Elektu t STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Ŝanĝu trairejan nomon STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Ne povas ŝanĝi trairejan nomon... @@ -1734,10 +1734,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipioj STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Tekruĉa Domo STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Porko-Banko -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Landaspektigi @@ -3112,9 +3112,9 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Longo: { STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Regiono: {NUM} x {NUM}{}Altecdiferenco: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} ######## @@ -3139,7 +3139,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Group {COMMA} +STR_FORMAT_GROUP_NAME :Group {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Ĉiuj trajnoj STR_GROUP_ALL_SHIPS :Ĉiuj ŝipoj diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index d7c1f6a8f..a8029247f 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1254,7 +1254,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Vali mel STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Muuda meldepunkti nime STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Meldepunkti nime ei saa muuta... @@ -1835,10 +1835,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipid STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Teekannu maja STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Krossu pank -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Maapinna kujundamine @@ -2228,7 +2228,7 @@ STR_CITY_APPROVAL_HOSTILE :Vaenulik ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY}{BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Ettevõte {COMMA}) +STR_FORMAT_COMPANY_NUM :(Ettevõte {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Uus nägu STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Värvivalik STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Värvivalik: @@ -3437,10 +3437,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Pikkus: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Pindala: {NUM} x {NUM}{}Kõrguste erinevus: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3471,7 +3471,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Rühm {COMMA} +STR_FORMAT_GROUP_NAME :Rühm {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Kõik raudteeveerem STR_GROUP_ALL_ROADS :Kõik mootorsõidukid diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 15e80bb62..4c7c23e25 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Valitse STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Muokkaa reittipisteen nimeä STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Reittipisteen nimeä ei voi muuttaa... @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tiipiitä STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Teesalonki STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Säästöpossu -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} ({STRING}) -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} ({STRING}) +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Maastonmuokkaus @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :Vihamielinen ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Yhtiö {COMMA}) +STR_FORMAT_COMPANY_NUM :(Yhtiö {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Uudet kasvot STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Väriteema STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Väriteema: @@ -3382,10 +3382,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Pituus: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Pinta-ala: {NUM} x {NUM}{}Korkeusero: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3416,7 +3416,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Ryhmä {COMMA} +STR_FORMAT_GROUP_NAME :Ryhmä {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Kaikki junat STR_GROUP_ALL_ROADS :Kaikki autot diff --git a/src/lang/french.txt b/src/lang/french.txt index 833af7823..d7f457b6c 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1198,7 +1198,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Choisir STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Modifier nom du point de contrôle STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Impossible de modifier le nom du point de contrôle... @@ -1779,10 +1779,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipis STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Salon de thé STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Tirelire -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Modification du paysage @@ -2172,7 +2172,7 @@ STR_CITY_APPROVAL_HOSTILE :Hostile ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Compagnie {COMMA}) +STR_FORMAT_COMPANY_NUM :(Compagnie {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nouveau visage STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Couleur STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Couleur: @@ -3383,10 +3383,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Longueur STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Région: {NUM} x {NUM}{}Ecart d'altitude: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}/{STRING}/{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}/{STRING}/{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3417,7 +3417,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Groupe {COMMA} +STR_FORMAT_GROUP_NAME :Groupe {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Tous les trains STR_GROUP_ALL_ROADS :Tous les véhicules routiers diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 85176b4cb..ebaf5a22a 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1158,7 +1158,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Seleccio STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Edita-lo nome do punto de control STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Non se pode cambia-lo nome do punto de control... @@ -1717,10 +1717,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipis STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Casa Tetera STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Banco Porquiño -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN}: {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN}: {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Modifica-lo terreo @@ -2106,7 +2106,7 @@ STR_CITY_APPROVAL_HOSTILE :Hostil ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Compañía {COMMA}) +STR_FORMAT_COMPANY_NUM :(Compañía {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nova Cara STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Esquema de Cor STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Esquema de Cor: @@ -3309,10 +3309,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lonxitud STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Área: {NUM} x {NUM}{}Diferencia de altura: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3343,7 +3343,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grupo {COMMA} +STR_FORMAT_GROUP_NAME :Grupo {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Tódolos trens STR_GROUP_ALL_ROADS :Tódolos vehículos de estrada diff --git a/src/lang/german.txt b/src/lang/german.txt index fc8849517..b14cdad7d 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1198,7 +1198,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Wegpunkt STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Namen des Wegpunkts ändern STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Wegpunktname kann nicht geändert werden... @@ -1779,10 +1779,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Zelt STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Teekannenhaus STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Sparschwein -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Landschaftsbau @@ -2172,7 +2172,7 @@ STR_CITY_APPROVAL_HOSTILE :Gering ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Firma {COMMA}) +STR_FORMAT_COMPANY_NUM :(Firma {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Neues Gesicht STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Farbschema STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Farbschema @@ -3383,10 +3383,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Länge: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Gebiet: {NUM} × {NUM}{}Höhenunterschied: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3417,7 +3417,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Gruppe {COMMA} +STR_FORMAT_GROUP_NAME :Gruppe {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Alle Züge STR_GROUP_ALL_ROADS :Alle Straßenfahrzeuge diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 5e7c3a2ee..55d8b78a0 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -1178,7 +1178,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}בחר STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}ערוך שם נקודת ציון STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}שינוי שם היעד נכשל... @@ -1754,10 +1754,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :טיפי STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :בית-ספל STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :בנק דן-חסכן -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :עיצוב פני השטח @@ -2147,7 +2147,7 @@ STR_CITY_APPROVAL_HOSTILE :עויין ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :({COMMA} חברה) +STR_FORMAT_COMPANY_NUM :({COMMA} חברה) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}פנים חדשות STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}הגדרות צבע STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}:הגדרות צבע @@ -3321,10 +3321,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK} {NUM} STR_MEASURE_AREA_HEIGHTDIFF :{BLACK} {NUM} x {NUM} :שטח {} {NBSP}'מ {NUM} :הפרש גובה ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3355,7 +3355,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :{COMMA} קבוצה +STR_FORMAT_GROUP_NAME :{COMMA} קבוצה STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :כל הרכבות STR_GROUP_ALL_ROADS :כל הרכבים diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 7a1263cc6..3d99b9f81 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1231,7 +1231,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Válassz STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Ellenőrző pont nevének módosítása STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nem lehet megváltoztatni az ellenőrző pont nevét... @@ -1812,10 +1812,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Indiánsátor STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Teáskanna-ház STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Malacpersely -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN}i {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN}i {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Tájrendezés @@ -2242,7 +2242,7 @@ STR_CITY_APPROVAL_HOSTILE :Ellenséges ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :({COMMA}. vállalat) +STR_FORMAT_COMPANY_NUM :({COMMA}. vállalat) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Új arc STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Színséma STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Színséma: @@ -3453,10 +3453,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Távols STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Terület: {NUM} x {NUM}{}Magasságkülönbség: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3487,7 +3487,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :{COMMA} csoport +STR_FORMAT_GROUP_NAME :{COMMA} csoport STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Összes vonat STR_GROUP_ALL_ROADS :Összes közúti jármű diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 150cb9729..c6d0e0230 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1198,7 +1198,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Velja te STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Breyta nafni millistöðvar STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Get ekki breytt nafni millistöðvar... @@ -1779,10 +1779,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Indíánatjald STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Teketilshús STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Svínabanki -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Mótun lands @@ -2172,7 +2172,7 @@ STR_CITY_APPROVAL_HOSTILE :Fjandsamleg ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Fyrirtæki {COMMA}) +STR_FORMAT_COMPANY_NUM :(Fyrirtæki {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nýtt Andlit STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Litaskema STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Litaskema: @@ -3383,10 +3383,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lengd: { STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Svæði: {NUM} x {NUM}{}Hæðarmunur: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3417,7 +3417,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Hópur {COMMA} +STR_FORMAT_GROUP_NAME :Hópur {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Allar lestir STR_GROUP_ALL_ROADS :Allar bifreiðir diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 509820fa5..16bb0520b 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Pilih je STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Edit nama titik penunjuk arah STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Tidak dapat mengganti nama sinyal jalur... @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tepees (rumah p STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Kedai teh STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Bank-Piggy -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{1:STRING} {0:TOWN} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Proses Landsekap @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :Bermusuhan ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Perusahaan {COMMA}) +STR_FORMAT_COMPANY_NUM :(Perusahaan {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Ganti Wajah STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Warna tema STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Warna tema: @@ -3382,10 +3382,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Panjang: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Area: {NUM} x {NUM}{}beda tinggi: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3416,7 +3416,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Kelompok {COMMA} +STR_FORMAT_GROUP_NAME :Kelompok {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Semua Kereta STR_GROUP_ALL_ROADS :Semua Bus/truk diff --git a/src/lang/italian.txt b/src/lang/italian.txt index e0cc463e5..6ea9cc8e3 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1199,7 +1199,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Selezion STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Rinomina il waypoint STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Impossibile rinominare il waypoint... @@ -1780,10 +1780,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tepee STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Casa-teiera STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Banca-porcellino -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{1:STRING} di {0:TOWN} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{1:STRING} di {0:TOWN} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Modellazione terreno @@ -2173,7 +2173,7 @@ STR_CITY_APPROVAL_HOSTILE :Ostile ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Compagnia {COMMA}) +STR_FORMAT_COMPANY_NUM :(Compagnia {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nuova faccia STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Colori compagnia STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Schema colori: @@ -3384,10 +3384,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lunghezz STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Area: {NUM} x {NUM}{}Differenza in altezza: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3418,7 +3418,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Gruppo {COMMA} +STR_FORMAT_GROUP_NAME :Gruppo {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Tutti i treni STR_GROUP_ALL_ROADS :Tutti gli automezzi diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 25ecc6218..6ae9b4b73 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1175,7 +1175,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}通過 STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}通過点名を変更 STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}通過点名を変更できません... @@ -1755,10 +1755,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :テント STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :茶瓶小屋 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :ブタ型貯金箱 -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN}{STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN}{STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :地形 @@ -2148,7 +2148,7 @@ STR_CITY_APPROVAL_HOSTILE :対立 ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :（会社 {COMMA}） +STR_FORMAT_COMPANY_NUM :（会社 {COMMA}） STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}新規顔 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}カラースキーム STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}カラースキーム： @@ -3329,10 +3329,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}長さ STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}地域：{NUM} x {NUM}{}高さの違い：{NUM} m ############ Date formatting -STR_DATE_TINY :{2:NUM}-{1:STRING}-{0:STRING} -STR_DATE_SHORT :{1:NUM}年{0:STRING} -STR_DATE_LONG :{2:NUM}年{1:STRING}{0:STRING} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_SHORT :{1:NUM}年{0:STRING} +STR_FORMAT_DATE_LONG :{2:NUM}年{1:STRING}{0:STRING} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3363,7 +3363,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :グループ {COMMA} +STR_FORMAT_GROUP_NAME :グループ {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :すべての列車 STR_GROUP_ALL_ROADS :すべての道路車両 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 47e2e5cd7..70e8f1821 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1198,7 +1198,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}웨이 STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}웨이포인트 이름 설정 STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}웨이포인트 이름을 변경할 수 없습니다... @@ -1779,10 +1779,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :천막 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :찻잔 집 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :돼지 저금통 -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :지형 편집 @@ -2172,7 +2172,7 @@ STR_CITY_APPROVAL_HOSTILE :싫어함 ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(회사 {COMMA}) +STR_FORMAT_COMPANY_NUM :(회사 {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}새 얼굴 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}색상 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}색상: @@ -3383,10 +3383,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}길이: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}넓이: {NUM} x {NUM}{}고도차: {NUM} m ############ Date formatting -STR_DATE_TINY :{2:NUM}.{1:STRING}.{0:STRING} -STR_DATE_SHORT :{1:NUM}년 {0:STRING} -STR_DATE_LONG :{2:NUM}년 {1:STRING}월 {0:STRING}일 -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{2:NUM}.{1:STRING}.{0:STRING} +STR_FORMAT_DATE_SHORT :{1:NUM}년 {0:STRING} +STR_FORMAT_DATE_LONG :{2:NUM}년 {1:STRING}월 {0:STRING}일 +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3417,7 +3417,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :그룹 {COMMA} +STR_FORMAT_GROUP_NAME :그룹 {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :모든 기차 STR_GROUP_ALL_ROADS :모든 차량 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 988bc7122..e2419f0dc 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1188,7 +1188,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Izvēlat STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Labot kontrolpunkta nosaukumu STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nevar pārsaukt kontrolpunktu... @@ -1768,10 +1768,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Vigvams STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Tējkannas namiņš STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Cūciņas banka -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Reljefa veidošana @@ -2161,7 +2161,7 @@ STR_CITY_APPROVAL_HOSTILE :Naidīgs ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Uzņēmums {COMMA}) +STR_FORMAT_COMPANY_NUM :(Uzņēmums {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Jauna seja STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Krāsu sidentitāte STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Krāsu identitāte @@ -3340,10 +3340,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Garums: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Lauks: {NUM} x {NUM}{}Augstuma atšķirība: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3374,7 +3374,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grupa {COMMA} +STR_FORMAT_GROUP_NAME :Grupa {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Visi vilcieni STR_GROUP_ALL_ROADS :Visi transportlīdzekļi diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index ceaf989e2..40bf2b25e 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1209,7 +1209,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Pasirink STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Redaguoti punkto vardą STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Neįmanoma pakeisti punkto vardo... @@ -1784,10 +1784,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Vigvamai STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Arbatos namai STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Paršiukų bankas -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Reljefinimas @@ -2177,7 +2177,7 @@ STR_CITY_APPROVAL_HOSTILE :Priešiškas ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Kompanija {COMMA}) +STR_FORMAT_COMPANY_NUM :(Kompanija {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Naujas veidas STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Spalva STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Spalva: @@ -3329,8 +3329,8 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Atstumas STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Sritis: {NUM} x {NUM}{}Aukščių skirtumas: {NUM} m ############ Date formatting -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3355,7 +3355,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grupė {COMMA} +STR_FORMAT_GROUP_NAME :Grupė {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Visi traukiniai STR_GROUP_ALL_ROADS :Visi automobiliai diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 52645c797..ca0e324a3 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -1195,7 +1195,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Wielt de STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Weepunktnumm STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kann den Weepunktnumm net änneren... @@ -1776,10 +1776,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipien STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Téikaan-Haus STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Spuerschwäin-Bank -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Landschaftsbau @@ -2169,7 +2169,7 @@ STR_CITY_APPROVAL_HOSTILE :Ofleenend ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Company {COMMA}) +STR_FORMAT_COMPANY_NUM :(Company {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Neit Gesiicht STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Faarw Schema STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Faarw Schema: @@ -3377,10 +3377,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Längt: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Areal: {NUM} x {NUM}{}Héichtenënnerscheed: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3411,7 +3411,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grupp {COMMA} +STR_FORMAT_GROUP_NAME :Grupp {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :All Zich STR_GROUP_ALL_ROADS :All Stroossengefierer diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 5263e665f..5bba5bc9a 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Velg kon STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Endre navn på kontrollpunkt... STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kan ikke endre navnet til kontrollpunktet... @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Indianertelt STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Tekjelehus STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Sparebøsse -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Landskapsverktøy @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :Fientlig ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Firma {COMMA}) +STR_FORMAT_COMPANY_NUM :(Firma {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nytt ansikt STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Firmafarge STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Firmafarge: @@ -3382,10 +3382,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lengde: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Område: {NUM} x {NUM}{}Høydeforskjell: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3416,7 +3416,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}{NBSP}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Gruppe {COMMA} +STR_FORMAT_GROUP_NAME :Gruppe {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Alle tog STR_GROUP_ALL_ROADS :Alle kjøretøyer diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index f488ebf23..ecc345330 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1188,7 +1188,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Vel kont STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Endre namn på kontrollpunkt STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kan ikkje endre namnet til kontrollpunktet... @@ -1769,10 +1769,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Indianertelt STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Tekjelehus STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Sparebøsse -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Landskapsverktøy @@ -2162,7 +2162,7 @@ STR_CITY_APPROVAL_HOSTILE :Fiendsleg ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Firma {COMMA}) +STR_FORMAT_COMPANY_NUM :(Firma {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nytt andlet STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Firmafarge STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Firmafarge: @@ -3342,10 +3342,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lengd: { STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Område: {NUM} x {NUM}{}Høgdeskilnad: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3376,7 +3376,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Gruppe {COMMA} +STR_FORMAT_GROUP_NAME :Gruppe {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Alle tog STR_GROUP_ALL_ROADS :Alle køyretøty diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 10a893d61..1ebc081ff 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1570,7 +1570,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Wybierz STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Edytuj nazwę pkt. kontrolnego STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nie można zmienić nazwy punktu orientacyjnego... @@ -2151,10 +2151,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipi STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Dom-Czajniczek STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Świnka-skarbonka -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Krajobraz @@ -2580,7 +2580,7 @@ STR_CITY_APPROVAL_HOSTILE :Wrogie ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Firma {COMMA}) +STR_FORMAT_COMPANY_NUM :(Firma {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nowa Twarz STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Schemat kolorów STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Schemat kolorów: @@ -3794,10 +3794,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Długoś STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Obszar: {NUM} x {NUM}{}Różnica wysokości: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3828,7 +3828,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grupa {COMMA} +STR_FORMAT_GROUP_NAME :Grupa {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Wszystkie pociągi STR_GROUP_ALL_ROADS :Wszystkie samochody diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 997ab4cd7..65a1da6f4 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Seleccio STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Editar nome do ponto de passagem STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Não é possível alterar o nome do ponto de passagem... @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tepees STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Casa-bule STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Mealheiro -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{1:STRING} de {0:TOWN} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{1:STRING} de {0:TOWN} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Paisagem @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :Hostil ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Empresa {COMMA}) +STR_FORMAT_COMPANY_NUM :(Empresa {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nova Cara STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Cores STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Cores: @@ -3382,10 +3382,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Comprime STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Área: {NUM} x {NUM}{}Diferença de altura: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3416,7 +3416,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grupo {COMMA} +STR_FORMAT_GROUP_NAME :Grupo {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Todos os Comboios STR_GROUP_ALL_ROADS :Todos os veículos de estrada diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index e3516e88b..daa360bfc 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Alege ti STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Editează numele haltei STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nu pot schimba numele haltei... @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Corturi STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Casă-ceainic STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Puşculiţă -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Modificare peisaj @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :ostilă ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Companie {COMMA}) +STR_FORMAT_COMPANY_NUM :(Companie {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Schimbă poza STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Schemă culori STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Schemă culori: @@ -3382,10 +3382,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lungime: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Suprafaţa: {NUM} x {NUM}{}Diferenţa de înălţime: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3416,7 +3416,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grup {COMMA} +STR_FORMAT_GROUP_NAME :Grup {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Toate trenurile STR_GROUP_ALL_ROADS :Toate autovehiculele diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 7144ceafe..e44f99fe2 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1346,7 +1346,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Выбо STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Переименовать точку пути STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Невозможно переименовать точку пути... @@ -1927,10 +1927,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Хижины STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Домик-Чайник STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Хрюшка-Копилка -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Ландшафт @@ -2328,7 +2328,7 @@ STR_CITY_APPROVAL_HOSTILE :Враждеб ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Компания {COMMA}) +STR_FORMAT_COMPANY_NUM :(Компания {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Внешность STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Цвет STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Цвет: @@ -3545,10 +3545,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Длин STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Площадь: {NUM} x {NUM}{}Разница высот: {NUM} м ############ Date formatting -STR_DATE_TINY :{STRING}.{STRING}.{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING.gen} {NUM} г. -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}.{STRING}.{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING.gen} {NUM} г. +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3579,7 +3579,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Группа {COMMA} +STR_FORMAT_GROUP_NAME :Группа {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Все поезда STR_GROUP_ALL_ROADS :Весь автотранспорт diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index bf70a781c..4e1e41eea 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -1355,7 +1355,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Odaberit STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Promena naziva čvorišta STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Neuspešana promena naziva čvorišta... @@ -1936,10 +1936,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Vigvami STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Čajnik-kuća STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Kasica-prasica -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Oblikovanje reljefa @@ -2329,7 +2329,7 @@ STR_CITY_APPROVAL_HOSTILE :Neprijateljski ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Kompanija {COMMA}) +STR_FORMAT_COMPANY_NUM :(Kompanija {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Novo lice STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Šema boja STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Šema boja: @@ -3270,10 +3270,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Dužina: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Područje: {NUM} x {NUM}{}Visinska razlika: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3304,7 +3304,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grupa {COMMA} +STR_FORMAT_GROUP_NAME :Grupa {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Svi vozovi STR_GROUP_ALL_ROADS :Sva drumska vozila diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 5cc287045..210aa659f 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}选择 STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}编辑路点名称 STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}不能更改路点名称…… @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :帐篷 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :茶杯小屋 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :猪猪银行 -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :景观美化 @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :对立 ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(公司 {COMMA}) +STR_FORMAT_COMPANY_NUM :(公司 {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}新的头像 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}色彩方案 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}色彩方案： @@ -3382,10 +3382,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}长度 STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}面积：{NUM} x {NUM}{}高度差：{NUM}米 ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3416,7 +3416,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :组 {COMMA} +STR_FORMAT_GROUP_NAME :组 {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :全部火车 STR_GROUP_ALL_ROADS :全部汽车 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 6f34cc653..35df2d536 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1264,7 +1264,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Vyber ty STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Upravit nazvy smerovych bodov STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nazov smeroveho bodu sa neda zmenit ... @@ -1845,10 +1845,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Vigvam STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Kaviaren STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Mala Banka -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{1:STRING} {0:TOWN} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Uprava terenu @@ -2238,7 +2238,7 @@ STR_CITY_APPROVAL_HOSTILE :Odmietavy ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Spoločnosť {COMMA}) +STR_FORMAT_COMPANY_NUM :(Spoločnosť {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nová tvár STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Farebna schema STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Farebna schema: @@ -3447,10 +3447,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Dlžka: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Plocha: {NUM} x {NUM}{}Výškový rozdiel: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3481,7 +3481,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Skupina {COMMA} +STR_FORMAT_GROUP_NAME :Skupina {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Všetky vlaky STR_GROUP_ALL_ROADS :Všetky cestné vozidlá diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index f3166c7ef..d0c3958e6 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1239,7 +1239,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Izberi v STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Uredi ime točke poti STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Ni mogoče preimenovati točke poti ... @@ -1821,10 +1821,10 @@ STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Čajnik-hiša STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Prašičkova banka STR_TOWN_BUILDING_NAME_PIGGY_BANK_1.r :Prašičkove banke -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Oblikovanje terena @@ -2251,7 +2251,7 @@ STR_CITY_APPROVAL_HOSTILE :Sovražno ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Podjetje {COMMA}) +STR_FORMAT_COMPANY_NUM :(Podjetje {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nov obraz STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Barvna shema STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Barvna shema: @@ -3460,10 +3460,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Dolžina STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Območje: {NUM} x {NUM}{}Višinska razlika: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3494,7 +3494,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Skupina {COMMA} +STR_FORMAT_GROUP_NAME :Skupina {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Vsi vlaki STR_GROUP_ALL_ROADS :Vsa cestna vozila diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 363e10c04..8cd326d23 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1198,7 +1198,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Seleccio STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Editar nombre del punto de paso STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}No se puede cambiar el nombre del punto de paso... @@ -1779,10 +1779,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipis STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Casa de Té STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Banco Cerdito -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN}, {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN}, {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Paisaje @@ -2172,7 +2172,7 @@ STR_CITY_APPROVAL_HOSTILE :Hostil ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Empresa {COMMA}) +STR_FORMAT_COMPANY_NUM :(Empresa {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nueva Cara STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Esquema de Color STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Esquema de Color: @@ -3383,10 +3383,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Longitud STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Área: {NUM} x {NUM}{}Diferencia altura: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3417,7 +3417,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grupo {COMMA} +STR_FORMAT_GROUP_NAME :Grupo {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Todos los trenes STR_GROUP_ALL_ROADS :Todos los vehículos de carretera diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index dbfae7e9f..fa105b5a9 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Välj ko STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Ändra namn på kontrollstation STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kan inte ändra kontrollstationens namn... @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Kåtor STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Tekanne-Hus STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Spargris -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Landskapsarkitektur @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :Fientlig ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Företag {COMMA}) +STR_FORMAT_COMPANY_NUM :(Företag {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nytt ansikte STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Färgval STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Färgval: @@ -3381,10 +3381,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Längd: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Yta: {NUM} x {NUM}{}Höjdskillnad: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3415,7 +3415,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grupp {COMMA} +STR_FORMAT_GROUP_NAME :Grupp {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Alla tåg STR_GROUP_ALL_ROADS :Alla vägfordon diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index d31bd9e0c..ee4320857 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}顯示 STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}編輯號誌站名稱 STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}無法修改號誌站名稱... @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :帳篷小屋 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :茶壺屋 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :撲滿 -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :地形 @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :抱敵意 ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(公司 {COMMA}) +STR_FORMAT_COMPANY_NUM :(公司 {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}新臉孔 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}配色 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}配色： @@ -3380,10 +3380,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}長度 STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}區域：{NUM} x {NUM}{}高度差：{NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{2:NUM} 年 {1:STRING} 月 {0:STRING} 日 -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{2:NUM} 年 {1:STRING} 月 {0:STRING} 日 +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3414,7 +3414,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :群組 {COMMA} +STR_FORMAT_GROUP_NAME :群組 {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :所有列車 STR_GROUP_ALL_ROADS :所有車輛 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 33b2a6f11..8cf04a708 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1197,7 +1197,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Yerimi t STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Yerimi adını değiştir STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Yerimi adı değiştirilemedi... @@ -1778,10 +1778,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Çadır STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Çaydanlık ev STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Domuz bankası -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Arazi @@ -2171,7 +2171,7 @@ STR_CITY_APPROVAL_HOSTILE :Katı ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Company {COMMA}) +STR_FORMAT_COMPANY_NUM :(Company {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Yeni Surat STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Renkler STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Renk: @@ -3380,10 +3380,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Uzunluk: STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Alan: {NUM} x {NUM}{}Yükseklik farkı: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3414,7 +3414,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}%{NUM}{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grup {COMMA} +STR_FORMAT_GROUP_NAME :Grup {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Bütün trenler STR_GROUP_ALL_ROADS :Bütün arabalar diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 50f2f6b7d..ede11f8c5 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1322,7 +1322,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Вибе STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Перейменуйте точку маршруту STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Не можна перейменувати точку маршруту... @@ -1903,10 +1903,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Вігвам STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Чайник-Дім STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Копилка -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{TOWN} {STRING} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Ландшафт @@ -2333,7 +2333,7 @@ STR_CITY_APPROVAL_HOSTILE :вороже ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Компанія {COMMA}) +STR_FORMAT_COMPANY_NUM :(Компанія {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Нове обличчя STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Схема кольорів STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Схема кольорів: @@ -3544,10 +3544,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Довж STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Ділянка: {NUM} x {NUM}{}Різниця висот: {NUM} м ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3578,7 +3578,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Група {COMMA} +STR_FORMAT_GROUP_NAME :Група {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Усі поїзди STR_GROUP_ALL_ROADS :Усі автомобілі diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index 88912d97b..8d2b9feb2 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -1173,7 +1173,7 @@ STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON :{BLACK}Lit hi-s ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Bedriuw {COMMA}) +STR_FORMAT_COMPANY_NUM :(Bedriuw {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nei Gesicht STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Kleurenskema STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Kleurenskema: diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt index 3bfcfb873..ca8877aab 100644 --- a/src/lang/unfinished/greek.txt +++ b/src/lang/unfinished/greek.txt @@ -1183,7 +1183,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Επιλ STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Διαμόρφωση ονόματος σημείου πορείας STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Αδύνατο να αλλαχτεί το όνομα του σημείου πορείας... @@ -1934,7 +1934,7 @@ STR_CITY_APPROVAL_HOSTILE :Εχθρικό ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Εταιρία {COMMA}) +STR_FORMAT_COMPANY_NUM :(Εταιρία {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Νέο Πρόσωπο STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Χρωματισμός STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Χρωματισμός: diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 5b05a80fe..d0c099d14 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -1194,7 +1194,7 @@ STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Dewiswch STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} -STR_WAYPOINT_RAW :{WAYPOINT} +STR_WAYPOINT_NAME :{WAYPOINT} STR_EDIT_WAYPOINT_NAME :{WHITE}Golygu enw Pwynt Llwybr STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Does dim modd newid enw Pwynt Llwybr... @@ -1775,10 +1775,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1 :Tipi STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1 :Tŷ Tebot STR_TOWN_BUILDING_NAME_PIGGY_BANK_1 :Cadwmigei -STR_INDUSTRY :{INDUSTRY} -STR_TOWN :{TOWN} -STR_INDUSTRY_FORMAT :{1:STRING} {0:TOWN} -STR_STATION :{STATION} +STR_INDUSTRY_NAME :{INDUSTRY} +STR_TOWN_NAME :{TOWN} +STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN} +STR_STATION_NAME :{STATION} ##id 0x2800 STR_LANDSCAPING_MENU_LANDSCAPING :Tirweddu @@ -2168,7 +2168,7 @@ STR_CITY_APPROVAL_HOSTILE :Gwrthwynebus ##id 0x7000 STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} -STR_COMPANY_NUM :(Cwmni {COMMA}) +STR_FORMAT_COMPANY_NUM :(Cwmni {COMMA}) STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Gwyneb Newydd STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Cynllun Lliw STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE :{GOLD}Cynllun Lliw: @@ -3360,10 +3360,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Hyd: {NU STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Ardal: {NUM} x {NUM}{}Gwahaniaeth uchder: {NUM} m ############ Date formatting -STR_DATE_TINY :{STRING}-{STRING}-{NUM} -STR_DATE_SHORT :{STRING} {NUM} -STR_DATE_LONG :{STRING} {STRING} {NUM} -STR_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} +STR_FORMAT_DATE_TINY :{STRING}-{STRING}-{NUM} +STR_FORMAT_DATE_SHORT :{STRING} {NUM} +STR_FORMAT_DATE_LONG :{STRING} {STRING} {NUM} +STR_FORMAT_DATE_ISO :{2:NUM}-{1:STRING}-{0:STRING} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_LONG :{DATE_LONG} @@ -3394,7 +3394,7 @@ STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHIT STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW} ##### Mass Order -STR_GROUP_NAME_FORMAT :Grw^p {COMMA} +STR_FORMAT_GROUP_NAME :Grw^p {COMMA} STR_GROUP_TINY_NAME :{TINYFONT}{GROUP} STR_GROUP_ALL_TRAINS :Pob trên STR_GROUP_ALL_ROADS :Pob cerbyd ffordd diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index ccf557dfc..a48940a4d 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -185,7 +185,7 @@ public: /* Local authority */ SetDParam(0, STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE); if (t != NULL) { - SetDParam(0, STR_TOWN); + SetDParam(0, STR_TOWN_NAME); SetDParam(1, t->index); } GetString(this->landinfo_data[line_nr], STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY, lastof(this->landinfo_data[line_nr])); diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp index 52138f2f6..8c288bcf5 100644 --- a/src/network/network_chat_gui.cpp +++ b/src/network/network_chat_gui.cpp @@ -319,7 +319,7 @@ struct NetworkChatWindow : public QueryStringBaseWindow { FOR_ALL_TOWNS_FROM(t, *item - MAX_CLIENT_SLOTS) { /* Get the town-name via the string-system */ SetDParam(0, t->index); - GetString(chat_tab_temp_buffer, STR_TOWN, lastof(chat_tab_temp_buffer)); + GetString(chat_tab_temp_buffer, STR_TOWN_NAME, lastof(chat_tab_temp_buffer)); return &chat_tab_temp_buffer[0]; } } diff --git a/src/station_gui.cpp b/src/station_gui.cpp index f1cfb5b49..8db32d0ae 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -174,12 +174,12 @@ protected: char buf[64]; SetDParam(0, (*a)->index); - GetString(buf, STR_STATION, lastof(buf)); + GetString(buf, STR_STATION_NAME, lastof(buf)); if (*b != last_station) { last_station = *b; SetDParam(0, (*b)->index); - GetString(buf_cache, STR_STATION, lastof(buf_cache)); + GetString(buf_cache, STR_STATION_NAME, lastof(buf_cache)); } return strcmp(buf, buf_cache); @@ -1002,7 +1002,7 @@ struct StationViewWindow : public Window { case SVW_RENAME: SetDParam(0, this->window_number); - ShowQueryString(STR_STATION, STR_QUERY_RENAME_STATION_CAPTION, MAX_LENGTH_STATION_NAME_BYTES, MAX_LENGTH_STATION_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); + ShowQueryString(STR_STATION_NAME, STR_QUERY_RENAME_STATION_CAPTION, MAX_LENGTH_STATION_NAME_BYTES, MAX_LENGTH_STATION_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); break; case SVW_TRAINS: { // Show a list of scheduled trains to this station diff --git a/src/strings.cpp b/src/strings.cpp index 7b8b06edb..25c116607 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -275,7 +275,7 @@ static char *FormatYmdString(char *buff, Date date, const char *last) ConvertDateToYMD(date, &ymd); int64 args[3] = { ymd.day + STR_ORDINAL_NUMBER_1ST - 1, STR_MONTH_ABBREV_JAN + ymd.month, ymd.year }; - return FormatString(buff, GetStringPtr(STR_DATE_LONG), args, 0, last); + return FormatString(buff, GetStringPtr(STR_FORMAT_DATE_LONG), args, 0, last); } static char *FormatMonthAndYear(char *buff, Date date, const char *last) @@ -284,7 +284,7 @@ static char *FormatMonthAndYear(char *buff, Date date, const char *last) ConvertDateToYMD(date, &ymd); int64 args[2] = { STR_MONTH_JAN + ymd.month, ymd.year }; - return FormatString(buff, GetStringPtr(STR_DATE_SHORT), args, 0, last); + return FormatString(buff, GetStringPtr(STR_FORMAT_DATE_SHORT), args, 0, last); } static char *FormatTinyOrISODate(char *buff, Date date, StringID str, const char *last) @@ -700,7 +700,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei, /* First print the town name and the industry type name. */ args[0] = i->town->index; args[1] = GetIndustrySpec(i->type)->name; - buff = FormatString(buff, GetStringPtr(STR_INDUSTRY_FORMAT), args, modifier >> 24, last); + buff = FormatString(buff, GetStringPtr(STR_FORMAT_INDUSTRY_NAME), args, modifier >> 24, last); modifier = 0; break; } @@ -736,12 +736,12 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei, } case SCC_DATE_TINY: { // {DATE_TINY} - buff = FormatTinyOrISODate(buff, GetInt32(&argv), STR_DATE_TINY, last); + buff = FormatTinyOrISODate(buff, GetInt32(&argv), STR_FORMAT_DATE_TINY, last); break; } case SCC_DATE_ISO: { // {DATE_ISO} - buff = FormatTinyOrISODate(buff, GetInt32(&argv), STR_DATE_ISO, last); + buff = FormatTinyOrISODate(buff, GetInt32(&argv), STR_FORMAT_DATE_ISO, last); break; } @@ -899,7 +899,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei, } int64 temp[3]; - temp[0] = STR_TOWN; + temp[0] = STR_TOWN_NAME; temp[1] = st->town->index; temp[2] = st->index; buff = GetStringWithArgs(buff, str, temp, last); @@ -945,7 +945,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei, int64 args[1]; args[0] = g->index; - buff = GetStringWithArgs(buff, STR_GROUP_NAME_FORMAT, args, last); + buff = GetStringWithArgs(buff, STR_FORMAT_GROUP_NAME, args, last); } break; } @@ -1019,7 +1019,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei, if (Company::IsValidHumanID(company)) { int64 args[1]; args[0] = company + 1; - buff = GetStringWithArgs(buff, STR_COMPANY_NUM, args, last); + buff = GetStringWithArgs(buff, STR_FORMAT_COMPANY_NUM, args, last); } break; } diff --git a/src/subsidy.cpp b/src/subsidy.cpp index 158622a09..04f0df118 100644 --- a/src/subsidy.cpp +++ b/src/subsidy.cpp @@ -62,25 +62,25 @@ Pair SetupSubsidyDecodeParam(const Subsidy *s, bool mode) if (!s->IsAwarded()) { if (cs->town_effect != TE_PASSENGERS && cs->town_effect != TE_MAIL) { - SetDParam(1, STR_INDUSTRY); + SetDParam(1, STR_INDUSTRY_NAME); SetDParam(2, s->from); reftype1 = NR_INDUSTRY; if (cs->town_effect != TE_GOODS && cs->town_effect != TE_FOOD) { - SetDParam(4, STR_INDUSTRY); + SetDParam(4, STR_INDUSTRY_NAME); SetDParam(5, s->to); reftype2 = NR_INDUSTRY; } else { - SetDParam(4, STR_TOWN); + SetDParam(4, STR_TOWN_NAME); SetDParam(5, s->to); reftype2 = NR_TOWN; } } else { - SetDParam(1, STR_TOWN); + SetDParam(1, STR_TOWN_NAME); SetDParam(2, s->from); reftype1 = NR_TOWN; - SetDParam(4, STR_TOWN); + SetDParam(4, STR_TOWN_NAME); SetDParam(5, s->to); reftype2 = NR_TOWN; } diff --git a/src/table/control_codes.h b/src/table/control_codes.h index a679ed9a0..53f8377a1 100644 --- a/src/table/control_codes.h +++ b/src/table/control_codes.h @@ -24,6 +24,7 @@ enum StringControlCode { /* Formatting control codes */ SCC_REVISION, + SCC_COMPANY_NUM, SCC_STATION_FEATURES, SCC_INDUSTRY_NAME, SCC_WAYPOINT_NAME, @@ -33,7 +34,6 @@ enum StringControlCode { SCC_VEHICLE_NAME, SCC_SIGN_NAME, SCC_COMPANY_NAME, - SCC_COMPANY_NUM, SCC_PRESIDENT_NAME, SCC_ENGINE_NAME, diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 463435943..5b4c64185 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -1406,7 +1406,7 @@ static bool VerifyTownName(uint32 r, const TownNameParams *par) /* We can't just compare the numbers since * several numbers may map to a single name. */ SetDParam(0, t->index); - GetString(buf2, STR_TOWN, lastof(buf2)); + GetString(buf2, STR_TOWN_NAME, lastof(buf2)); if (strcmp(buf1, buf2) == 0) return false; } diff --git a/src/town_gui.cpp b/src/town_gui.cpp index d017c04a7..3f6f228af 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -392,7 +392,7 @@ public: case TVW_CHANGENAME: // rename SetDParam(0, this->window_number); - ShowQueryString(STR_TOWN, STR_TOWN_VIEW_RENAME_TOWN_BUTTON, MAX_LENGTH_TOWN_NAME_BYTES, MAX_LENGTH_TOWN_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); + ShowQueryString(STR_TOWN_NAME, STR_TOWN_VIEW_RENAME_TOWN_BUTTON, MAX_LENGTH_TOWN_NAME_BYTES, MAX_LENGTH_TOWN_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); break; case TVW_EXPAND: // expand town - only available on Scenario editor @@ -565,7 +565,7 @@ private: char buf[64]; SetDParam(0, ta->index); - GetString(buf, STR_TOWN, lastof(buf)); + GetString(buf, STR_TOWN_NAME, lastof(buf)); /* If 'b' is the same town as in the last round, use the cached value * We do this to speed stuff up ('b' is called with the same value a lot of @@ -573,7 +573,7 @@ private: if (tb != last_town) { last_town = tb; SetDParam(0, tb->index); - GetString(buf_cache, STR_TOWN, lastof(buf_cache)); + GetString(buf_cache, STR_TOWN_NAME, lastof(buf_cache)); } return strcmp(buf, buf_cache); diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index ea2d15672..e6f26237f 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -968,13 +968,13 @@ struct VehicleListWindow : public BaseVehicleListWindow { break; case VLW_WAYPOINT_LIST: - SetDParam(0, STR_WAYPOINT_RAW); + SetDParam(0, STR_WAYPOINT_NAME); SetDParam(1, index); SetDParam(2, this->vscroll.count); break; case VLW_STATION_LIST: // Station Name - SetDParam(0, STR_STATION); + SetDParam(0, STR_STATION_NAME); SetDParam(1, index); SetDParam(2, this->vscroll.count); break; diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp index 9d0ac7189..02d2e8fa0 100644 --- a/src/waypoint_gui.cpp +++ b/src/waypoint_gui.cpp @@ -75,7 +75,7 @@ public: case WAYPVW_RENAME: // rename SetDParam(0, this->wp->index); - ShowQueryString(STR_WAYPOINT_RAW, STR_EDIT_WAYPOINT_NAME, MAX_LENGTH_WAYPOINT_NAME_BYTES, MAX_LENGTH_WAYPOINT_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); + ShowQueryString(STR_WAYPOINT_NAME, STR_EDIT_WAYPOINT_NAME, MAX_LENGTH_WAYPOINT_NAME_BYTES, MAX_LENGTH_WAYPOINT_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); break; case WAYPVW_SHOW_TRAINS: // show list of trains having this waypoint in their orders |