# HG changeset patch # User TechGeekNZ # Date 2020-06-29 01:38:29 # Node ID 94ef0c6c84e22651f22aa013ba2e35b56d7462cd # Parent 888b18f86927e49dc65061ebe72b1efe8bd9ed15 Codechange: Spell 'Viewport' consistently Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'. This patch makes everything consistent. diff --git a/src/company_gui.cpp b/src/company_gui.cpp --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -2558,7 +2558,7 @@ struct CompanyWindow : Window case WID_C_VIEW_HQ: { TileIndex tile = Company::Get((CompanyID)this->window_number)->location_of_HQ; if (_ctrl_pressed) { - ShowExtraViewPortWindow(tile); + ShowExtraViewportWindow(tile); } else { ScrollMainWindowToTile(tile); } diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp --- a/src/depot_gui.cpp +++ b/src/depot_gui.cpp @@ -787,7 +787,7 @@ struct DepotWindow : Window { case WID_D_LOCATION: if (_ctrl_pressed) { - ShowExtraViewPortWindow(this->window_number); + ShowExtraViewportWindow(this->window_number); } else { ScrollMainWindowToTile(this->window_number); } diff --git a/src/error_gui.cpp b/src/error_gui.cpp --- a/src/error_gui.cpp +++ b/src/error_gui.cpp @@ -225,7 +225,7 @@ public: int scr_bot = GetMainViewBottom() - 20; Point pt = RemapCoords(this->position.x, this->position.y, GetSlopePixelZOutsideMap(this->position.x, this->position.y)); - const ViewPort *vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport; + const Viewport *vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport; if (this->face == INVALID_COMPANY) { /* move x pos to opposite corner */ pt.x = UnScaleByZoom(pt.x - vp->virtual_left, vp->zoom) + vp->left; diff --git a/src/goal_gui.cpp b/src/goal_gui.cpp --- a/src/goal_gui.cpp +++ b/src/goal_gui.cpp @@ -148,7 +148,7 @@ struct GoalListWindow : public Window { } if (_ctrl_pressed) { - ShowExtraViewPortWindow(xy); + ShowExtraViewportWindow(xy); } else { ScrollMainWindowToTile(xy); } diff --git a/src/gui.h b/src/gui.h --- a/src/gui.h +++ b/src/gui.h @@ -55,8 +55,8 @@ void ShowStoryBook(CompanyID company, ui void ShowEstimatedCostOrIncome(Money cost, int x, int y); -void ShowExtraViewPortWindow(TileIndex tile = INVALID_TILE); -void ShowExtraViewPortWindowForTileUnderCursor(); +void ShowExtraViewportWindow(TileIndex tile = INVALID_TILE); +void ShowExtraViewportWindowForTileUnderCursor(); /* bridge_gui.cpp */ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transport_type, byte bridge_type); diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -1016,7 +1016,7 @@ public: case WID_IV_GOTO: { Industry *i = Industry::Get(this->window_number); if (_ctrl_pressed) { - ShowExtraViewPortWindow(i->location.GetCenterTile()); + ShowExtraViewportWindow(i->location.GetCenterTile()); } else { ScrollMainWindowToTile(i->location.GetCenterTile()); } @@ -1627,7 +1627,7 @@ public: uint p = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_ID_INDUSTRY_LIST, WD_FRAMERECT_TOP); if (p < this->industries.size()) { if (_ctrl_pressed) { - ShowExtraViewPortWindow(this->industries[p]->location.tile); + ShowExtraViewportWindow(this->industries[p]->location.tile); } else { ScrollMainWindowToTile(this->industries[p]->location.tile); } diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -403,7 +403,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Kaart van wêreld -STR_MAP_MENU_EXTRA_VIEW_PORT :Ekstra toonvenster +STR_MAP_MENU_EXTRA_VIEWPORT :Ekstra toonvenster STR_MAP_MENU_LINGRAPH_LEGEND :Vragverspreidingsleutel STR_MAP_MENU_SIGN_LIST :Teken lys @@ -885,7 +885,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK} die dorpsraad van {TOWN} het 'n kontrak met {STRING} aan gegaan vir een jaaar se eksklusiewe vervoer regte # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Toonvenster {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Toonvenster {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Verander toonvenster STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Dupliseer die ligging van die hooftoonvenster na die toonvenster STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Verander hoofaansig diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -374,7 +374,7 @@ STR_FILE_MENU_EXIT :خروج # map menu STR_MAP_MENU_MAP_OF_WORLD :خريطة العالم -STR_MAP_MENU_EXTRA_VIEW_PORT :شاشة عرض اضافية +STR_MAP_MENU_EXTRA_VIEWPORT :شاشة عرض اضافية STR_MAP_MENU_SIGN_LIST :قائمة العلامات ############ range for town menu starts @@ -836,7 +836,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE :{BIG_FONT}{BLACK} شركة {STRING} فازت بالعرض !{}{} نقل {STRING} من {STRING} الى {STRING} سوف يعطي اربعة اضعاف الدخل للسنة القادمة STR_NEWS_ROAD_REBUILDING :{BIG_FONT}{BLACK} فوضى طرق عارمة في مدينة {TOWN}!{}{}اعادة ترميم الطرق مولت من قبل شركة {STRING}{} تجلي ستة أشهر من الشقاء لعربات الطريق. # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}شاشة العرض {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}شاشة العرض {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}انسخ لشاشة العرض STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}انسخ موقع الشاشة الرئيسية لشاشة العرض هذه STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}لصق من شاشة العرض diff --git a/src/lang/basque.txt b/src/lang/basque.txt --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -392,7 +392,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Munduko mapa -STR_MAP_MENU_EXTRA_VIEW_PORT :lehio extra +STR_MAP_MENU_EXTRA_VIEWPORT :lehio extra STR_MAP_MENU_SIGN_LIST :Seinale zerrenda ############ range for town menu starts @@ -861,7 +861,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}{TOWN}ko udaletxeak {STRING}rekin urte beterako erabateko garraio-eskubideen kontratua sinatu du! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Leihoa {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Leihoa {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Leihora kopiatu STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK} Leiho nagusian ikusten dena leiho honetara kopiatu STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Aldatu ikuspen nagusia diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -712,7 +712,7 @@ STR_FILE_MENU_EXIT :Выхад # map menu STR_MAP_MENU_MAP_OF_WORLD :Мапа сусьвету -STR_MAP_MENU_EXTRA_VIEW_PORT :Дадатковае вакно прагляду +STR_MAP_MENU_EXTRA_VIEWPORT :Дадатковае вакно прагляду STR_MAP_MENU_LINGRAPH_LEGEND :Леґенда грузаперавозак STR_MAP_MENU_SIGN_LIST :Сьпіс таблічак @@ -1194,7 +1194,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Транспартная манаполія! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Мясцовыя ўлады г. {TOWN} падпісалі кантракт з {STRING} на адзін год эксклюзыўных транспартных правоў! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Вакно прагляду {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Вакно прагляду {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Капіяваць у вакно прагляду STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Скапіяваць бягучую пазыцыю ў вакно прагляду STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}У асноўнае акно diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -396,7 +396,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Mapa do mundo -STR_MAP_MENU_EXTRA_VIEW_PORT :Janela extra +STR_MAP_MENU_EXTRA_VIEWPORT :Janela extra STR_MAP_MENU_LINGRAPH_LEGEND :Legenda do Fluxo de Carga STR_MAP_MENU_SIGN_LIST :Lista de sinais @@ -876,7 +876,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Monopólio dos transportes! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Prefeitura de {TOWN} assina contrato de exclusividade com {STRING} por um ano! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Janela {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Janela {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Alterar visualização STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copiar o local da tela principal para esta janela STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Colar da visualização principal diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -396,7 +396,7 @@ STR_FILE_MENU_EXIT :Изход # map menu STR_MAP_MENU_MAP_OF_WORLD :Карта на света -STR_MAP_MENU_EXTRA_VIEW_PORT :Допълнителна камера +STR_MAP_MENU_EXTRA_VIEWPORT :Допълнителна камера STR_MAP_MENU_SIGN_LIST :Списък с табели ############ range for town menu starts @@ -867,7 +867,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Монополист на транспорта! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Местните власти на {TOWN} подписаха договор с {STRING} за едногодишни ексклузивни транспортни права # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Камера {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Камера {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Преместване на камерата STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Преместване на тази камера до глобалната STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Преместване глобалната камера diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -400,7 +400,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Mapa del món -STR_MAP_MENU_EXTRA_VIEW_PORT :Vista extra +STR_MAP_MENU_EXTRA_VIEWPORT :Vista extra STR_MAP_MENU_LINGRAPH_LEGEND :Llegenda del flux de càrrega STR_MAP_MENU_SIGN_LIST :Llista de senyals @@ -881,7 +881,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}L'autoritat local de {TOWN} signa un contracte amb {STRING} per l'explotació en exclusiva dels drets de transport durant un any # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Vista {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Vista {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Canvia la vista extra STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Mou aquesta vista on està la vista principal STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Canvia vista principal diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -498,7 +498,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Karta svijeta -STR_MAP_MENU_EXTRA_VIEW_PORT :Dodatni pogled +STR_MAP_MENU_EXTRA_VIEWPORT :Dodatni pogled STR_MAP_MENU_LINGRAPH_LEGEND :Legenda protoka tereta STR_MAP_MENU_SIGN_LIST :Popis znakova @@ -980,7 +980,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Lokalna vlast {TOWN} potpisuje ugovor sa {STRING} za jednogodišnja ekskluzivna prava transporta! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Mini pogled {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Mini pogled {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Promijeni pogled STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopiraj lokaciju globalnog pogleda u ovaj mini pogled STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Promijeni glavni pogled diff --git a/src/lang/czech.txt b/src/lang/czech.txt --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -477,7 +477,7 @@ STR_FILE_MENU_EXIT :Ukončit program # map menu STR_MAP_MENU_MAP_OF_WORLD :Mapa světa -STR_MAP_MENU_EXTRA_VIEW_PORT :Další pohled +STR_MAP_MENU_EXTRA_VIEWPORT :Další pohled STR_MAP_MENU_LINGRAPH_LEGEND :Legenda toku nákladu STR_MAP_MENU_SIGN_LIST :Seznam popisků @@ -970,7 +970,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Transportní monopol! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Místní správa města {TOWN} podepsala dohodu s {STRING} na jeden rok exkluzivní dopravy! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Pohled {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Pohled {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Nastavit jako pohled STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Nastavit současné zorné pole jako pohled STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Změnit hlavní pohled diff --git a/src/lang/danish.txt b/src/lang/danish.txt --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -402,7 +402,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Kort over verden -STR_MAP_MENU_EXTRA_VIEW_PORT :Nyt lokalitetsvindue +STR_MAP_MENU_EXTRA_VIEWPORT :Nyt lokalitetsvindue STR_MAP_MENU_LINGRAPH_LEGEND :Laststrømforklaring STR_MAP_MENU_SIGN_LIST :Liste over skilte @@ -884,7 +884,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Myndighederne i {TOWN} skriver kontrakt med {STRING} på et års eksklusive transportrettigheder! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Lokalitetsvindue {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Lokalitetsvindue {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Hent hovedvisning STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Bevæg denne visning til samme sted som hovedvisningen STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Flyt hovedvisning diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -402,7 +402,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Wereldkaart -STR_MAP_MENU_EXTRA_VIEW_PORT :Extra kijkvenster +STR_MAP_MENU_EXTRA_VIEWPORT :Extra kijkvenster STR_MAP_MENU_LINGRAPH_LEGEND :Vrachtstroomlegende STR_MAP_MENU_SIGN_LIST :Bordjeslijst @@ -884,7 +884,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Gemeentebestuur van {TOWN} tekent contract met {STRING} voor een jaar exclusieve transportrechten! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Kijkvenster {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Kijkvenster {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Verander kijkvenster STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopieer de locatie van het algemene scherm naar dit kijkvenster STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Verander algemeen scherm diff --git a/src/lang/english.txt b/src/lang/english.txt --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -402,7 +402,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Map of world -STR_MAP_MENU_EXTRA_VIEW_PORT :Extra viewport +STR_MAP_MENU_EXTRA_VIEWPORT :Extra viewport STR_MAP_MENU_LINGRAPH_LEGEND :Cargo Flow Legend STR_MAP_MENU_SIGN_LIST :Sign list @@ -884,7 +884,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Local authority of {TOWN} signs contract with {RAW_STRING} for one year of exclusive transport rights! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Viewport {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Viewport {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Change viewport STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copy the location of the main view to this viewport STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Change main view diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -386,7 +386,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Map of world -STR_MAP_MENU_EXTRA_VIEW_PORT :Extra viewport +STR_MAP_MENU_EXTRA_VIEWPORT :Extra viewport STR_MAP_MENU_LINGRAPH_LEGEND :Cargo Flow Legend STR_MAP_MENU_SIGN_LIST :Sign list @@ -860,7 +860,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Local authority of {TOWN} signs contract with {STRING} for one year of exclusive transport rights! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Viewport {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Viewport {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Copy to viewport STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copy the location of the main view to this viewport STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Paste from viewport diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -402,7 +402,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Map of world -STR_MAP_MENU_EXTRA_VIEW_PORT :Extra viewport +STR_MAP_MENU_EXTRA_VIEWPORT :Extra viewport STR_MAP_MENU_LINGRAPH_LEGEND :Cargo Flow Legend STR_MAP_MENU_SIGN_LIST :Sign list @@ -884,7 +884,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Local authority of {TOWN} signs contract with {STRING} for one year of exclusive transport rights! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Viewport {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Viewport {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Change viewport STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copy the location of the main view to this viewport STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Change main view diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -389,7 +389,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Mondomapo -STR_MAP_MENU_EXTRA_VIEW_PORT :Plia vidujo +STR_MAP_MENU_EXTRA_VIEWPORT :Plia vidujo STR_MAP_MENU_LINGRAPH_LEGEND :Legendo de ŝarĝfluo STR_MAP_MENU_SIGN_LIST :Afiŝa listo @@ -856,7 +856,7 @@ STR_NEWS_ROAD_REBUILDING :{BIG_FONT}{BLACK}Trafika ĥaoso en {TOWN}!{}{}Vojrekonstruada programo komencita de {STRING} alportas 6-monatan mizeron al vojuzantoj! STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Transporta monopolo! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Vidujo {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Vidujo {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Kopiu al vidujo STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopiu la lokon de la ĉefvido al ĉi tiu vidujo STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Gluu de vidujo diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -454,7 +454,7 @@ STR_FILE_MENU_EXIT :Välju # map menu STR_MAP_MENU_MAP_OF_WORLD :Maailmakaart -STR_MAP_MENU_EXTRA_VIEW_PORT :Lisa vaateaken +STR_MAP_MENU_EXTRA_VIEWPORT :Lisa vaateaken STR_MAP_MENU_LINGRAPH_LEGEND :Kaubavoo legend STR_MAP_MENU_SIGN_LIST :Siltide register @@ -929,7 +929,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Kohalik linnavõim{TOWN} allkirjastab lepingu {STRING} transpordi ainuõiguseks üheks aastaks! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Vaateaken {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Vaateaken {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Kopeeri vaateaknasse STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopeeri praegune vaade vaateaknasse STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Muuda peamist vaadet diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -374,7 +374,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Heimskort -STR_MAP_MENU_EXTRA_VIEW_PORT :Eyka synisgluggi +STR_MAP_MENU_EXTRA_VIEWPORT :Eyka synisgluggi STR_MAP_MENU_SIGN_LIST :Listi yvur tekin ############ range for town menu starts @@ -841,7 +841,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Mynduleikanir í {TOWN} skriva undir sáttmála við {STRING} fyri einkarrætt av flutningi í eitt ár! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Sýnisgluggi {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Sýnisgluggi {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Rita til sýnisglugga STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Avrita staðið í høvuðsglugganum inn hendan sýnisgluggan STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Set inn frá sýnisglugga diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -402,7 +402,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Maailmankartta -STR_MAP_MENU_EXTRA_VIEW_PORT :Lisänäkymä +STR_MAP_MENU_EXTRA_VIEWPORT :Lisänäkymä STR_MAP_MENU_LINGRAPH_LEGEND :Rahtivirran selitys STR_MAP_MENU_SIGN_LIST :Kylttilista @@ -884,7 +884,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}{TOWN} ja {STRING} allekirjoittavat sopimuksen vuoden pituisesta kuljetusyksinoikeudesta! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Näkymä {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Näkymä {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Päänäkymästä tähän STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopioi päänäkymän sijainti tähän näkymään STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Vaihda päänäkymää diff --git a/src/lang/french.txt b/src/lang/french.txt --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -403,7 +403,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Carte du monde -STR_MAP_MENU_EXTRA_VIEW_PORT :Vue supplémentaire +STR_MAP_MENU_EXTRA_VIEWPORT :Vue supplémentaire STR_MAP_MENU_LINGRAPH_LEGEND :Légende du flux de marchandises STR_MAP_MENU_SIGN_LIST :Liste des panneaux @@ -885,7 +885,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Les autorités locales de {TOWN} signent avec {STRING} un contrat d'exclusivité des transports valable un an{NBSP}! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Vue {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Vue {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Modifier cette vue STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copier l'emplacement de la vue principale vers cette vue STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Modifier la vue principale diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -583,7 +583,7 @@ STR_FILE_MENU_EXIT :Fàg an-seo # map menu STR_MAP_MENU_MAP_OF_WORLD :Mapa an t-saoghail -STR_MAP_MENU_EXTRA_VIEW_PORT :Port-seallaidh a bharrachd +STR_MAP_MENU_EXTRA_VIEWPORT :Port-seallaidh a bharrachd STR_MAP_MENU_LINGRAPH_LEGEND :Clàr-mìneachaidh an t-srutha carago STR_MAP_MENU_SIGN_LIST :Liosta nan sanas @@ -1074,7 +1074,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Aon-mhargadh giùlain! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Chuir an t-ùghdarras ionadail aig {TOWN} a làimh ri cùmhnant le {STRING} air còraichean giùlain às-dùnach fad bliadhna! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Port-seallaidh {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Port-seallaidh {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Atharraich am port-seallaidh STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Cuir lethbhreac dhen ionad air a' phrìomh shealladh sa phort-seallaidh seo STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Atharraich am prìomh phort-seallaidh diff --git a/src/lang/galician.txt b/src/lang/galician.txt --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -403,7 +403,7 @@ STR_FILE_MENU_EXIT :Saír # map menu STR_MAP_MENU_MAP_OF_WORLD :Mapa do mundo -STR_MAP_MENU_EXTRA_VIEW_PORT :Xanela extra +STR_MAP_MENU_EXTRA_VIEWPORT :Xanela extra STR_MAP_MENU_LINGRAPH_LEGEND :Lenda de tomar carga STR_MAP_MENU_SIGN_LIST :Lista de rótulos @@ -884,7 +884,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}As autoridades locáis de {TOWN} asinan un contrato con {STRING} por un ano de dereitos de transporte exclusivos! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Vista {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Vista {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Cambiar xanela STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copia-la sitaución da vista principal a esta vista STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Cambia a vista principal diff --git a/src/lang/german.txt b/src/lang/german.txt --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -398,7 +398,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Weltkarte -STR_MAP_MENU_EXTRA_VIEW_PORT :Zusatzansicht +STR_MAP_MENU_EXTRA_VIEWPORT :Zusatzansicht STR_MAP_MENU_LINGRAPH_LEGEND :Frachtverbindungen STR_MAP_MENU_SIGN_LIST :Schilderliste @@ -878,7 +878,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Stadtverwaltung von {TOWN} unterzeichnet Vertrag mit {STRING} über ein Jahr währende exklusive Transportrechte! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Ansicht {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Ansicht {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Zusatzansicht ändern STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Aktuelle Position der Hauptansicht in diese Zusatzansicht kopieren STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Hauptansicht ändern diff --git a/src/lang/greek.txt b/src/lang/greek.txt --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -458,7 +458,7 @@ STR_FILE_MENU_EXIT :Έξοδος # map menu STR_MAP_MENU_MAP_OF_WORLD :Χάρτης του κόσμου -STR_MAP_MENU_EXTRA_VIEW_PORT :Πρόσθετη εμφάνιση +STR_MAP_MENU_EXTRA_VIEWPORT :Πρόσθετη εμφάνιση STR_MAP_MENU_LINGRAPH_LEGEND :Υπόμνημα Ροής Φορτίου STR_MAP_MENU_SIGN_LIST :Λίστα πινακίδων @@ -985,7 +985,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Μονοπώλιο μεταφορών! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Οι τοπικές αρχές της πόλης {TOWN} υπογράφουν συμβόλαιο με την εταιρεία {STRING} για αποκλειστικά δικαιώματα μεταφορών ενός έτους! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Εμφάνιση {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Εμφάνιση {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Αντιγραφή στο παράθυρο εμφάνισης STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Αντιγραφή της τοποθεσίας της κύριας προβολής σε αυτό το παράθυρο εμφάνισης STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Επικόλληση από παράθυρο εμφάνισης diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -409,7 +409,7 @@ STR_FILE_MENU_EXIT :יציאה # map menu STR_MAP_MENU_MAP_OF_WORLD :מפת העולם -STR_MAP_MENU_EXTRA_VIEW_PORT :השקפה נוספת +STR_MAP_MENU_EXTRA_VIEWPORT :השקפה נוספת STR_MAP_MENU_LINGRAPH_LEGEND :מקרא זרימת מטענים STR_MAP_MENU_SIGN_LIST :רשימת שלטים @@ -887,7 +887,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}מונופול תחבורה! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}הרשות המקומית של {TOWN} חותמת חוזה עם {STRING} המעניק זכויות תעבורה בלעדיות למשך שנה! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}השקפה {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}השקפה {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}העתק להשקפה STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}העתק את מיקום חלון התצוגה הראשי לחלון תצוגה זה STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}עבור למיקום שנמצא בחלון התצוגה diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -465,7 +465,7 @@ STR_FILE_MENU_EXIT :Kilépés # map menu STR_MAP_MENU_MAP_OF_WORLD :Világtérkép -STR_MAP_MENU_EXTRA_VIEW_PORT :Extra látkép +STR_MAP_MENU_EXTRA_VIEWPORT :Extra látkép STR_MAP_MENU_LINGRAPH_LEGEND :Rakományáramlási jelmagyarázat STR_MAP_MENU_SIGN_LIST :Feliratok listája @@ -948,7 +948,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Szállítási monopólium! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}{TOWN} önkormányzata és {STRING} szerződést kötött egy éves kizárólagos szállítási jogokra! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}{COMMA}. látkép +STR_EXTRA_VIEWPORT_TITLE :{WHITE}{COMMA}. látkép STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Látkép átállítása STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}A látképre a fő nézet pozícióját másolja STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Fő nézet ideállítása diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -374,7 +374,7 @@ STR_FILE_MENU_EXIT :Hætta # map menu STR_MAP_MENU_MAP_OF_WORLD :Heimskort -STR_MAP_MENU_EXTRA_VIEW_PORT :Auka sjónarhorn +STR_MAP_MENU_EXTRA_VIEWPORT :Auka sjónarhorn STR_MAP_MENU_SIGN_LIST :Skiltalisti ############ range for town menu starts @@ -840,7 +840,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Bæjarstjórn {TOWN} skrifar undir eins árs sérleyfis samning við {STRING} til flutningar á öllum varningi. # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Sjónarhorn {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Sjónarhorn {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Afrita í sjónarhorn STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Afrita aðalsjónarhornið í þetta sjónarhorn STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Afrita frá sjónarhorni diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -396,7 +396,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Peta Dunia -STR_MAP_MENU_EXTRA_VIEW_PORT :Viewport ekstra +STR_MAP_MENU_EXTRA_VIEWPORT :Viewport ekstra STR_MAP_MENU_LINGRAPH_LEGEND :Legenda aliran kargo STR_MAP_MENU_SIGN_LIST :Daftar Tanda @@ -876,7 +876,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Pemkot Kota {TOWN} menandatangani kontrak dengan {STRING} untuk hak transportasi eksklusif selama 1 tahun! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Viewport {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Viewport {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Simpan ke viewport STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Simpan lokasi peta sekarang ke viewport STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Tampilan dari viewport diff --git a/src/lang/irish.txt b/src/lang/irish.txt --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -395,7 +395,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Léarscáil den domhan -STR_MAP_MENU_EXTRA_VIEW_PORT :Fuinneog amhairc bhreise +STR_MAP_MENU_EXTRA_VIEWPORT :Fuinneog amhairc bhreise STR_MAP_MENU_LINGRAPH_LEGEND :Eochair an tSreafa Lastais STR_MAP_MENU_SIGN_LIST :Liosta na gcomharthaí @@ -869,7 +869,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Síníonn údarás áitiúil {TOWN} conradh le {STRING} le haghaidh cearta eisiacha iompair ar feadh bliana! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Amharc {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Amharc {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Cóipeáil chuig amharc STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Cóipeáil suíomh an phríomh-amhairc chuig an amharc seo STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Greamaigh ón amharc diff --git a/src/lang/italian.txt b/src/lang/italian.txt --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -404,7 +404,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Mappa del mondo -STR_MAP_MENU_EXTRA_VIEW_PORT :Mini visuale extra +STR_MAP_MENU_EXTRA_VIEWPORT :Mini visuale extra STR_MAP_MENU_LINGRAPH_LEGEND :Legenda rotte commerciali STR_MAP_MENU_SIGN_LIST :Elenco cartelli @@ -886,7 +886,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}L'autorità locale di {TOWN} firma un accordo con la {STRING} per un anno di diritti di trasporto esclusivi! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Mini visuale {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Mini visuale {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Cambia mini visuale STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copia la posizione della visuale principale in questa mini visuale STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Cambia vis. principale diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -395,7 +395,7 @@ STR_FILE_MENU_EXIT :OpenTTDを終了 # map menu STR_MAP_MENU_MAP_OF_WORLD :地図 -STR_MAP_MENU_EXTRA_VIEW_PORT :ビューポートを開く +STR_MAP_MENU_EXTRA_VIEWPORT :ビューポートを開く STR_MAP_MENU_LINGRAPH_LEGEND :貨物輸送履歴 STR_MAP_MENU_SIGN_LIST :標識リスト @@ -869,7 +869,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}輸送独占! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK} {TOWN}が{STRING}と1年間の排他輸送契約を締結! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}ビューア {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}ビューア {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}ビューアへコピー STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}メイン画面の場所をビューアにコピーする STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}ビューアからペースト diff --git a/src/lang/korean.txt b/src/lang/korean.txt --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -403,7 +403,7 @@ STR_FILE_MENU_EXIT :종료 # map menu STR_MAP_MENU_MAP_OF_WORLD :전체 지도 보기 -STR_MAP_MENU_EXTRA_VIEW_PORT :외부 화면 +STR_MAP_MENU_EXTRA_VIEWPORT :외부 화면 STR_MAP_MENU_LINGRAPH_LEGEND :화물 흐름 범례 STR_MAP_MENU_SIGN_LIST :팻말 목록 @@ -885,7 +885,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}독점 수송! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}{0:TOWN} 지역 당국이 {1:STRING}과 1년 간의 수송 독점권 계약을 체결하였습니다! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}외부 화면 {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}외부 화면 {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}외부 화면으로 복사 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}현재 장소를 외부 화면에 복사합니다. STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}이 장소로 이동 diff --git a/src/lang/latin.txt b/src/lang/latin.txt --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -585,7 +585,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Orbis tabula -STR_MAP_MENU_EXTRA_VIEW_PORT :Fenestra conspectus additicia +STR_MAP_MENU_EXTRA_VIEWPORT :Fenestra conspectus additicia STR_MAP_MENU_LINGRAPH_LEGEND :Formula graphica onerum cursus STR_MAP_MENU_SIGN_LIST :Index signorum @@ -1065,7 +1065,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}{TOWN}: Auctoritas vicinalis nuntiat {STRING} esse societatem unicam cui uno anno licet transportare intra oppidum! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Fenestra conspectus {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Fenestra conspectus {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Mutare conspectum STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Transcribere locum primarium ad hanc fenestram conspectus STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Mutare conspectum primum diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -404,7 +404,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Pasaules karte -STR_MAP_MENU_EXTRA_VIEW_PORT :Papildu skatvieta +STR_MAP_MENU_EXTRA_VIEWPORT :Papildu skatvieta STR_MAP_MENU_LINGRAPH_LEGEND :Kravu plūsmas apzīmējumi STR_MAP_MENU_SIGN_LIST :Zīmju saraksts @@ -886,7 +886,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Pārvadājumu monopols! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}{TOWN} vietējā pašvaldība panāk vienošanos ar {STRING} par pārvadājumu izņēmuma tiesībām uz vienu gadu! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Skatvieta {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Skatvieta {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Mainīt skatvietu STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopēt galvenā skata atrašanās vietu uz šo skatvietu STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Mainīt galveno skatu diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -590,7 +590,7 @@ STR_FILE_MENU_EXIT :Išeiti # map menu STR_MAP_MENU_MAP_OF_WORLD :Žemėlapis -STR_MAP_MENU_EXTRA_VIEW_PORT :Papildomas peržiūros langas +STR_MAP_MENU_EXTRA_VIEWPORT :Papildomas peržiūros langas STR_MAP_MENU_LINGRAPH_LEGEND :Krovinių srautų legenda STR_MAP_MENU_SIGN_LIST :Ženklų sąrašas @@ -1074,7 +1074,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Vietinė valdža {TOWN} pasirašo kontraktą {STRING} vieneriems metams išskirtines pervežimų teises! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Peržiūros langas {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Peržiūros langas {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Kopijuoti į peržiūros langą STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopijuoti pagrindinio lango padėtį į šį peržiūros langą STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Įkelti iš peržiūros lango diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -402,7 +402,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Weltkaart -STR_MAP_MENU_EXTRA_VIEW_PORT :Extra Usiicht +STR_MAP_MENU_EXTRA_VIEWPORT :Extra Usiicht STR_MAP_MENU_LINGRAPH_LEGEND :Cargo Flow Legend STR_MAP_MENU_SIGN_LIST :Schëlderlëscht @@ -884,7 +884,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}D'Gemeng {TOWN} ënnerschreiwt Kontrakt mat {STRING} fir ee Joer laang exklusiv Transportrechter! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Usiicht {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Usiicht {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Ännert d'Usiicht STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopéiert d'Plaz vun der globaler Usiicht op des Usiicht STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Haptusiicht änneren diff --git a/src/lang/malay.txt b/src/lang/malay.txt --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -378,7 +378,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Peta Dunia -STR_MAP_MENU_EXTRA_VIEW_PORT :Tetingkap pemandangan tambahan +STR_MAP_MENU_EXTRA_VIEWPORT :Tetingkap pemandangan tambahan STR_MAP_MENU_SIGN_LIST :Senarai papan tanda ############ range for town menu starts @@ -845,7 +845,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT} {BLACK} Pihak Berkuasa Tempatan {TOWN} menanda tangani kontrak dengan {STRING} untuk satu tahun hak pengangkutan eksklusif! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Tetingkap Pemandangan {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Tetingkap Pemandangan {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Ubah tetingkap paparan STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Salin lokasi pemandangan global kepada tetingkap pemandangan ini STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Ubah paparan utama diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -404,7 +404,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Verdenskart -STR_MAP_MENU_EXTRA_VIEW_PORT :Ekstra tilleggsvindu +STR_MAP_MENU_EXTRA_VIEWPORT :Ekstra tilleggsvindu STR_MAP_MENU_LINGRAPH_LEGEND :Symbolforklaring for vareflyt STR_MAP_MENU_SIGN_LIST :Skiltliste @@ -885,7 +885,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Lokal myndighet i {TOWN} signerer kontrakt med {STRING} for ett år med eksklusift transport rettigheter! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Tilleggsvindu {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Tilleggsvindu {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Kopier til tilleggsvindu STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopier hovedvisningen til dette tilleggsvinduet STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Endre hovedsynsfelt diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -397,7 +397,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Verdskart -STR_MAP_MENU_EXTRA_VIEW_PORT :Ekstra tilleggsvindauge +STR_MAP_MENU_EXTRA_VIEWPORT :Ekstra tilleggsvindauge STR_MAP_MENU_LINGRAPH_LEGEND :Symbolforklaring for vareflyt STR_MAP_MENU_SIGN_LIST :Skiltliste @@ -871,7 +871,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Bystyret i {TOWN} signerer kontrakt med {STRING} om eitt års eksklusive transportrettar!! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Tilleggsvindauge {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Tilleggsvindauge {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Kopier til tilleggsvindauge STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopier stad i hovedvisinga til dette tilleggsvindauga STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Kopier frå tilleggsvindauge diff --git a/src/lang/polish.txt b/src/lang/polish.txt --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -781,7 +781,7 @@ STR_FILE_MENU_EXIT :Wyjście # map menu STR_MAP_MENU_MAP_OF_WORLD :Mapa świata -STR_MAP_MENU_EXTRA_VIEW_PORT :Dodatkowy podgląd +STR_MAP_MENU_EXTRA_VIEWPORT :Dodatkowy podgląd STR_MAP_MENU_LINGRAPH_LEGEND :Legenda przepływu towarów STR_MAP_MENU_SIGN_LIST :Lista napisów @@ -1264,7 +1264,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Lokalne władze miasta {TOWN} podpisują umowę z {STRING} na wyłączność usług transportowych! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Podgląd {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Podgląd {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Zmień podgląd STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopiuj pozycję widoku głównego do podglądu STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Zmień widok główny diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -401,7 +401,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Mapa do mundo -STR_MAP_MENU_EXTRA_VIEW_PORT :Visualizador extra +STR_MAP_MENU_EXTRA_VIEWPORT :Visualizador extra STR_MAP_MENU_LINGRAPH_LEGEND :Legenda de fluxo de carga STR_MAP_MENU_SIGN_LIST :Lista de sinais @@ -882,7 +882,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Monopólio de Transporte! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Autoridade local de {TOWN} assina contrato com {STRING} por um ano de direitos exclusivos de transporte! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Visualizador {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Visualizador {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Alterar janela de exibição STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copiar a localização do visualizador global para este visualizador STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Alterar vista principal diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -395,7 +395,7 @@ STR_FILE_MENU_EXIT :Ieşire din joc # map menu STR_MAP_MENU_MAP_OF_WORLD :Harta lumii -STR_MAP_MENU_EXTRA_VIEW_PORT :Ecran suplimentar +STR_MAP_MENU_EXTRA_VIEWPORT :Ecran suplimentar STR_MAP_MENU_LINGRAPH_LEGEND :Legenda flux încărcătură STR_MAP_MENU_SIGN_LIST :Lista de semne @@ -871,7 +871,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Autoritatea locală a oraşului {TOWN} semnează un contract cu {STRING} pentru un an de drepturi exclusive de transport! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Ecran {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Ecran {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Copiază în ecran STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copiază locaţia ecranului principal în acest ecran STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Importă din ecran diff --git a/src/lang/russian.txt b/src/lang/russian.txt --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -528,7 +528,7 @@ STR_FILE_MENU_EXIT :Выход # map menu STR_MAP_MENU_MAP_OF_WORLD :Карта мира -STR_MAP_MENU_EXTRA_VIEW_PORT :Доп. окно просмотра +STR_MAP_MENU_EXTRA_VIEWPORT :Доп. окно просмотра STR_MAP_MENU_LINGRAPH_LEGEND :Легенда грузоперевозок STR_MAP_MENU_SIGN_LIST :Список табличек @@ -1029,7 +1029,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Транспортный монополист! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Администрация г.{NBSP}{TOWN} заключила контракт с компанией «{STRING}», предоставляющий ей эксклюзивные права на транспортные услуги в городе сроком на 1{NBSP}год! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Окно просмотра {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Окно просмотра {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Из основного окна STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Показать то, что отображается в основном окне STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}В основное окно diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -583,7 +583,7 @@ STR_FILE_MENU_EXIT :Izađi # map menu STR_MAP_MENU_MAP_OF_WORLD :Karta sveta -STR_MAP_MENU_EXTRA_VIEW_PORT :Dodatno gledište +STR_MAP_MENU_EXTRA_VIEWPORT :Dodatno gledište STR_MAP_MENU_LINGRAPH_LEGEND :Legenda protoka tereta STR_MAP_MENU_SIGN_LIST :Lista Znakova @@ -1068,7 +1068,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Prevoznički monopol! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Vlasti grada {TOWN} su potpisale ugovor sa preduzećem {STRING} o ekskluzivnom pravu prevoza na godinu dana! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Pogled{COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Pogled{COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK} Kopiraj u prozor za pogled STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Premešta pogled na trenutnu poziciju glavnog pogleda STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Promenite glavni prikaz diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -402,7 +402,7 @@ STR_FILE_MENU_EXIT :退出 # map menu STR_MAP_MENU_MAP_OF_WORLD :缩略地图 -STR_MAP_MENU_EXTRA_VIEW_PORT :额外视点 +STR_MAP_MENU_EXTRA_VIEWPORT :额外视点 STR_MAP_MENU_LINGRAPH_LEGEND :客货流图标 STR_MAP_MENU_SIGN_LIST :标志列表 @@ -884,7 +884,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}垄断运输! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}{TOWN}一年期的运输专营权已经被{STRING}购买! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}视点 {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}视点 {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}将主视角复制到视点 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}将额外视点移动到屏幕中心的位置 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}移动主视角到该视点 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -459,7 +459,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Mapa sveta -STR_MAP_MENU_EXTRA_VIEW_PORT :Ďalší pohľad +STR_MAP_MENU_EXTRA_VIEWPORT :Ďalší pohľad STR_MAP_MENU_LINGRAPH_LEGEND :Legenka k smerovaniu nákladu STR_MAP_MENU_SIGN_LIST :Zoznam popisov @@ -937,7 +937,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Prepravné monopoly! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Miestna samospráva mesta {TOWN} podpísala exkluzívnu zmluvu na prepravu so spoločnosťou {STRING} na 1 rok !!! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Pohľad {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Pohľad {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Pohľad podľa mapy STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Nastaviť pohľad podľa hlavného pohľadu STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Mapa podľa pohľadu diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -548,7 +548,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Zemljevid sveta -STR_MAP_MENU_EXTRA_VIEW_PORT :Dodaten pogled +STR_MAP_MENU_EXTRA_VIEWPORT :Dodaten pogled STR_MAP_MENU_LINGRAPH_LEGEND :Legenda pretoka tovora STR_MAP_MENU_SIGN_LIST :Seznam napisov @@ -1023,7 +1023,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Lokalna oblast kraja {TOWN} je podpisala pogodbo s/z {STRING} o eno letni izključni pravici za transport. # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Pogled {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Pogled {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Kopiraj na pogled STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopiraj lokacijo splošnega pogleda v ta pogled STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Prilepi iz pogleda diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -403,7 +403,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Mapa del mundo -STR_MAP_MENU_EXTRA_VIEW_PORT :Punto de vista extra +STR_MAP_MENU_EXTRA_VIEWPORT :Punto de vista extra STR_MAP_MENU_LINGRAPH_LEGEND :Leyenda de Movimientos de Carga STR_MAP_MENU_SIGN_LIST :Lista de carteles @@ -884,7 +884,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}¡Monopolio de transportes! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}¡La autoridad local de {TOWN} firma un contrato de exclusividad con {STRING} por un año! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Vista {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Vista {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Cambiar punto de vista STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copia la localización de la vista principal a este punto de vista STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Cambiar vista principal diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -403,7 +403,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Minimapa completo -STR_MAP_MENU_EXTRA_VIEW_PORT :Ventana de vista adicional +STR_MAP_MENU_EXTRA_VIEWPORT :Ventana de vista adicional STR_MAP_MENU_LINGRAPH_LEGEND :Leyenda de flujo de cargamento STR_MAP_MENU_SIGN_LIST :Lista de carteles @@ -885,7 +885,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}¡Monopolio de transportes! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}¡Ayuntamiento de {TOWN} firma contrato de exclusividad con {STRING} por un año! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Vista {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Vista {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Cambiar ventana de vista STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copiar la vista principal a esta ventana de vista STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Cambiar vista principal diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -402,7 +402,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Världskarta -STR_MAP_MENU_EXTRA_VIEW_PORT :Nytt vyfönster +STR_MAP_MENU_EXTRA_VIEWPORT :Nytt vyfönster STR_MAP_MENU_LINGRAPH_LEGEND :Legend för Godsflöden STR_MAP_MENU_SIGN_LIST :Skyltlista @@ -884,7 +884,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}De lokala myndigheterna i {TOWN} skriver kontrakt med {STRING} för ett års exklusiva transporträttigheter! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Vyfönster {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Vyfönster {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Byt vy STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopiera huvudvyns position till detta vyfönster STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Byt huvudvy diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -393,7 +393,7 @@ STR_FILE_MENU_EXIT :வெளியேறு # map menu STR_MAP_MENU_MAP_OF_WORLD :உலகப் படம் -STR_MAP_MENU_EXTRA_VIEW_PORT :கூடுதல் பார்வைபடம் +STR_MAP_MENU_EXTRA_VIEWPORT :கூடுதல் பார்வைபடம் STR_MAP_MENU_LINGRAPH_LEGEND :சரக்கு செல்லும் வழிப் படம் STR_MAP_MENU_SIGN_LIST :குறிகளின் பட்டியல் @@ -848,7 +848,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}போக்குவரத்து தனியுரிமை! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}{TOWN} நகராட்சியின் முழு போக்குவரத்து உரிமைகளையும் ஒரு வருடத்திற்கு {STRING} வாங்கியுள்ளது! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}பார்வைப் படம் {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}பார்வைப் படம் {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}பார்படத்திற்கு மாற்றவும் STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}பிரதான பார்வையை மாற்றவும் diff --git a/src/lang/thai.txt b/src/lang/thai.txt --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -387,7 +387,7 @@ STR_FILE_MENU_EXIT :ออกจากเกม # map menu STR_MAP_MENU_MAP_OF_WORLD :แผนที่โลก -STR_MAP_MENU_EXTRA_VIEW_PORT :มุมมองเพิ่มเติม +STR_MAP_MENU_EXTRA_VIEWPORT :มุมมองเพิ่มเติม STR_MAP_MENU_LINGRAPH_LEGEND :เส้นทางการกระจายสินค้า STR_MAP_MENU_SIGN_LIST :รายการป้าย @@ -860,7 +860,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}เจ้าพ่อวงการขนส่ง! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}ฝ่ายบริหารของเมือง {TOWN} ลงนามสัญญากับ {STRING} เป็นะระยเวลา 1 ปีสำหรับสัมปทานขนส่งพิเศษ # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}มุมมอง {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}มุมมอง {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}คัดลอกไปยังมุมมอง STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}คัดลอกตำแหน่งของมุมมองหลังมายังมุมมองนี้ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}วางจากมุมมอง diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -395,7 +395,7 @@ STR_FILE_MENU_EXIT :離開 # map menu STR_MAP_MENU_MAP_OF_WORLD :世界地圖 -STR_MAP_MENU_EXTRA_VIEW_PORT :打開新視野 +STR_MAP_MENU_EXTRA_VIEWPORT :打開新視野 STR_MAP_MENU_LINGRAPH_LEGEND :貨物流程索引 STR_MAP_MENU_SIGN_LIST :標誌清單 @@ -871,7 +871,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}運輸大亨! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}{TOWN} 的地方政府與 {STRING} 簽訂了一年的專屬運輸權合約！ # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}視野 {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}視野 {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}複製至本視野 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}將主視野的位置複製到此視窗 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}貼上至主視野 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -398,7 +398,7 @@ STR_FILE_MENU_EXIT :Çıkış # map menu STR_MAP_MENU_MAP_OF_WORLD :Dünya haritası -STR_MAP_MENU_EXTRA_VIEW_PORT :Ek görünüm +STR_MAP_MENU_EXTRA_VIEWPORT :Ek görünüm STR_MAP_MENU_LINGRAPH_LEGEND :Kargo Akış Göstergesi STR_MAP_MENU_SIGN_LIST :Tabela listesi @@ -879,7 +879,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Taşımacılıkta tekel! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}{TOWN} şehri yetkilileri {STRING} ile bir yıllığına şehrin tüm taşımacılık haklarını vermek üzere anlaştı! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Görünüm {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Görünüm {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Görüş alanını değiştir STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Ana görünümü bu pencereye kopyala STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Ana görünümü değiştir diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -527,7 +527,7 @@ STR_FILE_MENU_EXIT :Вихід # map menu STR_MAP_MENU_MAP_OF_WORLD :Карта світу -STR_MAP_MENU_EXTRA_VIEW_PORT :Додаткове вікно +STR_MAP_MENU_EXTRA_VIEWPORT :Додаткове вікно STR_MAP_MENU_LINGRAPH_LEGEND :Легенда вантажопотоку STR_MAP_MENU_SIGN_LIST :Список позначок @@ -1011,7 +1011,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Транспортна монополія! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Адміністрація м. {TOWN} підписала угоду з "{STRING}" щодо ексклюзивних транспортних прав строком на один рік! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Вікно {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Вікно {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Змінити вікно STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Копіювати місцеположення з основного екрану до цього вікна STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Вставити в головне вікно diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -395,7 +395,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Wrâldkaart -STR_MAP_MENU_EXTRA_VIEW_PORT :Ekstra finster +STR_MAP_MENU_EXTRA_VIEWPORT :Ekstra finster STR_MAP_MENU_LINGRAPH_LEGEND :Frachtstreamleginda STR_MAP_MENU_SIGN_LIST :Buordsjeslist @@ -869,7 +869,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Gemeente fan {TOWN} tekent in kontrakt mei {STRING} foar in jier lang eksklusive ferfiersrjochen! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Loaitsfinster {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Loaitsfinster {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Kopiearje nei loaitsfinster STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Kopiearje de lokaasje fan it haadfinster nei dit loaitsfinster STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Plak fanút loaitsfinster diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -372,7 +372,7 @@ STR_FILE_MENU_EXIT :Излез # map menu STR_MAP_MENU_MAP_OF_WORLD :Мапа на светот -STR_MAP_MENU_EXTRA_VIEW_PORT :екстра прозорец +STR_MAP_MENU_EXTRA_VIEWPORT :екстра прозорец STR_MAP_MENU_SIGN_LIST :Си листа ############ range for town menu starts diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -384,7 +384,7 @@ STR_FILE_MENU_EXIT :خروج # map menu STR_MAP_MENU_MAP_OF_WORLD :نقشه ی دنیا -STR_MAP_MENU_EXTRA_VIEW_PORT :نمای اضافه +STR_MAP_MENU_EXTRA_VIEWPORT :نمای اضافه STR_MAP_MENU_LINGRAPH_LEGEND :میزان حمل بار STR_MAP_MENU_SIGN_LIST :لیست نشانه @@ -858,7 +858,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}حمل و نقل انحصاری! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}مقامات محلی {TOWN} قرارداد حمل و نقل انحصاری را با {STRING} به مدت یکسال امضاء کردند! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}نمای اضافه {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}نمای اضافه {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK} به نمای اضافه منتقل کن STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}موقعیت نمای اصلی را به این نمای اضافه منتقل کن STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}موقعیت نمای اضافه را به نمای اصلی منتقل کن diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -380,7 +380,7 @@ STR_FILE_MENU_EXIT :باہر نکلو # map menu STR_MAP_MENU_MAP_OF_WORLD :دنیا کا نقشھ -STR_MAP_MENU_EXTRA_VIEW_PORT :اضافی منظر +STR_MAP_MENU_EXTRA_VIEWPORT :اضافی منظر STR_MAP_MENU_SIGN_LIST :اشاروں کی فھرست ############ range for town menu starts @@ -838,7 +838,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE :{BIG_FONT}{BLACK}خدمات پر{STRING} کو امداد دے دی گئی!{}{}{STRING} {STRING} سے {STRING} تک دی جانے والی خدمات پر اگلے سال چار گُنا پیسے ملیں گے STR_NEWS_ROAD_REBUILDING :{BIG_FONT}{BLACK}{TOWN} میں ٹریفک کا بُرا حال!{}{}سڑکیں دوبارہ بنوانے کے پیسے {STRING} نے دئیے۔ اس کی وجہ سے اگلے 6 ماہ مشکل رہے گی # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}دہکھنے والی کھڑکی {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}دہکھنے والی کھڑکی {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}دہکھنے والی کھڑکی کی نقل STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}بنیادی منظر میں نظر آنے والی جگہ کو دیکھنے والی کھڑکی میں نقل کریں STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}دہکھنے والی کھڑکی سے نقل کریں diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -402,7 +402,7 @@ STR_FILE_MENU_EXIT :Thoát # map menu STR_MAP_MENU_MAP_OF_WORLD :Bản đồ thế giới -STR_MAP_MENU_EXTRA_VIEW_PORT :Cửa sổ bổ sung +STR_MAP_MENU_EXTRA_VIEWPORT :Cửa sổ bổ sung STR_MAP_MENU_LINGRAPH_LEGEND :Ghi chú luồng hàng hóa STR_MAP_MENU_SIGN_LIST :Danh sách biển hiệu @@ -883,7 +883,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE :{BIG_FONT}{BLACK}Độc quyền vận tải! STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Chính quyền địa phương {TOWN} ký hợp đồng với {STRING} cho phép độc quyền vận tải trong vòng 1 năm! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Cửa sổ {COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Cửa sổ {COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Đổi khung nhìn STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Nhìn vị trí này ở cửa sổ lớn chính STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Chuyển về cửa sổ chính diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -395,7 +395,7 @@ STR_FILE_MENU_EXIT # map menu STR_MAP_MENU_MAP_OF_WORLD :Map o'r Byd -STR_MAP_MENU_EXTRA_VIEW_PORT :Ffenestr Olygfa Newydd +STR_MAP_MENU_EXTRA_VIEWPORT :Ffenestr Olygfa Newydd STR_MAP_MENU_LINGRAPH_LEGEND :Allwedd Llif Cargo STR_MAP_MENU_SIGN_LIST :Rhestr Arwyddion @@ -870,7 +870,7 @@ STR_NEWS_EXCLUSIVE_RIGHTS_TITLE STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION :{BIG_FONT}{BLACK}Awdurdog lleol {TOWN} yn arwyddo cytundeb cyfyngol gyda {STRING} am flwyddyn o hawliau cludiant! # Extra view window -STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Ffenestr Olygfa{COMMA} +STR_EXTRA_VIEWPORT_TITLE :{WHITE}Ffenestr Olygfa{COMMA} STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Copïo i Ffenestr Olygfa STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copïo lleoliad y golwg byd-eang i'r ffenestr olygfa STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Gludo o'r Ffenestr Olygfa diff --git a/src/main_gui.cpp b/src/main_gui.cpp --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -135,7 +135,7 @@ void ShowNetworkGiveMoneyWindow(CompanyI */ bool DoZoomInOutWindow(ZoomStateChange how, Window *w) { - ViewPort *vp; + Viewport *vp; assert(w != nullptr); vp = w->viewport; @@ -185,7 +185,7 @@ void ZoomInOrOutToCursorWindow(bool in, assert(w != nullptr); if (_game_mode != GM_MENU) { - ViewPort *vp = w->viewport; + Viewport *vp = w->viewport; if ((in && vp->zoom <= _settings_client.gui.zoom_min) || (!in && vp->zoom >= _settings_client.gui.zoom_max)) return; Point pt = GetTileZoomCenterWindow(in, w); @@ -201,7 +201,7 @@ void FixTitleGameZoom() { if (_game_mode != GM_MENU) return; - ViewPort *vp = FindWindowByClass(WC_MAIN_WINDOW)->viewport; + Viewport *vp = FindWindowByClass(WC_MAIN_WINDOW)->viewport; vp->zoom = _gui_zoom; vp->virtual_width = ScaleByZoom(vp->width, vp->zoom); vp->virtual_height = ScaleByZoom(vp->height, vp->zoom); diff --git a/src/news_gui.cpp b/src/news_gui.cpp --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -507,8 +507,8 @@ struct NewsWindow : Window { TileIndex tile1 = GetReferenceTile(this->ni->reftype1, this->ni->ref1); TileIndex tile2 = GetReferenceTile(this->ni->reftype2, this->ni->ref2); if (_ctrl_pressed) { - if (tile1 != INVALID_TILE) ShowExtraViewPortWindow(tile1); - if (tile2 != INVALID_TILE) ShowExtraViewPortWindow(tile2); + if (tile1 != INVALID_TILE) ShowExtraViewportWindow(tile1); + if (tile2 != INVALID_TILE) ShowExtraViewportWindow(tile2); } else { if ((tile1 == INVALID_TILE || !ScrollMainWindowToTile(tile1)) && tile2 != INVALID_TILE) { ScrollMainWindowToTile(tile2); diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp --- a/src/saveload/misc_sl.cpp +++ b/src/saveload/misc_sl.cpp @@ -50,7 +50,7 @@ void ResetViewportAfterLoadGame() w->viewport->dest_scrollpos_x = _saved_scrollpos_x; w->viewport->dest_scrollpos_y = _saved_scrollpos_y; - ViewPort *vp = w->viewport; + Viewport *vp = w->viewport; vp->zoom = (ZoomLevel)min(_saved_scrollpos_zoom, ZOOM_LVL_MAX); vp->virtual_width = ScaleByZoom(vp->width, vp->zoom); vp->virtual_height = ScaleByZoom(vp->height, vp->zoom); diff --git a/src/screenshot.cpp b/src/screenshot.cpp --- a/src/screenshot.cpp +++ b/src/screenshot.cpp @@ -612,7 +612,7 @@ static void CurrentScreenCallback(void * */ static void LargeWorldCallback(void *userdata, void *buf, uint y, uint pitch, uint n) { - ViewPort *vp = (ViewPort *)userdata; + Viewport *vp = (Viewport *)userdata; DrawPixelInfo dpi, *old_dpi; int wx, left; @@ -707,11 +707,11 @@ static bool MakeSmallScreenshot(bool cra } /** - * Configure a ViewPort for rendering (a part of) the map into a screenshot. + * Configure a Viewport for rendering (a part of) the map into a screenshot. * @param t Screenshot type * @param[out] vp Result viewport */ -void SetupScreenshotViewport(ScreenshotType t, ViewPort *vp) +void SetupScreenshotViewport(ScreenshotType t, Viewport *vp) { switch(t) { case SC_VIEWPORT: @@ -782,7 +782,7 @@ void SetupScreenshotViewport(ScreenshotT */ static bool MakeLargeWorldScreenshot(ScreenshotType t) { - ViewPort vp; + Viewport vp; SetupScreenshotViewport(t, &vp); const ScreenshotFormat *sf = _screenshot_formats + _cur_screenshot_format; @@ -852,7 +852,7 @@ static void ScreenshotConfirmationCallba */ void MakeScreenshotWithConfirm(ScreenshotType t) { - ViewPort vp; + Viewport vp; SetupScreenshotViewport(t, &vp); bool heightmap_or_minimap = t == SC_HEIGHTMAP || t == SC_MINIMAP; diff --git a/src/screenshot.h b/src/screenshot.h --- a/src/screenshot.h +++ b/src/screenshot.h @@ -25,7 +25,7 @@ enum ScreenshotType { SC_MINIMAP, ///< Minimap screenshot. }; -void SetupScreenshotViewport(ScreenshotType t, struct ViewPort *vp); +void SetupScreenshotViewport(ScreenshotType t, struct Viewport *vp); bool MakeHeightmapScreenshot(const char *filename); void MakeScreenshotWithConfirm(ScreenshotType t); bool MakeScreenshot(ScreenshotType t, const char *name); diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -931,7 +931,7 @@ void SmallMapWindow::DrawTowns(const Dra void SmallMapWindow::DrawMapIndicators() const { /* Find main viewport. */ - const ViewPort *vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport; + const Viewport *vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport; Point upper_left_smallmap_coord = InverseRemapCoords2(vp->virtual_left, vp->virtual_top); Point lower_right_smallmap_coord = InverseRemapCoords2(vp->virtual_left + vp->virtual_width - 1, vp->virtual_top + vp->virtual_height - 1); @@ -1646,7 +1646,7 @@ void SmallMapWindow::SetNewScroll(int sx */ void SmallMapWindow::SmallMapCenterOnCurrentPos() { - const ViewPort *vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport; + const Viewport *vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport; Point viewport_center = InverseRemapCoords2(vp->virtual_left + vp->virtual_width / 2, vp->virtual_top + vp->virtual_height / 2); int sub; diff --git a/src/sound.cpp b/src/sound.cpp --- a/src/sound.cpp +++ b/src/sound.cpp @@ -240,7 +240,7 @@ static void SndPlayScreenCoordFx(SoundID const Window *w; FOR_ALL_WINDOWS_FROM_BACK(w) { - const ViewPort *vp = w->viewport; + const Viewport *vp = w->viewport; if (vp != nullptr && left < vp->virtual_left + vp->virtual_width && right > vp->virtual_left && diff --git a/src/station_gui.cpp b/src/station_gui.cpp --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -537,7 +537,7 @@ public: assert(st->owner == (Owner)this->window_number || st->owner == OWNER_NONE); if (_ctrl_pressed) { - ShowExtraViewPortWindow(st->xy); + ShowExtraViewportWindow(st->xy); } else { ScrollMainWindowToTile(st->xy); } @@ -1919,7 +1919,7 @@ struct StationViewWindow : public Window case WID_SV_LOCATION: if (_ctrl_pressed) { - ShowExtraViewPortWindow(Station::Get(this->window_number)->xy); + ShowExtraViewportWindow(Station::Get(this->window_number)->xy); } else { ScrollMainWindowToTile(Station::Get(this->window_number)->xy); } diff --git a/src/story_gui.cpp b/src/story_gui.cpp --- a/src/story_gui.cpp +++ b/src/story_gui.cpp @@ -550,7 +550,7 @@ protected: case SPET_LOCATION: if (_ctrl_pressed) { - ShowExtraViewPortWindow((TileIndex)pe.referenced_id); + ShowExtraViewportWindow((TileIndex)pe.referenced_id); } else { ScrollMainWindowToTile((TileIndex)pe.referenced_id); } diff --git a/src/subsidy_gui.cpp b/src/subsidy_gui.cpp --- a/src/subsidy_gui.cpp +++ b/src/subsidy_gui.cpp @@ -83,7 +83,7 @@ struct SubsidyListWindow : Window { } if (_ctrl_pressed || !ScrollMainWindowToTile(xy)) { - if (_ctrl_pressed) ShowExtraViewPortWindow(xy); + if (_ctrl_pressed) ShowExtraViewportWindow(xy); /* otherwise determine dst coordinate for subsidy and scroll to it */ switch (s->dst_type) { @@ -93,7 +93,7 @@ struct SubsidyListWindow : Window { } if (_ctrl_pressed) { - ShowExtraViewPortWindow(xy); + ShowExtraViewportWindow(xy); } else { ScrollMainWindowToTile(xy); } diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -464,7 +464,7 @@ static CallBackFunction ToolbarMapClick( { DropDownList list; list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_MAP_OF_WORLD, MME_SHOW_SMALLMAP, false)); - list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_EXTRA_VIEW_PORT, MME_SHOW_EXTRAVIEWPORTS, false)); + list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_EXTRA_VIEWPORT, MME_SHOW_EXTRAVIEWPORTS, false)); list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_LINGRAPH_LEGEND, MME_SHOW_LINKGRAPH, false)); list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_SIGN_LIST, MME_SHOW_SIGNLISTS, false)); PopupMainToolbMenu(w, WID_TN_SMALL_MAP, std::move(list), 0); @@ -475,7 +475,7 @@ static CallBackFunction ToolbarScenMapTo { DropDownList list; list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_MAP_OF_WORLD, MME_SHOW_SMALLMAP, false)); - list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_EXTRA_VIEW_PORT, MME_SHOW_EXTRAVIEWPORTS, false)); + list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_EXTRA_VIEWPORT, MME_SHOW_EXTRAVIEWPORTS, false)); list.emplace_back(new DropDownListStringItem(STR_MAP_MENU_SIGN_LIST, MME_SHOW_SIGNLISTS, false)); list.emplace_back(new DropDownListStringItem(STR_TOWN_MENU_TOWN_DIRECTORY, MME_SHOW_TOWNDIRECTORY, false)); list.emplace_back(new DropDownListStringItem(STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY, MME_SHOW_INDUSTRYDIRECTORY, false)); @@ -492,12 +492,12 @@ static CallBackFunction ToolbarScenMapTo static CallBackFunction MenuClickMap(int index) { switch (index) { - case MME_SHOW_SMALLMAP: ShowSmallMap(); break; - case MME_SHOW_EXTRAVIEWPORTS: ShowExtraViewPortWindow(); break; - case MME_SHOW_LINKGRAPH: ShowLinkGraphLegend(); break; - case MME_SHOW_SIGNLISTS: ShowSignList(); break; - case MME_SHOW_TOWNDIRECTORY: ShowTownDirectory(); break; - case MME_SHOW_INDUSTRYDIRECTORY: ShowIndustryDirectory(); break; + case MME_SHOW_SMALLMAP: ShowSmallMap(); break; + case MME_SHOW_EXTRAVIEWPORTS: ShowExtraViewportWindow(); break; + case MME_SHOW_LINKGRAPH: ShowLinkGraphLegend(); break; + case MME_SHOW_SIGNLISTS: ShowSignList(); break; + case MME_SHOW_TOWNDIRECTORY: ShowTownDirectory(); break; + case MME_SHOW_INDUSTRYDIRECTORY: ShowIndustryDirectory(); break; } return CBF_NONE; } @@ -2092,7 +2092,7 @@ struct MainToolbarWindow : Window { case MTHK_GIANT_SCREENSHOT: MakeScreenshotWithConfirm(SC_WORLD); break; case MTHK_CHEATS: if (!_networking) ShowCheatWindow(); break; case MTHK_TERRAFORM: ShowTerraformToolbar(); break; - case MTHK_EXTRA_VIEWPORT: ShowExtraViewPortWindowForTileUnderCursor(); break; + case MTHK_EXTRA_VIEWPORT: ShowExtraViewportWindowForTileUnderCursor(); break; case MTHK_CLIENT_LIST: if (_networking) ShowClientList(); break; case MTHK_SIGN_LIST: ShowSignList(); break; case MTHK_LANDINFO: cbf = PlaceLandBlockInfo(); break; @@ -2469,7 +2469,7 @@ struct ScenarioEditorToolbarWindow : Win case MTEHK_ZOOM_OUT: ToolbarZoomOutClick(this); break; case MTEHK_TERRAFORM: ShowEditorTerraformToolbar(); break; case MTEHK_SMALLMAP: ShowSmallMap(); break; - case MTEHK_EXTRA_VIEWPORT: ShowExtraViewPortWindowForTileUnderCursor(); break; + case MTEHK_EXTRA_VIEWPORT: ShowExtraViewportWindowForTileUnderCursor(); break; default: return ES_NOT_HANDLED; } if (cbf != CBF_NONE) _last_started_action = cbf; diff --git a/src/town_gui.cpp b/src/town_gui.cpp --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -445,7 +445,7 @@ public: switch (widget) { case WID_TV_CENTER_VIEW: // scroll to location if (_ctrl_pressed) { - ShowExtraViewPortWindow(this->town->xy); + ShowExtraViewportWindow(this->town->xy); } else { ScrollMainWindowToTile(this->town->xy); } @@ -913,7 +913,7 @@ public: const Town *t = this->towns[id_v]; assert(t != nullptr); if (_ctrl_pressed) { - ShowExtraViewPortWindow(t->xy); + ShowExtraViewportWindow(t->xy); } else { ScrollMainWindowToTile(t->xy); } diff --git a/src/vehicle.cpp b/src/vehicle.cpp --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1162,7 +1162,7 @@ void ViewportAddVehicles(DrawPixelInfo * * @param y Y coordinate in the viewport. * @return Closest vehicle, or \c nullptr if none found. */ -Vehicle *CheckClickOnVehicle(const ViewPort *vp, int x, int y) +Vehicle *CheckClickOnVehicle(const Viewport *vp, int x, int y) { Vehicle *found = nullptr; uint dist, best_dist = UINT_MAX; diff --git a/src/vehicle_gui.h b/src/vehicle_gui.h --- a/src/vehicle_gui.h +++ b/src/vehicle_gui.h @@ -104,7 +104,7 @@ void ShowVehicleViewWindow(const Vehicle bool VehicleClicked(const Vehicle *v); void StartStopVehicle(const Vehicle *v, bool texteffect); -Vehicle *CheckClickOnVehicle(const struct ViewPort *vp, int x, int y); +Vehicle *CheckClickOnVehicle(const struct Viewport *vp, int x, int y); void DrawVehicleImage(const Vehicle *v, int left, int right, int y, VehicleID selection, EngineImageType image_type, int skip); void SetMouseCursorVehicle(const Vehicle *v, EngineImageType image_type); diff --git a/src/viewport.cpp b/src/viewport.cpp --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -177,7 +177,7 @@ struct ViewportDrawer { Point foundation_offset[FOUNDATION_PART_END]; ///< Pixel offset for ground sprites on the foundations. }; -static void MarkViewportDirty(const ViewPort *vp, int left, int top, int right, int bottom); +static void MarkViewportDirty(const Viewport *vp, int left, int top, int right, int bottom); static ViewportDrawer _vd; @@ -188,7 +188,7 @@ bool _draw_dirty_blocks = false; uint _dirty_block_colour = 0; static VpSpriteSorter _vp_sprite_sorter = nullptr; -static Point MapXYZToViewport(const ViewPort *vp, int x, int y, int z) +static Point MapXYZToViewport(const Viewport *vp, int x, int y, int z) { Point p = RemapCoords(x, y, z); p.x -= vp->virtual_width / 2; @@ -331,7 +331,7 @@ static void DoSetViewportPosition(const static void SetViewportPosition(Window *w, int x, int y) { - ViewPort *vp = w->viewport; + Viewport *vp = w->viewport; int old_left = vp->virtual_left; int old_top = vp->virtual_top; int i; @@ -390,9 +390,9 @@ static void SetViewportPosition(Window * * @return Pointer to the viewport if the xy position is in the viewport of the window, * otherwise \c nullptr is returned. */ -ViewPort *IsPtInWindowViewport(const Window *w, int x, int y) +Viewport *IsPtInWindowViewport(const Window *w, int x, int y) { - ViewPort *vp = w->viewport; + Viewport *vp = w->viewport; if (vp != nullptr && IsInsideMM(x, vp->left, vp->left + vp->width) && @@ -414,7 +414,7 @@ ViewPort *IsPtInWindowViewport(const Win * @param clamp_to_map Clamp the coordinate outside of the map to the closest, non-void tile within the map * @return Tile coordinate or (-1, -1) if given x or y is not within viewport frame */ -Point TranslateXYToTileCoord(const ViewPort *vp, int x, int y, bool clamp_to_map) +Point TranslateXYToTileCoord(const Viewport *vp, int x, int y, bool clamp_to_map) { if (!IsInsideBS(x, vp->left, vp->width) || !IsInsideBS(y, vp->top, vp->height)) { Point pt = { -1, -1 }; @@ -432,7 +432,7 @@ Point TranslateXYToTileCoord(const ViewP static Point GetTileFromScreenXY(int x, int y, int zoom_x, int zoom_y) { Window *w; - ViewPort *vp; + Viewport *vp; Point pt; if ( (w = FindWindowFromPt(x, y)) != nullptr && @@ -452,7 +452,7 @@ Point GetTileBelowCursor() Point GetTileZoomCenterWindow(bool in, Window * w) { int x, y; - ViewPort *vp = w->viewport; + Viewport *vp = w->viewport; if (in) { x = ((_cursor.pos.x - vp->left) >> 1) + (vp->width >> 2); @@ -473,7 +473,7 @@ Point GetTileZoomCenterWindow(bool in, W * @param widget_zoom_in widget index for window with zoom-in button * @param widget_zoom_out widget index for window with zoom-out button */ -void HandleZoomMessage(Window *w, const ViewPort *vp, byte widget_zoom_in, byte widget_zoom_out) +void HandleZoomMessage(Window *w, const Viewport *vp, byte widget_zoom_in, byte widget_zoom_out) { w->SetWidgetDisabledState(widget_zoom_in, vp->zoom <= _settings_client.gui.zoom_min); w->SetWidgetDirty(widget_zoom_in); @@ -1480,7 +1480,7 @@ void ViewportSign::MarkDirty(ZoomLevel m Window *w; FOR_ALL_WINDOWS_FROM_BACK(w) { - ViewPort *vp = w->viewport; + Viewport *vp = w->viewport; if (vp != nullptr && vp->zoom <= maxzoom) { assert(vp->width != 0); Rect &zl = zoomlevels[vp->zoom]; @@ -1651,7 +1651,7 @@ static void ViewportDrawStrings(ZoomLeve } } -void ViewportDoDraw(const ViewPort *vp, int left, int top, int right, int bottom) +void ViewportDoDraw(const Viewport *vp, int left, int top, int right, int bottom) { DrawPixelInfo *old_dpi = _cur_dpi; _cur_dpi = &_vd.dpi; @@ -1726,7 +1726,7 @@ void ViewportDoDraw(const ViewPort *vp, * Make sure we don't draw a too big area at a time. * If we do, the sprite memory will overflow. */ -static void ViewportDrawChk(const ViewPort *vp, int left, int top, int right, int bottom) +static void ViewportDrawChk(const Viewport *vp, int left, int top, int right, int bottom) { if ((int64)ScaleByZoom(bottom - top, vp->zoom) * (int64)ScaleByZoom(right - left, vp->zoom) > (int64)(180000 * ZOOM_LVL_BASE * ZOOM_LVL_BASE)) { if ((bottom - top) > (right - left)) { @@ -1748,7 +1748,7 @@ static void ViewportDrawChk(const ViewPo } } -static inline void ViewportDraw(const ViewPort *vp, int left, int top, int right, int bottom) +static inline void ViewportDraw(const Viewport *vp, int left, int top, int right, int bottom) { if (right <= vp->left || bottom <= vp->top) return; @@ -1793,7 +1793,7 @@ void Window::DrawViewport() const * @param[in,out] scroll_x Viewport X scroll. * @param[in,out] scroll_y Viewport Y scroll. */ -static inline void ClampViewportToMap(const ViewPort *vp, int *scroll_x, int *scroll_y) +static inline void ClampViewportToMap(const Viewport *vp, int *scroll_x, int *scroll_y) { /* Centre of the viewport is hot spot. */ Point pt = { @@ -1819,7 +1819,7 @@ static inline void ClampViewportToMap(co */ void UpdateViewportPosition(Window *w) { - const ViewPort *vp = w->viewport; + const Viewport *vp = w->viewport; if (w->viewport->follow_vehicle != INVALID_VEHICLE) { const Vehicle *veh = Vehicle::Get(w->viewport->follow_vehicle); @@ -1866,7 +1866,7 @@ void UpdateViewportPosition(Window *w) * @param bottom Bottom edge of area to repaint * @ingroup dirty */ -static void MarkViewportDirty(const ViewPort *vp, int left, int top, int right, int bottom) +static void MarkViewportDirty(const Viewport *vp, int left, int top, int right, int bottom) { /* Rounding wrt. zoom-out level */ right += (1 << vp->zoom) - 1; @@ -1906,7 +1906,7 @@ void MarkAllViewportsDirty(int left, int { Window *w; FOR_ALL_WINDOWS_FROM_BACK(w) { - ViewPort *vp = w->viewport; + Viewport *vp = w->viewport; if (vp != nullptr) { assert(vp->width != 0); MarkViewportDirty(vp, left, top, right, bottom); @@ -2077,7 +2077,7 @@ void SetSelectionRed(bool b) * @param sign the sign to check * @return true if the sign was hit */ -static bool CheckClickOnViewportSign(const ViewPort *vp, int x, int y, const ViewportSign *sign) +static bool CheckClickOnViewportSign(const Viewport *vp, int x, int y, const ViewportSign *sign) { bool small = (vp->zoom >= ZOOM_LVL_OUT_16X); int sign_half_width = ScaleByZoom((small ? sign->width_small : sign->width_normal) / 2, vp->zoom); @@ -2095,7 +2095,7 @@ static bool CheckClickOnViewportSign(con * @param y Y position of click * @return true if the sign was hit */ -static bool CheckClickOnViewportSign(const ViewPort *vp, int x, int y) +static bool CheckClickOnViewportSign(const Viewport *vp, int x, int y) { if (_game_mode == GM_MENU) return false; @@ -2267,7 +2267,7 @@ void RebuildViewportKdtree() } -static bool CheckClickOnLandscape(const ViewPort *vp, int x, int y) +static bool CheckClickOnLandscape(const Viewport *vp, int x, int y) { Point pt = TranslateXYToTileCoord(vp, x, y); @@ -2296,7 +2296,7 @@ static void PlaceObject() } -bool HandleViewportClicked(const ViewPort *vp, int x, int y) +bool HandleViewportClicked(const Viewport *vp, int x, int y) { const Vehicle *v = CheckClickOnVehicle(vp, x, y); @@ -3355,7 +3355,7 @@ void ResetObjectToPlace() SetObjectToPlace(SPR_CURSOR_MOUSE, PAL_NONE, HT_NONE, WC_MAIN_WINDOW, 0); } -Point GetViewportStationMiddle(const ViewPort *vp, const Station *st) +Point GetViewportStationMiddle(const Viewport *vp, const Station *st) { int x = TileX(st->xy) * TILE_SIZE; int y = TileY(st->xy) * TILE_SIZE; diff --git a/src/viewport_func.h b/src/viewport_func.h --- a/src/viewport_func.h +++ b/src/viewport_func.h @@ -22,8 +22,8 @@ void SetSelectionRed(bool); void DeleteWindowViewport(Window *w); void InitializeWindowViewport(Window *w, int x, int y, int width, int height, uint32 follow_flags, ZoomLevel zoom); -ViewPort *IsPtInWindowViewport(const Window *w, int x, int y); -Point TranslateXYToTileCoord(const ViewPort *vp, int x, int y, bool clamp_to_map = true); +Viewport *IsPtInWindowViewport(const Window *w, int x, int y); +Point TranslateXYToTileCoord(const Viewport *vp, int x, int y, bool clamp_to_map = true); Point GetTileBelowCursor(); void UpdateViewportPosition(Window *w); @@ -33,7 +33,7 @@ bool DoZoomInOutWindow(ZoomStateChange h void ZoomInOrOutToCursorWindow(bool in, Window * w); Point GetTileZoomCenterWindow(bool in, Window * w); void FixTitleGameZoom(); -void HandleZoomMessage(Window *w, const ViewPort *vp, byte widget_zoom_in, byte widget_zoom_out); +void HandleZoomMessage(Window *w, const Viewport *vp, byte widget_zoom_in, byte widget_zoom_out); /** * Zoom a viewport as far as possible in the given direction. @@ -58,12 +58,12 @@ void ViewportAddString(const DrawPixelIn void StartSpriteCombine(); void EndSpriteCombine(); -bool HandleViewportClicked(const ViewPort *vp, int x, int y); +bool HandleViewportClicked(const Viewport *vp, int x, int y); void SetRedErrorSquare(TileIndex tile); void SetTileSelectSize(int w, int h); void SetTileSelectBigSize(int ox, int oy, int sx, int sy); -void ViewportDoDraw(const ViewPort *vp, int left, int top, int right, int bottom); +void ViewportDoDraw(const Viewport *vp, int left, int top, int right, int bottom); bool ScrollWindowToTile(TileIndex tile, Window *w, bool instant = false); bool ScrollWindowTo(int x, int y, int z, Window *w, bool instant = false); @@ -91,7 +91,7 @@ static inline void MarkTileDirtyByTile(T MarkTileDirtyByTile(tile, bridge_level_offset, TileHeight(tile)); } -Point GetViewportStationMiddle(const ViewPort *vp, const Station *st); +Point GetViewportStationMiddle(const Viewport *vp, const Station *st); struct Station; struct Town; diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp --- a/src/viewport_gui.cpp +++ b/src/viewport_gui.cpp @@ -22,11 +22,11 @@ #include "safeguards.h" -/* Extra ViewPort Window Stuff */ -static const NWidgetPart _nested_extra_view_port_widgets[] = { +/* Extra Viewport Window Stuff */ +static const NWidgetPart _nested_extra_viewport_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), - NWidget(WWT_CAPTION, COLOUR_GREY, WID_EV_CAPTION), SetDataTip(STR_EXTRA_VIEW_PORT_TITLE, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_CAPTION, COLOUR_GREY, WID_EV_CAPTION), SetDataTip(STR_EXTRA_VIEWPORT_TITLE, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), @@ -154,25 +154,25 @@ public: } }; -static WindowDesc _extra_view_port_desc( +static WindowDesc _extra_viewport_desc( WDP_AUTO, "extra_viewport", 300, 268, - WC_EXTRA_VIEW_PORT, WC_NONE, + WC_EXTRA_VIEWPORT, WC_NONE, 0, - _nested_extra_view_port_widgets, lengthof(_nested_extra_view_port_widgets) + _nested_extra_viewport_widgets, lengthof(_nested_extra_viewport_widgets) ); /** * Show a new Extra Viewport window. * @param tile Tile to center the view on. INVALID_TILE means to use the center of main viewport. */ -void ShowExtraViewPortWindow(TileIndex tile) +void ShowExtraViewportWindow(TileIndex tile) { int i = 0; /* find next free window number for extra viewport */ - while (FindWindowById(WC_EXTRA_VIEW_PORT, i) != nullptr) i++; + while (FindWindowById(WC_EXTRA_VIEWPORT, i) != nullptr) i++; - new ExtraViewportWindow(&_extra_view_port_desc, i, tile); + new ExtraViewportWindow(&_extra_viewport_desc, i, tile); } /** @@ -180,10 +180,10 @@ void ShowExtraViewPortWindow(TileIndex t * Center it on the tile under the cursor, if the cursor is inside a viewport. * If that fails, center it on main viewport center. */ -void ShowExtraViewPortWindowForTileUnderCursor() +void ShowExtraViewportWindowForTileUnderCursor() { /* Use tile under mouse as center for new viewport. * Do this before creating the window, it might appear just below the mouse. */ Point pt = GetTileBelowCursor(); - ShowExtraViewPortWindow(pt.x != -1 ? TileVirtXY(pt.x, pt.y) : INVALID_TILE); + ShowExtraViewportWindow(pt.x != -1 ? TileVirtXY(pt.x, pt.y) : INVALID_TILE); } diff --git a/src/viewport_type.h b/src/viewport_type.h --- a/src/viewport_type.h +++ b/src/viewport_type.h @@ -19,7 +19,7 @@ class LinkGraphOverlay; /** * Data structure for viewport, display of a part of the world */ -struct ViewPort { +struct Viewport { int left; ///< Screen coordinate left edge of the viewport int top; ///< Screen coordinate top edge of the viewport int width; ///< Screen width of the viewport diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp --- a/src/waypoint_gui.cpp +++ b/src/waypoint_gui.cpp @@ -89,7 +89,7 @@ public: switch (widget) { case WID_W_CENTER_VIEW: // scroll to location if (_ctrl_pressed) { - ShowExtraViewPortWindow(this->GetCenterTile()); + ShowExtraViewportWindow(this->GetCenterTile()); } else { ScrollMainWindowToTile(this->GetCenterTile()); } diff --git a/src/widget.cpp b/src/widget.cpp --- a/src/widget.cpp +++ b/src/widget.cpp @@ -1933,7 +1933,7 @@ void NWidgetViewport::InitializeViewport */ void NWidgetViewport::UpdateViewportCoordinates(Window *w) { - ViewPort *vp = w->viewport; + Viewport *vp = w->viewport; if (vp != nullptr) { vp->left = w->left + this->pos_x; vp->top = w->top + this->pos_y; diff --git a/src/window.cpp b/src/window.cpp --- a/src/window.cpp +++ b/src/window.cpp @@ -2789,7 +2789,7 @@ static void HandleAutoscroll() if (w == nullptr || w->flags & WF_DISABLE_VP_SCROLL) return; if (_settings_client.gui.auto_scrolling != VA_EVERY_VIEWPORT && w->window_class != WC_MAIN_WINDOW) return; - ViewPort *vp = IsPtInWindowViewport(w, x, y); + Viewport *vp = IsPtInWindowViewport(w, x, y); if (vp == nullptr) return; x -= vp->left; @@ -2899,7 +2899,7 @@ static void MouseLoop(MouseClick click, if (w == nullptr) return; if (click != MC_HOVER && !MaybeBringWindowToFront(w)) return; - ViewPort *vp = IsPtInWindowViewport(w, x, y); + Viewport *vp = IsPtInWindowViewport(w, x, y); /* Don't allow any action in a viewport if either in menu or when having a modal progress window */ if (vp != nullptr && (_game_mode == GM_MENU || HasModalProgress())) return; diff --git a/src/window_gui.h b/src/window_gui.h --- a/src/window_gui.h +++ b/src/window_gui.h @@ -253,7 +253,7 @@ static const int WHITE_BORDER_DURATION = * The actual location being shown is #scrollpos_x, #scrollpos_y. * @see InitializeViewport(), UpdateViewportPosition(), UpdateViewportCoordinates(). */ -struct ViewportData : ViewPort { +struct ViewportData : Viewport { VehicleID follow_vehicle; ///< VehicleID to follow if following a vehicle, #INVALID_VEHICLE otherwise. int32 scrollpos_x; ///< Currently shown x coordinate (virtual screen coordinate of topleft corner of the viewport). int32 scrollpos_y; ///< Currently shown y coordinate (virtual screen coordinate of topleft corner of the viewport). diff --git a/src/window_type.h b/src/window_type.h --- a/src/window_type.h +++ b/src/window_type.h @@ -621,7 +621,7 @@ enum WindowClass { * Extra viewport; %Window numbers: * - Ascending value = #ExtraViewportWidgets */ - WC_EXTRA_VIEW_PORT, + WC_EXTRA_VIEWPORT, /**