dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-10-06 01:45:38 +01:00
parent a4c677a571 4154cf00f4
commit b77484c930
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/error_gui.cpp
View File

@@ -77,6 +77,7 @@ ErrorMessageData::ErrorMessageData(const ErrorMessageData &data) :
summary_msg(data.summary_msg), detailed_msg(data.detailed_msg), position(data.position), face(data.face) summary_msg(data.summary_msg), detailed_msg(data.detailed_msg), position(data.position), face(data.face)
{ {
memcpy(this->textref_stack, data.textref_stack, sizeof(this->textref_stack)); memcpy(this->textref_stack, data.textref_stack, sizeof(this->textref_stack));
memcpy(this->decode_params, data.decode_params, sizeof(this->decode_params));
for (size_t i = 0; i < lengthof(this->strings); i++) { for (size_t i = 0; i < lengthof(this->strings); i++) {
if (this->strings[i] != nullptr) { if (this->strings[i] != nullptr) {
this->strings[i] = stredup(this->strings[i]); this->strings[i] = stredup(this->strings[i]);

12
src/lang/estonian.txt
View File

@@ -980,7 +980,9 @@ STR_GAME_OPTIONS_CURRENCY_ZAR :Lõuna-Aafrika
STR_GAME_OPTIONS_CURRENCY_CUSTOM :Omatehtud... STR_GAME_OPTIONS_CURRENCY_CUSTOM :Omatehtud...
STR_GAME_OPTIONS_CURRENCY_GEL :Gruusia lari (GEL) STR_GAME_OPTIONS_CURRENCY_GEL :Gruusia lari (GEL)
STR_GAME_OPTIONS_CURRENCY_IRR :Iraani rial (IRR) STR_GAME_OPTIONS_CURRENCY_IRR :Iraani rial (IRR)
STR_GAME_OPTIONS_CURRENCY_RUB :Uus Vene rubla (RUB)
STR_GAME_OPTIONS_CURRENCY_MXN :Mehhiko Peeso (MXN) STR_GAME_OPTIONS_CURRENCY_MXN :Mehhiko Peeso (MXN)
STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kongi dollar (HKD)
############ end of currency region ############ end of currency region
STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME :{BLACK}Sõidukid STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME :{BLACK}Sõidukid
@@ -1043,7 +1045,9 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL :Tavaline
STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM :Topeltsuurus STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM :Topeltsuurus
STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM :Ruudu suurus STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM :Ruudu suurus
STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP :{BLACK}Vali kasutatav liideseelementide suurus
STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM :Ruudu suurus
STR_GAME_OPTIONS_BASE_GRF :{BLACK}Alusgraafika kogu STR_GAME_OPTIONS_BASE_GRF :{BLACK}Alusgraafika kogu
STR_GAME_OPTIONS_BASE_GRF_TOOLTIP :{BLACK}Valib kasutatava alusgraafika kogu STR_GAME_OPTIONS_BASE_GRF_TOOLTIP :{BLACK}Valib kasutatava alusgraafika kogu
@@ -2639,6 +2643,7 @@ STR_LAND_AREA_INFORMATION_AIRPORTTILE_NAME :{BLACK}Lennujaa
STR_LAND_AREA_INFORMATION_NEWGRF_NAME :{BLACK}NewGRF: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_NEWGRF_NAME :{BLACK}NewGRF: {LTBLUE}{STRING}
STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}Vastuvõetavad veosed: {LTBLUE} STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED :{BLACK}Vastuvõetavad veosed: {LTBLUE}
STR_LAND_AREA_INFORMATION_CARGO_EIGHTS :({COMMA}/8 {STRING}) STR_LAND_AREA_INFORMATION_CARGO_EIGHTS :({COMMA}/8 {STRING})
STR_LANG_AREA_INFORMATION_TRAM_TYPE :{BLACK}Trammi tüüp: {LTBLUE}{STRING}
STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT :{BLACK}Raudtee kiiruspiirang: {LTBLUE}{VELOCITY} STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT :{BLACK}Raudtee kiiruspiirang: {LTBLUE}{VELOCITY}
STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT :{BLACK}Lubatud piirkiirus: {LTBLUE}{VELOCITY} STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT :{BLACK}Lubatud piirkiirus: {LTBLUE}{VELOCITY}
@@ -2741,6 +2746,7 @@ STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD
# Framerate display window # Framerate display window
STR_FRAMERATE_CAPTION :{WHITE}Kaadrisagedus STR_FRAMERATE_CAPTION :{WHITE}Kaadrisagedus
STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP :{BLACK}Simuleeritud mänguhetkede arv sekundis.
STR_FRAMERATE_RATE_BLITTER_TOOLTIP :{BLACK}Renderdatud videokaadrite arv sekundis. STR_FRAMERATE_RATE_BLITTER_TOOLTIP :{BLACK}Renderdatud videokaadrite arv sekundis.
STR_FRAMERATE_AVERAGE :{WHITE}Keskmine STR_FRAMERATE_AVERAGE :{WHITE}Keskmine
STR_FRAMERATE_MS_GOOD :{LTBLUE}{DECIMAL} ms STR_FRAMERATE_MS_GOOD :{LTBLUE}{DECIMAL} ms
@@ -2750,6 +2756,7 @@ STR_FRAMERATE_FPS_GOOD :{LTBLUE}{DECIMA
STR_FRAMERATE_FPS_WARN :{YELLOW}{DECIMAL} kaadrit/s STR_FRAMERATE_FPS_WARN :{YELLOW}{DECIMAL} kaadrit/s
STR_FRAMERATE_FPS_BAD :{RED}{DECIMAL} kaadrit/s STR_FRAMERATE_FPS_BAD :{RED}{DECIMAL} kaadrit/s
############ Leave those lines in this order!! ############ Leave those lines in this order!!
STR_FRAMERATE_GAMELOOP :{BLACK}Mängutsükli lõppkokkuvõte:
STR_FRAMERATE_GL_AIRCRAFT :{BLACK} Õhusõiduki sammud: STR_FRAMERATE_GL_AIRCRAFT :{BLACK} Õhusõiduki sammud:
STR_FRAMERATE_GL_LINKGRAPH :{BLACK} Ahelgraafiku viide: STR_FRAMERATE_GL_LINKGRAPH :{BLACK} Ahelgraafiku viide:
STR_FRAMERATE_DRAWING :{BLACK}Graafika renderdamine: STR_FRAMERATE_DRAWING :{BLACK}Graafika renderdamine:
@@ -3422,6 +3429,7 @@ STR_GROUP_REMOVE_ALL_VEHICLES :Eemalda kõik s
STR_GROUP_RENAME_CAPTION :{BLACK}Rühma nime vahetamine STR_GROUP_RENAME_CAPTION :{BLACK}Rühma nime vahetamine
STR_GROUP_PROFIT_THIS_YEAR :Kasum sellel aastal: STR_GROUP_PROFIT_THIS_YEAR :Kasum sellel aastal:
STR_GROUP_OCCUPANCY_VALUE :{NUM}%
# Build vehicle window # Build vehicle window
STR_BUY_VEHICLE_TRAIN_RAIL_CAPTION :Uued rööbassõidukid STR_BUY_VEHICLE_TRAIN_RAIL_CAPTION :Uued rööbassõidukid
@@ -3450,6 +3458,7 @@ STR_PURCHASE_INFO_RELIABILITY :{BLACK}Parim te
STR_PURCHASE_INFO_COST :{BLACK}Hind: {GOLD}{CURRENCY_LONG} STR_PURCHASE_INFO_COST :{BLACK}Hind: {GOLD}{CURRENCY_LONG}
STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Mass: {GOLD}{WEIGHT_SHORT} {WEIGHT_SHORT}) STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Mass: {GOLD}{WEIGHT_SHORT} {WEIGHT_SHORT})
STR_PURCHASE_INFO_COST_SPEED :{BLACK}Hind: {GOLD}{CURRENCY_LONG}{BLACK} Tippkiirus: {GOLD}{VELOCITY} STR_PURCHASE_INFO_COST_SPEED :{BLACK}Hind: {GOLD}{CURRENCY_LONG}{BLACK} Tippkiirus: {GOLD}{VELOCITY}
STR_PURCHASE_INFO_COST_REFIT_SPEED :{BLACK}Hind: {GOLD}{CURRENCY_LONG}{BLACK} (Ümberseadistamise maksumus: {GOLD}{CURRENCY_LONG}{BLACK}) Kiirus: {GOLD}{VELOCITY}
STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kandevõime: {GOLD}{CARGO_LONG}, {CARGO_LONG} STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Kandevõime: {GOLD}{CARGO_LONG}, {CARGO_LONG}
STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Kiirendavad vagunid: {GOLD}+{POWER}{BLACK} Mass: {GOLD}+{WEIGHT_SHORT} STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Kiirendavad vagunid: {GOLD}+{POWER}{BLACK} Mass: {GOLD}+{WEIGHT_SHORT}
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Ümberseadistatav: {GOLD}{STRING} STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Ümberseadistatav: {GOLD}{STRING}
@@ -3636,6 +3645,7 @@ STR_REPLACE_ELRAIL_VEHICLES :Elektrirongid
STR_REPLACE_MONORAIL_VEHICLES :Monorelssveerem STR_REPLACE_MONORAIL_VEHICLES :Monorelssveerem
STR_REPLACE_MAGLEV_VEHICLES :Magnethõljukveerem STR_REPLACE_MAGLEV_VEHICLES :Magnethõljukveerem
STR_REPLACE_ROAD_VEHICLES :Maanteesõidukid
STR_REPLACE_REMOVE_WAGON :{BLACK}Vagunite eemaldus: {ORANGE}{STRING} STR_REPLACE_REMOVE_WAGON :{BLACK}Vagunite eemaldus: {ORANGE}{STRING}
STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Sunni automaatset asendust hoidma rongi pikkust selleks (eest alustades) veeremit eemaldades, juhul kui uus vagun muudaks rongi pikemaks. STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Sunni automaatset asendust hoidma rongi pikkust selleks (eest alustades) veeremit eemaldades, juhul kui uus vagun muudaks rongi pikemaks.
@@ -4376,6 +4386,7 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM :{WHITE}Siinset
STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Siinset trammiteed ei saa lammutada... STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Siinset trammiteed ei saa lammutada...
STR_ERROR_THERE_IS_NO_ROAD :{WHITE}... siin pole autoteed STR_ERROR_THERE_IS_NO_ROAD :{WHITE}... siin pole autoteed
STR_ERROR_THERE_IS_NO_TRAMWAY :{WHITE}... siin pole trammiteed STR_ERROR_THERE_IS_NO_TRAMWAY :{WHITE}... siin pole trammiteed
STR_ERROR_INCOMPATIBLE_ROAD :{WHITE}... sobimatu tee
# Waterway construction errors # Waterway construction errors
STR_ERROR_CAN_T_BUILD_CANALS :{WHITE}Siia ei saa kanaleid ehitada... STR_ERROR_CAN_T_BUILD_CANALS :{WHITE}Siia ei saa kanaleid ehitada...
@@ -4538,6 +4549,7 @@ STR_BASESOUNDS_DOS_DESCRIPTION :Algse Transport
STR_BASESOUNDS_WIN_DESCRIPTION :Algse Transport Tycoon Deluxe Windowsi versiooni helid. STR_BASESOUNDS_WIN_DESCRIPTION :Algse Transport Tycoon Deluxe Windowsi versiooni helid.
STR_BASESOUNDS_NONE_DESCRIPTION :Helikogu ilma helideta. STR_BASESOUNDS_NONE_DESCRIPTION :Helikogu ilma helideta.
STR_BASEMUSIC_WIN_DESCRIPTION :Algse Transport Tycoon Deluxe Windowsi versiooni muusika. STR_BASEMUSIC_WIN_DESCRIPTION :Algse Transport Tycoon Deluxe Windowsi versiooni muusika.
STR_BASEMUSIC_DOS_DESCRIPTION :Algse Transport Tycoon Deluxe DOSi versiooni muusika.
STR_BASEMUSIC_NONE_DESCRIPTION :Muusikakogu ilma muusikata. STR_BASEMUSIC_NONE_DESCRIPTION :Muusikakogu ilma muusikata.
##id 0x2000 ##id 0x2000