Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	docs/landscape_grid.html
pull/73/head
Jonathan G Rennison 6 years ago
parent 64c71f5136 5df3a65074
commit 9038ac5c00
11 changed files with 121 additions and 2 deletions
Show Stats Download Patch File Download Diff File

13
.dorpsgek.yml
Unescape Escape View File

@ -0,0 +1,13 @@
notifications:
push:
irc:
- openttd
- openttd.notice
pull-request:
irc:
- openttd
- openttd.notice
issue:
irc:
- openttd
- openttd.notice

1
src/currency.cpp
Unescape Escape View File

@ -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 */

1
src/currency.h
Unescape Escape View File

@ -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
};

2
src/house.h
Unescape Escape View File

@ -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;

44
src/lang/croatian.txt
Unescape Escape View File

@ -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
@ -2792,9 +2793,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

1
src/lang/english.txt
Unescape Escape View File

@ -935,6 +935,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

1
src/lang/italian.txt
Unescape Escape View File

@ -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

44
src/lang/korean.txt
Unescape Escape View File

@ -481,6 +481,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 :박스 경계선 보기 전환
@ -3176,9 +3177,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

8
src/lang/latvian.txt
Unescape Escape View File

@ -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ā.
@ -2624,9 +2626,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
@ -2780,6 +2784,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...

6
src/lang/polish.txt
Unescape Escape View File

@ -3070,9 +3070,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

2
src/lang/spanish_MX.txt
Unescape Escape View File

@ -2725,7 +2725,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:

Write Preview
Loading…
Cancel
Save