From b885f626761aadc3943d236e63fff79567d46644 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 26 Jul 2018 19:45:41 +0200 Subject: [PATCH 01/13] Update: Translations from eints croatian: 44 changes by VoyagerOne polish: 6 changes by xaxa --- src/lang/croatian.txt | 44 +++++++++++++++++++++++++++++++++++++++++++ src/lang/polish.txt | 6 ++++++ 2 files changed, 50 insertions(+) diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 0d6a8a44a3..e00ed68af8 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -571,6 +571,7 @@ STR_ABOUT_MENU_SCREENSHOT :Slika zaslona STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Zumirano do kraja na slici zaslona STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT :Standardno zumiranje slike zaslona STR_ABOUT_MENU_GIANT_SCREENSHOT :Slika zaslona cijele karte +STR_ABOUT_MENU_SHOW_FRAMERATE :Prikaži broj sličica u sekundi STR_ABOUT_MENU_ABOUT_OPENTTD :O 'OpenTTD' STR_ABOUT_MENU_SPRITE_ALIGNER :Poravnanje spritea STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Odaberi granične okvire @@ -2794,9 +2795,52 @@ STR_ABOUT_VERSION :{BLACK}OpenTTD STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD tim # Framerate display window +STR_FRAMERATE_CAPTION :{WHITE}Broj sličica +STR_FRAMERATE_CAPTION_SMALL :{STRING}{WHITE} ({DECIMAL}x) +STR_FRAMERATE_RATE_GAMELOOP :{WHITE}Stopa simulacije: {STRING} +STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP :{BLACK}Broj otkucaja igre simuliranih u sekundi. +STR_FRAMERATE_RATE_BLITTER :{WHITE}Broj sličica u sekundi: {STRING} +STR_FRAMERATE_RATE_BLITTER_TOOLTIP :{BLACK}Broj sličica videa prikayanih u sekundi. +STR_FRAMERATE_SPEED_FACTOR :{WHITE}Trenutni faktor brzine igre: {DECIMAL}x +STR_FRAMERATE_SPEED_FACTOR_TOOLTIP :{BLACK}Koliko brzo se igra izvodi trenutno u usporedbi sa očekivanom brzinom u uobičajenoj simulaciji. +STR_FRAMERATE_CURRENT :{WHITE}Trenutno +STR_FRAMERATE_AVERAGE :{WHITE}Prosječno +STR_FRAMERATE_DATA_POINTS :{WHITE}Podaci bazirani na {COMMA} mjerama +STR_FRAMERATE_MS_GOOD :{LTBLUE}{DECIMAL}{WHITE} ms +STR_FRAMERATE_MS_WARN :{YELLOW}{DECIMAL}{WHITE} ms +STR_FRAMERATE_MS_BAD :{RED}{DECIMAL}{WHITE} ms +STR_FRAMERATE_FPS_GOOD :{LTBLUE}{DECIMAL}{WHITE} sličica/s +STR_FRAMERATE_FPS_WARN :{YELLOW}{DECIMAL}{WHITE} sličica/s +STR_FRAMERATE_FPS_BAD :{RED}{DECIMAL}{WHITE} sličica/s +STR_FRAMERATE_GRAPH_MILLISECONDS :{TINY_FONT}{COMMA} ms +STR_FRAMERATE_GRAPH_SECONDS :{TINY_FONT}{COMMA} s ############ Leave those lines in this order!! +STR_FRAMERATE_GAMELOOP :{WHITE}Zbroj petlji igre: +STR_FRAMERATE_GL_ECONOMY :{WHITE} Korištenje tereta: +STR_FRAMERATE_GL_TRAINS :{WHITE} Otkucaji vlakova: +STR_FRAMERATE_GL_ROADVEHS :{WHITE} Otkucaji cestovnih vozila: +STR_FRAMERATE_GL_SHIPS :{WHITE} Otkucaji brodova: +STR_FRAMERATE_GL_AIRCRAFT :{WHITE} Otkucaji aviona: +STR_FRAMERATE_GL_LANDSCAPE :{WHITE} Otkucaji svijeta: +STR_FRAMERATE_GL_LINKGRAPH :Odmak linka grafikona +STR_FRAMERATE_DRAWING :{WHITE}Prikaz grafike: +STR_FRAMERATE_DRAWING_VIEWPORTS :{WHITE} Prikazi svijeta: +STR_FRAMERATE_VIDEO :{WHITE}Video izlaz: +STR_FRAMERATE_SOUND :{WHITE}Miksanje zvukova: ############ End of leave-in-this-order ############ Leave those lines in this order!! +STR_FRAMETIME_CAPTION_GAMELOOP :Petlja igre +STR_FRAMETIME_CAPTION_GL_ECONOMY :Korištenje tereta +STR_FRAMETIME_CAPTION_GL_TRAINS :Otkucaji vlakova +STR_FRAMETIME_CAPTION_GL_ROADVEHS :Otkucaji cestovnih vozila +STR_FRAMETIME_CAPTION_GL_SHIPS :Otkucaji brodova +STR_FRAMETIME_CAPTION_GL_AIRCRAFT :Otkucaji aviona +STR_FRAMETIME_CAPTION_GL_LANDSCAPE :Otkucaji svijeta +STR_FRAMETIME_CAPTION_GL_LINKGRAPH :Odmak linka grafikona +STR_FRAMETIME_CAPTION_DRAWING :Prikaz grafike +STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS :Prikazi svijeta +STR_FRAMETIME_CAPTION_VIDEO :Video izlaz +STR_FRAMETIME_CAPTION_SOUND :Miksanje zvukova ############ End of leave-in-this-order diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 5825519ef3..efeb48dc9e 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -3072,9 +3072,13 @@ STR_ABOUT_VERSION :{BLACK}OpenTTD STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2018 Zespół OpenTTD # Framerate display window +STR_FRAMERATE_CURRENT :{WHITE}Obecny ############ Leave those lines in this order!! +STR_FRAMERATE_VIDEO :{WHITE}Wyjście video: +STR_FRAMERATE_SOUND :{WHITE}Miksowanie dźwięku: ############ End of leave-in-this-order ############ Leave those lines in this order!! +STR_FRAMETIME_CAPTION_VIDEO :Wyjście wideo ############ End of leave-in-this-order @@ -4874,6 +4878,8 @@ STR_BASESOUNDS_DOS_DESCRIPTION :Oryginalna edyc STR_BASESOUNDS_WIN_DESCRIPTION :Oryginalna edycja dźwięków dla Transport Tycoon Deluxe Windows. STR_BASESOUNDS_NONE_DESCRIPTION :Zestaw dźwięków nie zawierający żadnych dźwięków. STR_BASEMUSIC_WIN_DESCRIPTION :Oryginalna edycja utworów muzycznych w Transport Tycoon Deluxe Windows. +STR_BASEMUSIC_DOS_DESCRIPTION :Oryginalna edycja utworów muzycznych dla Transport Tycoon Deluxe DOS. +STR_BASEMUSIC_TTO_DESCRIPTION :Oryginalna edycja utworów muzycznych dla Transport Tycoon DOS. STR_BASEMUSIC_NONE_DESCRIPTION :Zestaw utworów muzycznych nie zawierający żadnej muzyki. ##id 0x2000 From 64dac65e20550f5fd11092b55de5b119286bbaa0 Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 28 Jul 2018 19:45:41 +0200 Subject: [PATCH 02/13] Update: Translations from eints spanish (mexican): 1 change by Absay --- src/lang/spanish_MX.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index c658780710..fd2a926574 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -2727,7 +2727,7 @@ STR_FRAMERATE_GL_ROADVEHS :{WHITE} Ticks d STR_FRAMERATE_GL_SHIPS :{WHITE} Ticks de barcos: STR_FRAMERATE_GL_AIRCRAFT :{WHITE} Ticks de aeronaves: STR_FRAMERATE_GL_LANDSCAPE :{WHITE} Ticks de mapa: -STR_FRAMERATE_GL_LINKGRAPH :{WHITE} Retraro en gráfica de distribución: +STR_FRAMERATE_GL_LINKGRAPH :{WHITE} Retraso en gráfica de distribución: STR_FRAMERATE_DRAWING :{WHITE}Presentación de gráficos: STR_FRAMERATE_DRAWING_VIEWPORTS :{WHITE} Ventanas de vista generales: STR_FRAMERATE_VIDEO :{WHITE}Salida de video: From 962757759627fd6933c3b03321bdb8ae0d5c5e6d Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Sat, 28 Jul 2018 23:46:09 +0200 Subject: [PATCH 03/13] Fix: HouseSpec::watched_cargoes not 64 bit Looks like HouseSpec::watched_cargoes was missed in the conversion to 64 cargo types. --- src/house.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/house.h b/src/house.h index ddc2a448c6..94ef62ad54 100644 --- a/src/house.h +++ b/src/house.h @@ -120,7 +120,7 @@ struct HouseSpec { AnimationInfo animation; ///< information about the animation. byte processing_time; ///< Periodic refresh multiplier byte minimum_life; ///< The minimum number of years this house will survive before the town rebuilds it - uint32 watched_cargoes; ///< Cargo types watched for acceptance. + CargoTypes watched_cargoes; ///< Cargo types watched for acceptance. Money GetRemovalCost() const; From 4bd281cef3c4be64fc0d40ab33d72089eaef2055 Mon Sep 17 00:00:00 2001 From: translators Date: Mon, 30 Jul 2018 19:45:41 +0200 Subject: [PATCH 04/13] Update: Translations from eints korean: 44 changes by telk5093 --- src/lang/korean.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 8eb6dca1de..f7bb3cd59c 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -476,6 +476,7 @@ STR_ABOUT_MENU_SCREENSHOT :스크린샷 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :스크린샷 찍기 (지금 보고 있는 영역) STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT :스크린샷 찍기 (창을 제외한 게임 화면만) STR_ABOUT_MENU_GIANT_SCREENSHOT :스크린샷 찍기 (지도 전체) +STR_ABOUT_MENU_SHOW_FRAMERATE :프레임레이트 보기 STR_ABOUT_MENU_ABOUT_OPENTTD :'OpenTTD'에 대해서 STR_ABOUT_MENU_SPRITE_ALIGNER :스프라이트 정렬도구 STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :박스 경계선 보기 전환 @@ -2699,9 +2700,52 @@ STR_ABOUT_VERSION :{BLACK}OpenTTD STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD 개발팀 # Framerate display window +STR_FRAMERATE_CAPTION :{WHITE}프레임레이트 +STR_FRAMERATE_CAPTION_SMALL :{STRING}{WHITE} ({DECIMAL}x) +STR_FRAMERATE_RATE_GAMELOOP :{WHITE}시뮬레이션 비율: {STRING} +STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP :{BLACK}1초에 시뮬레이션하는 게임 틱 수입니다. +STR_FRAMERATE_RATE_BLITTER :{WHITE}그래픽 프레임레이트: {STRING} +STR_FRAMERATE_RATE_BLITTER_TOOLTIP :{BLACK}1초에 표현하는 비디오 프레임 수입니다. +STR_FRAMERATE_SPEED_FACTOR :{WHITE}현재 게임 속력 계수: {DECIMAL}x +STR_FRAMERATE_SPEED_FACTOR_TOOLTIP :{BLACK}현재 게임이 일반적인 시뮬레이션 비율 속도에 비해 얼마나 빠르게 구동되고 있는지를 보여줍니다. +STR_FRAMERATE_CURRENT :{WHITE}현재 +STR_FRAMERATE_AVERAGE :{WHITE}평균 +STR_FRAMERATE_DATA_POINTS :{WHITE}{COMMA}개의 값을 기반으로 측정한 데이터 +STR_FRAMERATE_MS_GOOD :{LTBLUE}{DECIMAL}{WHITE} ms +STR_FRAMERATE_MS_WARN :{YELLOW}{DECIMAL}{WHITE} ms +STR_FRAMERATE_MS_BAD :{RED}{DECIMAL}{WHITE} ms +STR_FRAMERATE_FPS_GOOD :{LTBLUE}{DECIMAL}{WHITE} 프레임/초 +STR_FRAMERATE_FPS_WARN :{YELLOW}{DECIMAL}{WHITE} 프레임/초 +STR_FRAMERATE_FPS_BAD :{RED}{DECIMAL}{WHITE} 프레임/초 +STR_FRAMERATE_GRAPH_MILLISECONDS :{TINY_FONT}{COMMA} ms +STR_FRAMERATE_GRAPH_SECONDS :{TINY_FONT}{COMMA}초 ############ Leave those lines in this order!! +STR_FRAMERATE_GAMELOOP :{WHITE}총 게임 루프: +STR_FRAMERATE_GL_ECONOMY :{WHITE} 화물 처리: +STR_FRAMERATE_GL_TRAINS :{WHITE} 열차 틱: +STR_FRAMERATE_GL_ROADVEHS :{WHITE} 자동차 틱: +STR_FRAMERATE_GL_SHIPS :{WHITE} 선박 틱: +STR_FRAMERATE_GL_AIRCRAFT :{WHITE} 항공기 틱: +STR_FRAMERATE_GL_LANDSCAPE :{WHITE} 세계 틱: +STR_FRAMERATE_GL_LINKGRAPH :{WHITE} 연결 그래프 지연: +STR_FRAMERATE_DRAWING :{WHITE}그래픽 렌더링: +STR_FRAMERATE_DRAWING_VIEWPORTS :{WHITE} 세계 화면: +STR_FRAMERATE_VIDEO :{WHITE}비디오 출력: +STR_FRAMERATE_SOUND :{WHITE}사운드 합성: ############ End of leave-in-this-order ############ Leave those lines in this order!! +STR_FRAMETIME_CAPTION_GAMELOOP :게임 루프 +STR_FRAMETIME_CAPTION_GL_ECONOMY :화물 처리 +STR_FRAMETIME_CAPTION_GL_TRAINS :열차 틱 +STR_FRAMETIME_CAPTION_GL_ROADVEHS :자동차 틱 +STR_FRAMETIME_CAPTION_GL_SHIPS :선박 틱 +STR_FRAMETIME_CAPTION_GL_AIRCRAFT :항공기 틱 +STR_FRAMETIME_CAPTION_GL_LANDSCAPE :세계 틱 +STR_FRAMETIME_CAPTION_GL_LINKGRAPH :연결 그래프 지연 +STR_FRAMETIME_CAPTION_DRAWING :그래픽 렌더링 +STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS :세계 화면 렌더링 +STR_FRAMETIME_CAPTION_VIDEO :비디오 출력 +STR_FRAMETIME_CAPTION_SOUND :사운드 합성 ############ End of leave-in-this-order From 76f788124b2b951f23ecc6403c9bdb66914fa0ce Mon Sep 17 00:00:00 2001 From: translators Date: Fri, 3 Aug 2018 19:45:40 +0200 Subject: [PATCH 05/13] Update: Translations from eints latvian: 8 changes by krixis02 --- src/lang/latvian.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 0408558c5a..015689bdfb 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -475,6 +475,7 @@ STR_ABOUT_MENU_SCREENSHOT :Ekrānuzņēmum STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Pilnībā pietuvināts ekrānuzņēmums STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT :Noklusējuma mēroga ekrānuzņēmums STR_ABOUT_MENU_GIANT_SCREENSHOT :Visas kartes ekrānuzņēmums +STR_ABOUT_MENU_SHOW_FRAMERATE :Rādīt kadru ātrumu STR_ABOUT_MENU_ABOUT_OPENTTD :Par 'OpenTTD' STR_ABOUT_MENU_SPRITE_ALIGNER :Gariņu līdzinātājs STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Pārslēgt saistītās kastes @@ -1561,6 +1562,7 @@ STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT :Lielpilsētu vi STR_CONFIG_SETTING_DISTRIBUTION_MANUAL :manuāli STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC :asimetriska STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC :simetriska +STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT :"nesimetriski" nozīmē, ka patvaļīgu kravas daudzumu var nosūtīt abos virzienos."manuāli" nozīmē, ka šīm kravām netiks veikta automātiska izplatīšana. STR_CONFIG_SETTING_LINKGRAPH_ACCURACY :Sadales precizitāte: {STRING} STR_CONFIG_SETTING_DEMAND_SIZE_HELPTEXT :Uzstādod šo mazāk par 100% liks simetriskajai sadalei izturēties vairāk kā asimetriskajai. Mazāk kravas ar varu tiks sūtīts atpakaļ ja noteikts daudzums tiks sūtīts uz piestātni. Ja jūs uzstādīsiet to uz 0% simetriskā sadale izturēsies tā pat kā asimetriskā. @@ -2626,9 +2628,11 @@ STR_ABOUT_VERSION :{BLACK}OpenTTD STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2018 OpenTTD darba grupa # Framerate display window +STR_FRAMERATE_SPEED_FACTOR :{WHITE}pašreizējās spēles ātruma pakāpe: {DECIMAL}x ############ Leave those lines in this order!! ############ End of leave-in-this-order ############ Leave those lines in this order!! +STR_FRAMETIME_CAPTION_VIDEO :{WHITE}video izeja ############ End of leave-in-this-order @@ -2782,6 +2786,7 @@ STR_SAVE_PRESET_EDITBOX_TOOLTIP :{BLACK}Pašlaik STR_SAVE_PRESET_CANCEL :{BLACK}Atcelt STR_SAVE_PRESET_CANCEL_TOOLTIP :{BLACK}Nemainīt iepriekšiestatījumu STR_SAVE_PRESET_SAVE :{BLACK}Saglabāt +STR_SAVE_PRESET_SAVE_TOOLTIP :{BLACK}pašreizējos iestatījumus saglābāt kā sākontnējos iestatījumus # NewGRF parameters window STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Mainīt NewGRF parametrus @@ -3293,6 +3298,7 @@ STR_GROUP_REMOVE_ALL_VEHICLES :Novākt visus t STR_GROUP_RENAME_CAPTION :{BLACK}Pārdēvēt grupu +STR_GROUP_PROFIT_THIS_YEAR :Ienākumi šajā gadā: # Build vehicle window STR_BUY_VEHICLE_TRAIN_RAIL_CAPTION :Jauni dzelzceļa transportlīdzekļi @@ -4058,6 +4064,7 @@ STR_ERROR_EXCAVATION_WOULD_DAMAGE :{WHITE}Rakšana STR_ERROR_ALREADY_AT_SEA_LEVEL :{WHITE}... jau ir jūras līmenī STR_ERROR_TOO_HIGH :{WHITE}... pārāk augstu STR_ERROR_ALREADY_LEVELLED :{WHITE}... jau ir līdzens +STR_ERROR_BRIDGE_TOO_HIGH_AFTER_LOWER_LAND :{WHITE}Tilta otrs gals ir pārāk augstu. # Company related errors STR_ERROR_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Uzņēmuma nosaukumu nevar mainīt... @@ -4272,6 +4279,7 @@ STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... tā STR_ERROR_GROUP_CAN_T_CREATE :{WHITE}Nevar izveidot grupu... STR_ERROR_GROUP_CAN_T_DELETE :{WHITE}Nevar izdzēst šo grupu... STR_ERROR_GROUP_CAN_T_RENAME :{WHITE}Nevar pārdēvēt grupu... +STR_ERROR_GROUP_CAN_T_SET_PARENT :nevar iestatīt vecāku grupu... STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES :{WHITE}Nevar noņemt no šīs grupas visus transportlīdzekļus... STR_ERROR_GROUP_CAN_T_ADD_VEHICLE :{WHITE}Nevar pievienot transportlīdzekļus šai grupai... STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE :{WHITE}Nevar pievienot koplietojamos transportlīdzekļus šai grupai... From 16cf577b61ce8031a8f6ddb046731983e7647523 Mon Sep 17 00:00:00 2001 From: ScumbagDog Date: Sun, 29 Jul 2018 15:43:27 +0200 Subject: [PATCH 06/13] Feature: Added New Russian Ruble as currency (#6678) --- src/currency.cpp | 1 + src/currency.h | 1 + src/lang/english.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/src/currency.cpp b/src/currency.cpp index 8cc385fc04..615c5113bb 100644 --- a/src/currency.cpp +++ b/src/currency.cpp @@ -62,6 +62,7 @@ static const CurrencySpec origin_currency_specs[CURRENCY_END] = { { 1, "", CF_NOEURO, "", "", 2, STR_GAME_OPTIONS_CURRENCY_CUSTOM }, ///< custom currency (add further languages below) { 3, "", CF_NOEURO, "", NBSP "GEL", 1, STR_GAME_OPTIONS_CURRENCY_GEL }, ///< Georgian Lari { 4901, "", CF_NOEURO, "", NBSP "Rls", 1, STR_GAME_OPTIONS_CURRENCY_IRR }, ///< Iranian Rial + { 80, "", CF_NOEURO, "", NBSP "rub", 1, STR_GAME_OPTIONS_CURRENCY_RUB }, ///< New Russian Ruble }; /** Array of currencies used by the system */ diff --git a/src/currency.h b/src/currency.h index ab8026002d..2529aca11f 100644 --- a/src/currency.h +++ b/src/currency.h @@ -58,6 +58,7 @@ enum Currencies { CURRENCY_CUSTOM, ///< Custom currency CURRENCY_GEL, ///< Georgian Lari CURRENCY_IRR, ///< Iranian Rial + CURRENCY_RUB, ///< New Russian Ruble CURRENCY_END, ///< always the last item }; diff --git a/src/lang/english.txt b/src/lang/english.txt index 1be1387061..0589ec4f11 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -927,6 +927,7 @@ STR_GAME_OPTIONS_CURRENCY_ZAR :South African R STR_GAME_OPTIONS_CURRENCY_CUSTOM :Custom... STR_GAME_OPTIONS_CURRENCY_GEL :Georgian Lari (GEL) STR_GAME_OPTIONS_CURRENCY_IRR :Iranian Rial (IRR) +STR_GAME_OPTIONS_CURRENCY_RUB :New Russian Ruble (RUB) ############ end of currency region STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME :{BLACK}Road vehicles From 41a620c1a7d51b0f97b243359a67955e6323f735 Mon Sep 17 00:00:00 2001 From: J0anJosep Date: Sat, 31 Mar 2018 18:09:29 +0200 Subject: [PATCH 07/13] Fix #6805: (Doc) Road depot and stations (except rail stations and waypoints) do not use m8 for railtype. --- docs/landscape_grid.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html index b801b334dd..cac2423438 100644 --- a/docs/landscape_grid.html +++ b/docs/landscape_grid.html @@ -173,7 +173,7 @@ the array so you can quickly see what is used and what is not. XXOO OOXX OOOO OOOO XXXO XXXX - -inherit- + OOOO OOOO OOOO OOOO 3 @@ -241,7 +241,7 @@ the array so you can quickly see what is used and what is not. ~~~~ ~XXX OOXX XOOO XXOX XXXX - -inherit- + OOOO OOOO OOOO OOOO dock @@ -254,7 +254,7 @@ the array so you can quickly see what is used and what is not. ~~~~ ~XXX OOXX XOOO OOOO OOOO - -inherit- + OOOO OOOO OOOO OOOO airport @@ -267,7 +267,7 @@ the array so you can quickly see what is used and what is not. XXXX XXXX OOXX XOOO XXXX XXXX - -inherit- + OOOO OOOO OOOO OOOO buoy @@ -280,7 +280,7 @@ the array so you can quickly see what is used and what is not. ~~~~ ~~~~ OOXX XOOO OOOO OOOO - -inherit- + OOOO OOOO OOOO OOOO oilrig @@ -293,7 +293,7 @@ the array so you can quickly see what is used and what is not. ~~~~ ~~~~ OOXX XOOO OOOO OOOO - -inherit- + OOOO OOOO OOOO OOOO 6 From 8c0a6bbc4f12db9dd331482ff1e3c229c60354c8 Mon Sep 17 00:00:00 2001 From: J0an Josep Date: Thu, 26 Jul 2018 18:00:56 +0200 Subject: [PATCH 08/13] Fix: (Doc) Use free bits and -inherit- more consistently in landscape grid. --- docs/landscape_grid.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html index cac2423438..8519fa990a 100644 --- a/docs/landscape_grid.html +++ b/docs/landscape_grid.html @@ -93,7 +93,7 @@ the array so you can quickly see what is used and what is not. -inherit- OOOX XXOO OOOO OOOO - -inherit- + OOOO OOOO OOOO OOOO 1 @@ -156,7 +156,7 @@ the array so you can quickly see what is used and what is not. -inherit- -inherit- XXXX OOOO - -inherit- + OOOO OOOO XXXX OOOX OOXX XOOO XXXX XXXX @@ -320,7 +320,7 @@ the array so you can quickly see what is used and what is not. -inherit- OOOO OOOO OOOO OOOO - -inherit- + OOOO OOOO OOOO OOOO shipdepot @@ -333,7 +333,7 @@ the array so you can quickly see what is used and what is not. -inherit- OOOO OOOO OOOO OOOO - -inherit- + OOOO OOOO OOOO OOOO 8 @@ -368,9 +368,9 @@ the array so you can quickly see what is used and what is not. -inherit- -inherit- -inherit- + OOOO OOOO OOOO OOOO -inherit- - -inherit- - -inherit- + OOOO OOOO -inherit- OOXX XXOO -inherit- From a53f13cff633962108db52da09d4f54ae6946f10 Mon Sep 17 00:00:00 2001 From: J0an Josep Date: Fri, 27 Jul 2018 22:02:16 +0200 Subject: [PATCH 09/13] Fix #6805: Clear some m8 bits when making some tiles. --- src/clear_map.h | 2 ++ src/station_map.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/clear_map.h b/src/clear_map.h index 76b1e82d04..d24916de35 100644 --- a/src/clear_map.h +++ b/src/clear_map.h @@ -269,6 +269,7 @@ static inline void MakeClear(TileIndex t, ClearGround g, uint density) SetClearGroundDensity(t, g, density); // Sets m5 _me[t].m6 = 0; _me[t].m7 = 0; + _me[t].m8 = 0; } @@ -289,6 +290,7 @@ static inline void MakeField(TileIndex t, uint field_type, IndustryID industry) SetClearGroundDensity(t, CLEAR_FIELDS, 3); SB(_me[t].m6, 2, 4, 0); _me[t].m7 = 0; + _me[t].m8 = 0; } /** diff --git a/src/station_map.h b/src/station_map.h index 7ca9bd7204..e591787e3b 100644 --- a/src/station_map.h +++ b/src/station_map.h @@ -542,6 +542,7 @@ static inline void MakeStation(TileIndex t, Owner o, StationID sid, StationType SB(_me[t].m6, 2, 1, 0); SB(_me[t].m6, 3, 3, st); _me[t].m7 = 0; + _me[t].m8 = 0; } /** From 67f6bcdc9bb7dcd2424d41be9c3ce44c8ebdcf37 Mon Sep 17 00:00:00 2001 From: J0an Josep Date: Sat, 28 Jul 2018 15:59:37 +0200 Subject: [PATCH 10/13] Fix #6805: Update CmdBuilRailWaypoint bits. --- src/waypoint_cmd.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp index 54489fa457..639dce13bc 100644 --- a/src/waypoint_cmd.cpp +++ b/src/waypoint_cmd.cpp @@ -148,7 +148,8 @@ extern CommandCost CanExpandRailStation(const BaseStation *st, TileArea &new_ta, * @param start_tile northern most tile where waypoint will be built * @param flags type of operation * @param p1 various bitstuffed elements - * - p1 = (bit 4) - orientation (Axis) + * - p1 = (bit 0- 5) - railtype (not used) + * - p1 = (bit 6) - orientation (Axis) * - p1 = (bit 8-15) - width of waypoint * - p1 = (bit 16-23) - height of waypoint * - p1 = (bit 24) - allow waypoints directly adjacent to other waypoints. @@ -161,7 +162,7 @@ extern CommandCost CanExpandRailStation(const BaseStation *st, TileArea &new_ta, CommandCost CmdBuildRailWaypoint(TileIndex start_tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) { /* Unpack parameters */ - Axis axis = Extract(p1); + Axis axis = Extract(p1); byte width = GB(p1, 8, 8); byte height = GB(p1, 16, 8); bool adjacent = HasBit(p1, 24); From b34a1f372f2701bae4f18dcb97e92c1f8323de46 Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 4 Aug 2018 19:45:41 +0200 Subject: [PATCH 11/13] Update: Translations from eints italian: 1 change by lorenzodv --- src/lang/italian.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 1ffafdcd76..a1eb67ae99 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -929,6 +929,7 @@ STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sudafrican STR_GAME_OPTIONS_CURRENCY_CUSTOM :Personalizzata... STR_GAME_OPTIONS_CURRENCY_GEL :Lari georgiano (GEL) STR_GAME_OPTIONS_CURRENCY_IRR :Rial iraniano (IRR) +STR_GAME_OPTIONS_CURRENCY_RUB :Nuovo rublo russo (RUB) ############ end of currency region STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME :{BLACK}Automezzi From 74eb77f0a864e65d96f8bf760ecbc50b243461ba Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sat, 4 Aug 2018 20:53:17 +0200 Subject: [PATCH 12/13] Add: notify IRC about pushes to this repository --- .dorpsgek.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .dorpsgek.yml diff --git a/.dorpsgek.yml b/.dorpsgek.yml new file mode 100644 index 0000000000..89ed750dc4 --- /dev/null +++ b/.dorpsgek.yml @@ -0,0 +1,5 @@ +notifications: + push: + irc: + - openttd + - openttd.notice From 5df3a65074295f7a50f3a5a6bab355b6ab28afdc Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sun, 5 Aug 2018 17:19:41 +0200 Subject: [PATCH 13/13] Add: notify IRC about pull-requests and issues --- .dorpsgek.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.dorpsgek.yml b/.dorpsgek.yml index 89ed750dc4..a8b976f5c7 100644 --- a/.dorpsgek.yml +++ b/.dorpsgek.yml @@ -3,3 +3,11 @@ notifications: irc: - openttd - openttd.notice + pull-request: + irc: + - openttd + - openttd.notice + issue: + irc: + - openttd + - openttd.notice