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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/lang/english_AU.txt
#	src/openttd.cpp
#	src/viewport_sprite_sorter_sse4.cpp
This commit is contained in:
Jonathan G Rennison
2022-08-27 15:50:50 +01:00
parent 602ac717aa e6aab701c9
commit 1d08572cfa
20 changed files with 767 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/console_cmds.cpp
View File

@@ -1729,7 +1729,7 @@ DEF_CONSOLE_CMD(ConDebugLevel)
if (argc == 1) {
IConsolePrintF(CC_DEFAULT, "Current debug-level: '%s'", GetDebugString());
} else {
SetDebugString(argv[1]);
SetDebugString(argv[1], [](const char *err) { IConsolePrint(CC_ERROR, err); });
}
return true;

147
src/console_gui.cpp
View File

@@ -21,6 +21,8 @@
#include "console_func.h"
#include "rev.h"
#include "video/video_driver.hpp"
#include <deque>
#include <string>
#include "widgets/console_widget.h"
@@ -37,94 +39,36 @@ static const uint ICON_BOTTOM_BORDERWIDTH = 12;
* Container for a single line of console output
*/
struct IConsoleLine {
static IConsoleLine *front; ///< The front of the console backlog buffer
static int size; ///< The amount of items in the backlog
IConsoleLine *previous; ///< The previous console message.
char *buffer; ///< The data to store.
std::string buffer; ///< The data to store.
TextColour colour; ///< The colour of the line.
uint16 time; ///< The amount of time the line is in the backlog.
IConsoleLine() : buffer(), colour(TC_BEGIN), time(0)
{
}
/**
* Initialize the console line.
* @param buffer the data to print.
* @param colour the colour of the line.
*/
IConsoleLine(char *buffer, TextColour colour) :
previous(IConsoleLine::front),
IConsoleLine(const std::string &buffer, TextColour colour) :
buffer(buffer),
colour(colour),
time(0)
{
IConsoleLine::front = this;
IConsoleLine::size++;
}
/**
* Clear this console line and any further ones.
*/
~IConsoleLine()
{
IConsoleLine::size--;
free(buffer);
delete previous;
}
/**
* Get the index-ed item in the list.
*/
static const IConsoleLine *Get(uint index)
{
const IConsoleLine *item = IConsoleLine::front;
while (index != 0 && item != nullptr) {
index--;
item = item->previous;
}
return item;
}
/**
* Truncate the list removing everything older than/more than the amount
* as specified in the config file.
* As a side effect also increase the time the other lines have been in
* the list.
* @return true if and only if items got removed.
*/
static bool Truncate()
{
IConsoleLine *cur = IConsoleLine::front;
if (cur == nullptr) return false;
int count = 1;
for (IConsoleLine *item = cur->previous; item != nullptr; count++, cur = item, item = item->previous) {
if (item->time > _settings_client.gui.console_backlog_timeout &&
count > _settings_client.gui.console_backlog_length) {
delete item;
cur->previous = nullptr;
return true;
}
if (item->time != MAX_UVALUE(uint16)) item->time++;
}
return false;
}
/**
* Reset the complete console line backlog.
*/
static void Reset()
{
delete IConsoleLine::front;
IConsoleLine::front = nullptr;
IConsoleLine::size = 0;
}
};
/* static */ IConsoleLine *IConsoleLine::front = nullptr;
/* static */ int IConsoleLine::size = 0;
/** The console backlog buffer. Item index 0 is the newest line. */
static std::deque<IConsoleLine> _iconsole_buffer;
static bool TruncateBuffer();
/* ** main console cmd buffer ** */
@@ -170,7 +114,7 @@ static WindowDesc _console_window_desc(
struct IConsoleWindow : Window
{
static int scroll;
static size_t scroll;
int line_height; ///< Height of one line of text in the console.
int line_offset;
GUITimer truncate_timer;
@@ -198,8 +142,15 @@ struct IConsoleWindow : Window
*/
void Scroll(int amount)
{
int max_scroll = std::max(0, IConsoleLine::size + 1 - this->height / this->line_height);
IConsoleWindow::scroll = Clamp<int>(IConsoleWindow::scroll + amount, 0, max_scroll);
if (amount < 0) {
size_t namount = (size_t) -amount;
IConsoleWindow::scroll = (namount > IConsoleWindow::scroll) ? 0 : IConsoleWindow::scroll - namount;
} else {
assert(this->height >= 0 && this->line_height > 0);
size_t visible_lines = (size_t)(this->height / this->line_height);
size_t max_scroll = (visible_lines > _iconsole_buffer.size()) ? 0 : _iconsole_buffer.size() + 1 - visible_lines;
IConsoleWindow::scroll = std::min<size_t>(IConsoleWindow::scroll + amount, max_scroll);
}
this->SetDirty();
}
@@ -209,9 +160,10 @@ struct IConsoleWindow : Window
GfxFillRect(0, 0, this->width - 1, this->height - 1, PC_BLACK);
int ypos = this->height - this->line_height;
for (const IConsoleLine *print = IConsoleLine::Get(IConsoleWindow::scroll); print != nullptr; print = print->previous) {
SetDParamStr(0, print->buffer);
ypos = DrawStringMultiLine(5, right, -this->line_height, ypos, STR_JUST_RAW_STRING, print->colour, SA_LEFT | SA_BOTTOM | SA_FORCE) - ICON_LINE_SPACING;
for (size_t line_index = IConsoleWindow::scroll; line_index < _iconsole_buffer.size(); line_index++) {
const IConsoleLine &print = _iconsole_buffer[line_index];
SetDParamStr(0, print.buffer);
ypos = DrawStringMultiLine(5, right, -this->line_height, ypos, STR_JUST_RAW_STRING, print.colour, SA_LEFT | SA_BOTTOM | SA_FORCE) - ICON_LINE_SPACING;
if (ypos < 0) break;
}
/* If the text is longer than the window, don't show the starting ']' */
@@ -235,9 +187,12 @@ struct IConsoleWindow : Window
{
if (this->truncate_timer.CountElapsed(delta_ms) == 0) return;
if (IConsoleLine::Truncate() &&
(IConsoleWindow::scroll > IConsoleLine::size)) {
IConsoleWindow::scroll = std::max(0, IConsoleLine::size - (this->height / this->line_height) + 1);
assert(this->height >= 0 && this->line_height > 0);
size_t visible_lines = (size_t)(this->height / this->line_height);
if (TruncateBuffer() && IConsoleWindow::scroll + visible_lines > _iconsole_buffer.size()) {
size_t max_scroll = (visible_lines > _iconsole_buffer.size()) ? 0 : _iconsole_buffer.size() + 1 - visible_lines;
IConsoleWindow::scroll = std::min<size_t>(IConsoleWindow::scroll, max_scroll);
this->SetDirty();
}
}
@@ -393,14 +348,14 @@ struct IConsoleWindow : Window
}
};
int IConsoleWindow::scroll = 0;
size_t IConsoleWindow::scroll = 0;
void IConsoleGUIInit()
{
IConsoleResetHistoryPos();
_iconsole_mode = ICONSOLE_CLOSED;
IConsoleLine::Reset();
IConsoleClearBuffer();
memset(_iconsole_history, 0, sizeof(_iconsole_history));
IConsolePrintF(CC_WARNING, "OpenTTD Game Console Revision 7 - %s", _openttd_revision);
@@ -412,7 +367,7 @@ void IConsoleGUIInit()
void IConsoleClearBuffer()
{
IConsoleLine::Reset();
_iconsole_buffer.clear();
}
void IConsoleGUIFree()
@@ -588,10 +543,38 @@ static void IConsoleTabCompletion()
*/
void IConsoleGUIPrint(TextColour colour_code, char *str)
{
new IConsoleLine(str, colour_code);
_iconsole_buffer.push_front(IConsoleLine(str, colour_code));
SetWindowDirty(WC_CONSOLE, 0);
}
/**
* Remove old lines from the backlog buffer.
* The buffer is limited by a maximum size and a minimum age. Every time truncation runs,
* all lines in the buffer are aged by one. When a line exceeds both the maximum position
* and also the maximum age, it gets removed.
* @return true if any lines were removed
*/
static bool TruncateBuffer()
{
bool need_truncation = false;
size_t count = 0;
for (IConsoleLine &line : _iconsole_buffer) {
count++;
line.time++;
if (line.time > _settings_client.gui.console_backlog_timeout && count > _settings_client.gui.console_backlog_length) {
/* Any messages after this are older and need to be truncated */
need_truncation = true;
break;
}
}
if (need_truncation) {
_iconsole_buffer.resize(count - 1);
}
return need_truncation;
}
/**
* Check whether the given TextColour is valid for console usage.

39
src/debug.cpp
View File

@@ -245,28 +245,31 @@ void CDECL debug(const char *dbg, const char *format, ...)
* For setting individual levels a string like \c "net=3,grf=6" should be used.
* If the string starts with a number, the number is used as global debugging level.
* @param s Text describing the wanted debugging levels.
* @param error_func The function to call if a parse error occurs.
*/
void SetDebugString(const char *s)
void SetDebugString(const char *s, void (*error_func)(const char *))
{
int v;
char *end;
const char *t;
/* global debugging level? */
/* Store planned changes into map during parse */
std::map<const char *, int> new_levels;
/* Global debugging level? */
if (*s >= '0' && *s <= '9') {
const DebugLevel *i;
v = strtoul(s, &end, 0);
s = end;
for (i = debug_level; i != endof(debug_level); ++i) *i->level = v;
for (i = debug_level; i != endof(debug_level); ++i) {
new_levels[i->name] = v;
}
}
/* individual levels */
/* Individual levels */
for (;;) {
const DebugLevel *i;
int *p;
/* skip delimiters */
while (*s == ' ' || *s == ',' || *s == '\t') s++;
if (*s == '\0') break;
@@ -275,10 +278,10 @@ void SetDebugString(const char *s)
while (*s >= 'a' && *s <= 'z') s++;
/* check debugging levels */
p = nullptr;
for (i = debug_level; i != endof(debug_level); ++i) {
const DebugLevel *found = nullptr;
for (const DebugLevel *i = debug_level; i != endof(debug_level); ++i) {
if (s == t + strlen(i->name) && strncmp(t, i->name, s - t) == 0) {
p = i->level;
found = i;
break;
}
}
@@ -286,13 +289,23 @@ void SetDebugString(const char *s)
if (*s == '=') s++;
v = strtoul(s, &end, 0);
s = end;
if (p != nullptr) {
*p = v;
if (found != nullptr) {
new_levels[found->name] = v;
} else {
ShowInfoF("Unknown debug level '%.*s'", (int)(s - t), t);
char buf[1024];
seprintf(buf, lastof(buf), "Unknown debug level '%*s'", (int)(s - t), t);
error_func(buf);
return;
}
}
/* Apply the changes after parse is successful */
for (const DebugLevel *i = debug_level; i != endof(debug_level); ++i) {
const auto &nl = new_levels.find(i->name);
if (nl != new_levels.end()) {
*i->level = nl->second;
}
}
}
/**

2
src/debug.h
View File

@@ -66,7 +66,7 @@ extern std::string _loadgame_DBGC_data;
void CDECL debug(const char *dbg, const char *format, ...) WARN_FORMAT(2, 3);
char *DumpDebugFacilityNames(char *buf, char *last);
void SetDebugString(const char *s);
void SetDebugString(const char *s, void (*error_func)(const char *));
const char *GetDebugString();
/* Shorter form for passing filename and linenumber */

2
src/engine.cpp
View File

@@ -76,6 +76,8 @@ Engine::Engine(VehicleType type, EngineID base)
/* Check if this base engine is within the original engine data range */
if (base >= _engine_counts[type]) {
/* 'power' defaults to zero, so we also have to default to 'wagon' */
if (type == VEH_TRAIN) this->u.rail.railveh_type = RAILVEH_WAGON;
/* Set model life to maximum to make wagons available */
this->info.base_life = 0xFF;
/* Set road vehicle tractive effort to the default value */

22
src/lang/catalan.txt
View File

@@ -854,7 +854,7 @@ STR_NEWS_NEW_TOWN :{BLACK}{BIG_FON
STR_NEWS_NEW_TOWN_UNSPONSORED :{BLACK}{BIG_FONT}S'ha fundat una nova població que es diu {TOWN}!
STR_NEWS_INDUSTRY_CONSTRUCTION :{BIG_FONT}{BLACK}No{G u va} {STRING} en construcció prop de {TOWN}
STR_NEWS_INDUSTRY_PLANTED :{BIG_FONT}{BLACK}S'està plantant {G un una} {G nou nova} {STRING} prop de {TOWN}
STR_NEWS_INDUSTRY_PLANTED :{BIG_FONT}{BLACK}Es planta {G un una} {G nou nova} {STRING} prop de {TOWN}
STR_NEWS_INDUSTRY_CLOSURE_GENERAL :{BIG_FONT}{BLACK}{STRING} anuncia el seu tancament imminent
STR_NEWS_INDUSTRY_CLOSURE_SUPPLY_PROBLEMS :{BIG_FONT}{BLACK}Problemes de subministrament fan que {STRING} anunciï el seu imminent tancament
@@ -887,9 +887,9 @@ STR_NEWS_VEHICLE_HAS_DUPLICATE_ENTRY :{WHITE}{VEHICLE
STR_NEWS_VEHICLE_HAS_INVALID_ENTRY :{WHITE}{VEHICLE} té una estació invàlida en les seves ordres
STR_NEWS_PLANE_USES_TOO_SHORT_RUNWAY :{WHITE}{VEHICLE} té en les seves ordres un aeroport amb pista d'aterratge massa curta
STR_NEWS_VEHICLE_IS_GETTING_OLD :{WHITE}{VEHICLE} s'està fent vell
STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD :{WHITE}{VEHICLE} s'està fent molt vell
STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND :{WHITE}{VEHICLE} s'està fent molt vell i necessita ser substituït urgentment
STR_NEWS_VEHICLE_IS_GETTING_OLD :{WHITE}{VEHICLE} és vell
STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD :{WHITE}{VEHICLE} és molt vell
STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND :{WHITE}{VEHICLE} és molt vell i necessita ser substituït urgentment
STR_NEWS_TRAIN_IS_STUCK :{WHITE}{VEHICLE} no pot trobar un camí per on continuar
STR_NEWS_VEHICLE_IS_LOST :{WHITE}{VEHICLE} s'ha perdut
STR_NEWS_VEHICLE_IS_UNPROFITABLE :{WHITE}El benefici del {VEHICLE} l'any passat va ser de {CURRENCY_LONG}
@@ -1622,8 +1622,8 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO :ISO (2008-12-31
STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME :Posa en pausa automàticament quan comenci una partida nova: {STRING}
STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME_HELPTEXT :Quan està activat, el joc es posa en pausa automàticament quan es comenci una partida nova, permetent a l'usuari estudiar el mapa més detalladament
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL :Accions permeses mentre s'està fent una pausa a la partida: {STRING}
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_HELPTEXT :Seleccioneu quines accions es poden realitzar mentre s'està fent una pausa a la partida.
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL :Accions permeses mentre la partida està en pausa: {STRING}
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_HELPTEXT :Seleccioneu quines accions es poden realitzar mentre la partida està en pausa.
###length 4
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS :Cap
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION :Totes, excepte les de construcció
@@ -2506,7 +2506,7 @@ STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS :nombre de jugad
STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS :connectant clients
STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL :manual
STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT :script de partida
STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH :s'està esperant que s'actualitzi el graf de distribució
STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH :s'espera que s'actualitzi el graf de distribució
STR_NETWORK_MESSAGE_CLIENT_LEAVING :deixant
STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} s'ha unit a la partida
@@ -3382,7 +3382,7 @@ STR_NEWGRF_LIST_MISSING :{RED}Arxius que
STR_NEWGRF_BROKEN :{WHITE}El comportament dels NewGRF '{0:STRING}' pot fer que la partida es pengi o es desincronitzi
STR_NEWGRF_BROKEN_POWERED_WAGON :{WHITE}Un vehicle '{1:ENGINE}' ha canviat el seu estat de vagó amb potència mentre estava fora de la cotxera
STR_NEWGRF_BROKEN_VEHICLE_LENGTH :{WHITE}Un vehicle '{1:ENGINE}' ha canviat la seva llargada mentre estava fora del dipòsit
STR_NEWGRF_BROKEN_CAPACITY :{WHITE}Un vehicle '{1:ENGINE}' ha canviat la seva capacitat mentre estava fora del dipòsit o no s'estava canviant el tipus de càrrega a transportar
STR_NEWGRF_BROKEN_CAPACITY :{WHITE}Un vehicle '{1:ENGINE}' ha canviat la seva capacitat mentre estava fora del dipòsit o no ha canviat el tipus de càrrega a transportar
STR_BROKEN_VEHICLE_LENGTH :{WHITE}El tren «{VEHICLE}» propietat de «{COMPANY}» té una llargada invàlida, probablement a causa de problemes amb els NewGRF. La partida podria dessincronitzar-se o fallar.
STR_NEWGRF_BUGGY :{WHITE}El NewGRF '{0:STRING}' està donant informació incorrecta
@@ -4544,7 +4544,7 @@ STR_AI_GAME_SCRIPT :{BLACK}Script d
STR_AI_GAME_SCRIPT_TOOLTIP :{BLACK}Mostra el registre de l'script de partida.
STR_ERROR_AI_NO_AI_FOUND :No s'ha trobat una IA adequada per carregar.{}Aquesta IA és una IA que no fa res.{}Podeu descarregar diverses IA via el sistema de «Contingut en línia».
STR_ERROR_AI_PLEASE_REPORT_CRASH :{WHITE}Un dels scripts que s'estava executant ha fallat. Si us plau, informeu l'autor de l'script amb una captura de pantalla de la finestra de depuració de l'script d'IA/partida.
STR_ERROR_AI_PLEASE_REPORT_CRASH :{WHITE}Un dels scripts que s'executava ha fallat. Si us plau, informeu l'autor de l'script amb una captura de pantalla de la finestra de depuració de l'script d'IA/partida.
STR_ERROR_AI_DEBUG_SERVER_ONLY :{YELLOW}La finestra de depuració dels scripts d'IA/partida només està disponible al servidor.
# AI configuration window
@@ -4641,7 +4641,7 @@ STR_MESSAGE_ESTIMATED_COST :{WHITE}Cost Est
STR_MESSAGE_ESTIMATED_INCOME :{WHITE}Ingressos Estimats: {CURRENCY_LONG}
# Saveload messages
STR_ERROR_SAVE_STILL_IN_PROGRESS :{WHITE}S'està desant la partida.{}Espera que acabi l'operació!
STR_ERROR_SAVE_STILL_IN_PROGRESS :{WHITE}Es desa la partida.{}Espera que acabi l'operació!
STR_ERROR_AUTOSAVE_FAILED :{WHITE}Ha fallat el desat automàtic
STR_ERROR_UNABLE_TO_READ_DRIVE :{BLACK}Impossible llegir la unitat de disc
STR_ERROR_GAME_SAVE_FAILED :{WHITE}Error guardant la partida{}{STRING}
@@ -4707,7 +4707,7 @@ STR_ERROR_CLEARING_LIMIT_REACHED :{WHITE}... s'ha
STR_ERROR_TREE_PLANT_LIMIT_REACHED :{WHITE}... s'ha arribat al límit de plantat d'arbres
STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}...el nom ha de ser únic.
STR_ERROR_GENERIC_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} en el camí
STR_ERROR_NOT_ALLOWED_WHILE_PAUSED :{WHITE}...no està permès mentre s'està en pausa.
STR_ERROR_NOT_ALLOWED_WHILE_PAUSED :{WHITE}...no està permès mentre la partida està en pausa.
# Local authority errors
STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Les autoritats locals de {TOWN} no permeten fer això

4
src/lang/dutch.txt
View File

@@ -1050,7 +1050,7 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM :4x Grootte
STR_GAME_OPTIONS_FONT_ZOOM :{BLACK}Lettergrootte
STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP :{BLACK}Hiermee kies je hoe groot de letters op het scherm moeten zijn
STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_AUTO :(auto-detect)Status: Vermist
STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_AUTO :(automatische detectie)
STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL :Normaal
STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM :Dubbele grootte
STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM :Viervoudige grootte
@@ -4485,7 +4485,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}Deze die
STR_TIMETABLE_STATUS_START_AT :{BLACK}Deze dienstregeling begint op {STRING}
STR_TIMETABLE_STARTING_DATE :{BLACK}Startdatum
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Selecteer een datum als startpunt voor deze dienstregeling. Ctrl + klik geeft het startpunt van deze dienstregeling en verdeelt alle voertuigen die deze orders delen gelijkmatig op basis van hun relatieve volgorde, als de order volledig is ingeroosterd.
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Selecteer een datum als startpunt voor deze dienstregeling. Ctrl + klik verdeelt alle voertuigen die deze orders delen gelijkmatig vanaf deze datum op basis van hun relatieve volgorde, als de order volledig is ingeroosterd.
STR_TIMETABLE_CHANGE_TIME :{BLACK}Tijd wijzigen
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Verander de tijdsduur die de geselecteerde order mag duren

577
src/lang/english_AU.txt
View File

File diff suppressed because it is too large Load Diff

2
src/lang/french.txt
View File

@@ -4486,7 +4486,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}Cet hora
STR_TIMETABLE_STATUS_START_AT :{BLACK}Cet horaire démarrera à {STRING}
STR_TIMETABLE_STARTING_DATE :{BLACK}Date de départ
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Choisir une date comme point de départ de cet horaire. Ctrl-clic pour définir le point de départ de cet horaire et répartir tous les véhicules partageant cet ordre uniformément selon leur ordre relatif, si l'ordre est complétement planifié
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Choisir une date comme point de départ de cet horaire. Ctrl-clic pour répartir tous les véhicules partageant cet ordre uniformément à partir de la date donnée selon leur ordre relatif, si l'ordre est complètement planifié
STR_TIMETABLE_CHANGE_TIME :{BLACK}Modifier la durée
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Modifier la durée de l'ordre sélectionné

2
src/lang/german.txt
View File

@@ -5790,7 +5790,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}Dieser F
STR_TIMETABLE_STATUS_START_AT :{BLACK}Dieser Fahrplan wird ab {STRING} in Kraft sein
STR_TIMETABLE_STARTING_DATE :{BLACK}Anfangsdatum
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Wähle ein Anfangsdatum für diesen Fahrplan aus. Mit Strg+Klick wird das Anfangsdatum dieses Fahrplans festgelegt und bei allen anderen Fahrzeugen, die nach demselben Fahrplan unterwegs sind, wird ein zeitlich versetztes Anfangsdatum gesetzt, so dass die Abstände zwischen den einzelnen Fahrzeugen immer gleich sind. Dazu muss der Fahrplan erst komplett erfasst worden sein.
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Wähle ein Anfangsdatum für diesen Fahrplan aus. Mit Strg+Klick wird bei allen Fahrzeugen, die nach demselben Fahrplan unterwegs sind, ein zeitlich versetztes Anfangsdatum gesetzt, so dass die Abstände zwischen den einzelnen Fahrzeugen immer gleich sind. Dazu muss der Fahrplan erst komplett erfasst worden sein.
STR_TIMETABLE_CHANGE_TIME :{BLACK}Zeit ändern
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Zeitrahmen für den markierten Auftrag ändern

18
src/lang/hindi.txt
View File

@@ -50,6 +50,7 @@ STR_CARGO_SINGULAR_TOFFEE :टॉफी
# Quantity of cargo
STR_QUANTITY_NOTHING :
STR_QUANTITY_VALUABLES :{COMMA}{NBSP}मूल्यवान वस्तुओं {P "का थैला" "के थैले"}
STR_QUANTITY_TOFFEE :{WEIGHT_LONG} टॉफी
# Two letter abbreviation of cargo name
STR_ABBREV_NOTHING :
@@ -117,6 +118,7 @@ STR_SCENEDIT_FILE_MENU_QUIT :निकास
###length 14
STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE :समायोजन
STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED :पथ-संकेतों के नाम दिखायें
STR_SETTINGS_MENU_TRANSPARENT_SIGNS :पारदर्शी संकेत
# File menu
###length 5
@@ -196,6 +198,7 @@ STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLA
# Company league window
STR_COMPANY_LEAGUE_COMPANY_NAME :{ORANGE}{COMPANY} {BLACK}{COMPANY_NUM} '{STRING}'
STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT :राष्ट्रपति
# Performance detail window
@@ -216,9 +219,11 @@ STR_HIGHSCORE_PRESIDENT_OF_COMPANY_ACHIEVES_STATUS :{BIG_FONT}{WHIT
# Smallmap window
###length 7
STR_SMALLMAP_TYPE_VEGETATION :वनस्पति
STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY :{TINY_FONT}{BLACK}ट्रक लदान वीथी
STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}खुरदरा भूमि
STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}रिक्त भूमि
STR_SMALLMAP_LEGENDA_TOWNS :{TINY_FONT}{BLACK}नगर
@@ -465,6 +470,7 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :बैंगन
###length 3
STR_CONFIG_SETTING_SCROLLWHEEL_SCROLL :स्क्रॉल नक्शा
###length 4
STR_CONFIG_SETTING_OSK_ACTIVATION_DISABLED :अक्षम
@@ -505,6 +511,7 @@ STR_CONFIG_SETTING_SOUND_NEWS :समाचा
STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT :एक कंपनी के पास जहाजों की अधिकतम संख्या
@@ -564,6 +571,7 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE :नगर म
###length 4
STR_CONFIG_SETTING_TOOLBAR_POS :मुख्य टूलबार की स्थिति: {STRING}
###setting-zero-is-special
STR_CONFIG_SETTING_SOFT_LIMIT_VALUE :{COMMA}
###setting-zero-is-special
@@ -632,6 +640,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}क्
# Livery window
STR_LIVERY_TRAIN_TOOLTIP :{BLACK} ट्रेन रंग योजनाएं दिखाएं
###length 23
@@ -706,6 +715,7 @@ STR_CONTENT_DETAIL_SUBTITLE_DOES_NOT_EXIST :{SILVER}यह
# Order of these is important!
STR_CONTENT_TYPE_GS_LIBRARY :जीएस लाइब्रेरी
# Content downloading progress window
STR_CONTENT_DOWNLOAD_COMPLETE :{WHITE}डाउनलोड पूरा हुआ
@@ -1059,6 +1069,7 @@ STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}
###length VEHICLE_TYPES
###length VEHICLE_TYPES
STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP :{BLACK}डिपो में सभी सड़क वाहन बेचते हैं
###length VEHICLE_TYPES
@@ -1187,6 +1198,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS :के बर
STR_ORDER_NEAREST_DEPOT :निकटतम
###length 3
STR_ORDER_TRAIN_DEPOT :ट्रेन डिपो
###next-name-looks-similar
STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT :{STRING} {STRING} {STRING}
@@ -1194,8 +1206,10 @@ STR_ORDER_GO_TO_DEPOT_FORMAT :{STRING} {DEPOT
STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING}
STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION :{PUSH_COLOUR}{RED}(स्टेशन का उपयोग नहीं कर सकते){POP_COLOUR} {STRING} {STATION} {STRING}
STR_ORDER_NO_LOAD :(कोई लोडिंग नहीं)
@@ -1305,6 +1319,7 @@ STR_ERROR_TOO_MANY_STATIONS_LOADING :{WHITE}अत
STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE} स्थानीय डिपो के लिए मार्ग खोजने में असमर्थ
# Autoreplace related errors
@@ -1315,6 +1330,7 @@ STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK :{WHITE}पट
# Road construction errors
STR_ERROR_CAN_T_CONVERT_TRAMWAY :{WHITE} ट्राम प्रकार को यहाँ परिवर्तित नहीं कर सकते ...
# Waterway construction errors
STR_ERROR_MUST_BE_BUILT_ON_WATER :{WHITE}... पानी पर बनाया जाना चाहिये।
@@ -1406,6 +1422,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COAL_CAR :कोयला
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FRUIT_TRUCK :फल वाहन
STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_X2001_ELECTRIC :'X2001' (विद्युतीय)
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOY_VAN :खिलौनों का डब्बा
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FIZZY_DRINK_TRUCK :फ़िज़ी ड्रिंक ट्रक
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WATER_TANKER :पानी का टैंकर
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BUBBLE_VAN :बबल वैन
@@ -1414,6 +1431,7 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_PLODDYPHUT_MKIII_BUS :प्लॉड
STR_VEHICLE_NAME_ROAD_VEHICLE_MORELAND_WOOD_TRUCK :मोरलैंड काष्ठ ट्रक
STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_ARMORED_TRUCK :फोस्टर कवचयुक्त ट्रक
STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_CANDY_TRUCK :पावरनोट मिष्ठान्न ट्रक
STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BUBBLE_TRUCK :Wizzowow बबल ट्रक
###length 11

43
src/lang/hungarian.txt
View File

@@ -1101,6 +1101,7 @@ STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART :{WHITE}Ez a be
STR_GAME_OPTIONS_VIDEO_VSYNC :{BLACK}VSync (Vertikális Szinkronizáció)
STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK}Jelöld be ezt a négyzetet hogy engedélyezd a v-sync-et. A változtatás csak a játék újraindítása után fog érvényesülni. Kizárólag hardware gyorsítással működik!
STR_GAME_OPTIONS_VIDEO_DRIVER_INFO :{BLACK}Jelenlegi meghajtó: {STRING}
STR_GAME_OPTIONS_GUI_ZOOM_FRAME :{BLACK}Felület mérete
STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP :{BLACK}Használni kívánt felületméret kiválasztása
@@ -1229,9 +1230,10 @@ STR_TERRAIN_TYPE_CUSTOM :Egyéni magass
STR_TERRAIN_TYPE_CUSTOM_VALUE :Egyéni magasság ({NUM})
###length 4
STR_CITY_APPROVAL_LENIENT :Részrehajló
STR_CITY_APPROVAL_TOLERANT :Toleráns
STR_CITY_APPROVAL_HOSTILE :Ellenséges
STR_CITY_APPROVAL_PERMISSIVE :Engedékeny
STR_CITY_APPROVAL_PERMISSIVE :Engedékeny (nincs hatással a cég tevékenységére)
STR_WARNING_NO_SUITABLE_AI :{WHITE}Nincsen megfelelő MI...{}Letölthetsz néhány MI-t a tartalomletöltő rendszeren keresztül
@@ -1332,8 +1334,8 @@ STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT :Ha engedélyezv
STR_CONFIG_SETTING_DISASTERS :Katasztrófák: {STRING}
STR_CONFIG_SETTING_DISASTERS_HELPTEXT :Ha engedélyezve van, néha katasztrófa történhet, ami megállíthatja vagy megsemmisítheti a járműveket és az infrastruktúrát
STR_CONFIG_SETTING_CITY_APPROVAL :Városi tanács hozzáállása a területének az átépítéséhez: {STRING}
STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Válaszd ki, hogy mennyi zaj és környezeti kár okozása befolyásolja a cég megítélését egy városban, mely hatással van a cég további építési lehetőségeire a város területén belül
STR_CONFIG_SETTING_CITY_APPROVAL :Helyi hatóság hozzáállása: {STRING}
STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Válaszd ki, hogy mennyi zaj és környezeti kár okozása befolyásolja a cég megítélését egy városban, mely hatással van a cég további építési lehetőségeire az adott városban
STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT :Térkép magasságkorlátja: {STRING}
STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_HELPTEXT :Beállíthatod a térkép legmagasabb pontjának tengerszint feletti magasságát. "(automatikus)" esetén az értéket a térképgenerátor határozza meg.
@@ -1603,7 +1605,13 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN :Zöld
STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Sötétzöld
STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Sötétkék
STR_CONFIG_SETTING_LINKGRAPH_COLOURS :Rakományáramlási átfedési színek: {STRING}
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_HELPTEXT :Rakományáramlási átfedési színséma beállítása.
###length 4
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_RED :Zöldről pirosra (eredeti)
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_BLUE :Zöldből kékbe
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Szürkéről pirosra
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Szürkeárnyalat
STR_CONFIG_SETTING_SCROLLMODE :A látkép mozgatása: {STRING}
STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :A látkép mozgatásának módja
@@ -3692,22 +3700,33 @@ STR_FINANCES_CAPTION :{WHITE}{COMPANY
STR_FINANCES_YEAR :{WHITE}{NUM}
###length 3
STR_FINANCES_REVENUE_TITLE :{WHITE}Jövedelem
STR_FINANCES_OPERATING_EXPENSES_TITLE :{WHITE}Működési Költségek
STR_FINANCES_CAPITAL_EXPENSES_TITLE :{WHITE}Tőke Költségek
###length 13
STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Építkezés
STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Új járművek
STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Vonat működtetési költség
STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Közúti jármű műk. költség
STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Repülőgép műk. költség
STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Hajó működtetési költség
STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Vonatok
STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Közúti Járművek
STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Repülőgép
STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Hajók
STR_FINANCES_SECTION_INFRASTRUCTURE :{GOLD}Infrastruktúra
STR_FINANCES_SECTION_TRAIN_REVENUE :{GOLD}Vonatok
STR_FINANCES_SECTION_ROAD_VEHICLE_REVENUE :{GOLD}Közúti Járművek
STR_FINANCES_SECTION_AIRCRAFT_REVENUE :{GOLD}Repülőgép
STR_FINANCES_SECTION_SHIP_REVENUE :{GOLD}Hajók
STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Kölcsön kamata
STR_FINANCES_SECTION_OTHER :{GOLD}Egyéb
STR_FINANCES_NEGATIVE_INCOME :{BLACK}-{CURRENCY_LONG}
STR_FINANCES_POSITIVE_INCOME :{BLACK}+{CURRENCY_LONG}
STR_FINANCES_NEGATIVE_INCOME :-{CURRENCY_LONG}
STR_FINANCES_POSITIVE_INCOME :+{CURRENCY_LONG}
STR_FINANCES_NET_PROFIT :{WHITE}Nettó Profit
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Banki egyenleg
STR_FINANCES_OWN_FUNDS_TITLE :{WHITE}Saját források
STR_FINANCES_LOAN_TITLE :{WHITE}Kölcsön
STR_FINANCES_INTEREST_RATE :{WHITE}Banki hitel Kamat: {BLACK}{NUM}%
STR_FINANCES_MAX_LOAN :{WHITE}Max. kölcsön: {BLACK}{CURRENCY_LONG}
STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG}
STR_FINANCES_BORROW_BUTTON :{BLACK}Kölcsönkér {CURRENCY_LONG}
@@ -4290,8 +4309,8 @@ STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE :{LTBLUE}{ENGINE
STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE :{LTBLUE}{ENGINE}{BLACK} Érték: {LTBLUE}{CURRENCY_LONG}
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT :{BLACK}Teljes szállítási kapacitása ennek a vonatnak:
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT})
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) (x{NUM})
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT})
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT}) (x{NUM})
STR_VEHICLE_DETAILS_CARGO_EMPTY :{LTBLUE}Üres
STR_VEHICLE_DETAILS_CARGO_FROM :{LTBLUE}{CARGO_LONG} {STATION} állomásról
@@ -4530,7 +4549,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}A menetr
STR_TIMETABLE_STATUS_START_AT :{BLACK}A menetrend megkezdésének dátuma {STRING}
STR_TIMETABLE_STARTING_DATE :{BLACK}Indulás dátuma
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Menetrend kezdeti dátumának kiválasztása. A ctrl+kattintás azon kívül, hogy beállítja ennek a menetrendnek a kezdetét, egyenletesen elosztja az ezen a menetrenden osztozó járműveket a jelenlegi utasításuk alapján, amennyiben a menetrend teljesen időzítve van.
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Menetrend kezdeti dátumának kiválasztása. A ctrl+kattintás egyenletesen elosztja az ezen a menetrenden osztozó járműveket a kezdeti dátumtól fogva a jelenlegi utasításuk alapján, amennyiben a menetrend teljesen időzítve van.
STR_TIMETABLE_CHANGE_TIME :{BLACK}Idő megváltoztatása
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}A kijelölt utasítás végrehajtási idejét változtatja meg

2
src/lang/indonesian.txt
View File

@@ -4485,7 +4485,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}Jadwal m
STR_TIMETABLE_STATUS_START_AT :{BLACK}Jadwal ini akan dimulai pada {STRING}
STR_TIMETABLE_STARTING_DATE :{BLACK}Tanggal mulai
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Pilih sebarang hari sebagai titik mula timetable. Ctrl+Click akan men-set titik awal timetable dan akan menyebarkan semua kendaraan yang berorder sama secara merata berdasarkan order relatif, jika order tersebut sepenuhnya terjadwalkan.
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Pilih tanggal titik mula timetable. Ctrl+Click untuk mendistribusikan semua kendaraan dengan instruksi sama secara merata dari tanggal yang telah dipilih berdasarkan instruksi relatif tiap kendaraan, hanya jika intruksi tersebut sepenuhnya terjadwal.
STR_TIMETABLE_CHANGE_TIME :{BLACK}Ubah Durasi
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Ubah jumlah waktu yang seharusnya dibutuhkan, pada tujuan yang terpilih

2
src/lang/italian.txt
View File

@@ -4525,7 +4525,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}Il viagg
STR_TIMETABLE_STATUS_START_AT :{BLACK}Il viaggio inizierà in data {STRING}
STR_TIMETABLE_STARTING_DATE :{BLACK}Data iniziale
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Seleziona una data come punto di partenza della tabella oraria. CTRL+clic imposta la data iniziale di questa tabella oraria per tutti i veicoli che condividono gli ordini, distribuendole equamente in base in base al loro ordinamento relativo, ammesso che i tempi siano tutti specificati
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Seleziona una data come punto di partenza della tabella oraria. Ctrl+click distribuisce tutti i veicoli che condividono questo ordine in modo uniforme dalla data indicata in base al loro ordine relativo, se l'ordine è completamente programmato.
STR_TIMETABLE_CHANGE_TIME :{BLACK}Cambia tempo
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Cambia la quantità di tempo che dovrebbe essere impiegata per l'ordine selezionato

16
src/lang/korean.txt
View File

@@ -843,13 +843,13 @@ STR_MESSAGE_NEWS_FORMAT :{STRING} - {S
STR_NEWS_MESSAGE_CAPTION :{WHITE}메시지
STR_NEWS_CUSTOM_ITEM :{BIG_FONT}{BLACK}{STRING}
STR_NEWS_FIRST_TRAIN_ARRIVAL :{BIG_FONT}{BLACK}시민들이 축하하고 있습니다 . . .{}{STATION}에 처음으로 열차가 도착했습니다!
STR_NEWS_FIRST_BUS_ARRIVAL :{BIG_FONT}{BLACK}시민들이 축하하고 있습니다 . . .{}{STATION}에 처음으로 버스가 도착했습니다!
STR_NEWS_FIRST_TRUCK_ARRIVAL :{BIG_FONT}{BLACK}시민들이 축하하고 있습니다 . . .{}{STATION}에 처음으로 트럭이 도착했습니다!
STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL :{BIG_FONT}{BLACK}시민들이 축하하고 있습니다 . . .{}{STATION}에 처음으로 여객 전차가 도착했습니다!
STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL :{BIG_FONT}{BLACK}시민들이 축하하고 있습니다 . . .{}{STATION}에 처음으로 화물 전차가 도착했습니다!
STR_NEWS_FIRST_SHIP_ARRIVAL :{BIG_FONT}{BLACK}시민들이 축하하고 있습니다 . . .{}{STATION}에 처음으로 선박이 도착했습니다!
STR_NEWS_FIRST_AIRCRAFT_ARRIVAL :{BIG_FONT}{BLACK}시민들이 축하하고 있습니다 . . .{}{STATION}에 처음으로 항공기가 도착했습니다!
STR_NEWS_FIRST_TRAIN_ARRIVAL :{BIG_FONT}{BLACK}시민들이 기뻐합니다 . . .{}{STATION}에 처음으로 열차가 도착했습니다!
STR_NEWS_FIRST_BUS_ARRIVAL :{BIG_FONT}{BLACK}시민들이 기뻐합니다 . . .{}{STATION}에 처음으로 버스가 도착했습니다!
STR_NEWS_FIRST_TRUCK_ARRIVAL :{BIG_FONT}{BLACK}시민들이 기뻐합니다 . . .{}{STATION}에 처음으로 트럭이 도착했습니다!
STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL :{BIG_FONT}{BLACK}시민들이 기뻐합니다 . . .{}{STATION}에 처음으로 여객 전차가 도착했습니다!
STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL :{BIG_FONT}{BLACK}시민들이 기뻐합니다 . . .{}{STATION}에 처음으로 화물 전차가 도착했습니다!
STR_NEWS_FIRST_SHIP_ARRIVAL :{BIG_FONT}{BLACK}시민들이 기뻐합니다 . . .{}{STATION}에 처음으로 선박이 도착했습니다!
STR_NEWS_FIRST_AIRCRAFT_ARRIVAL :{BIG_FONT}{BLACK}시민들이 기뻐합니다 . . .{}{STATION}에 처음으로 항공기가 도착했습니다!
STR_NEWS_TRAIN_CRASH :{BIG_FONT}{BLACK}열차 충돌 사고!{}충돌로 인한 폭발로 {COMMA}명의 사망자가 발생하였습니다!
STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER :{BIG_FONT}{BLACK}차량 충돌!{}열차 충돌로 운전자가 사망했습니다!
@@ -5799,7 +5799,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}이 시
STR_TIMETABLE_STATUS_START_AT :{BLACK}이 시간표는 {STRING}에 시작될 것입니다
STR_TIMETABLE_STARTING_DATE :{BLACK}시작 날짜
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}이 시간표의 시작 날짜를 선택하세요. CTRL+클릭하면 이 차량과 경로를 공유하는 모든 차량에 대하여, 만약 시간표가 완전히 작성되어 있다면 그 경로의 상대적인 순서에 따라 시간표의 시작점을 설정하고 적절히 분배합니다
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}이 시간표의 시작 날짜를 선택하세요. CTRL+클릭하면, 시간표가 모두 작성되어 있다는 가정 하에, 주어진 경로를 기반으로 설정한 날짜부터 이 경로를 공유하는 모든 차량을 균등하게 출발시킵니다
STR_TIMETABLE_CHANGE_TIME :{BLACK}시간값 변경
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}선택한 경로에서 소요되는 시간 값을 변경합니다

43
src/lang/latvian.txt
View File

@@ -1039,6 +1039,7 @@ STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART :{WHITE}Šis ies
STR_GAME_OPTIONS_VIDEO_VSYNC :{BLACK}VSync
STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK}Atzīmējiet šo izvēlni, lai sinhronizētu ekrānu. Mainīts iestatījums tiks piemērots tikai pēc spēles restartēšanas. Darbojas tikai ar iespējotu aparatūras paātrinājumu
STR_GAME_OPTIONS_VIDEO_DRIVER_INFO :{BLACK}Esošais vadītājs: {STRING}
STR_GAME_OPTIONS_GUI_ZOOM_FRAME :{BLACK}Lietotāja saskarnes lielums
STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP :{BLACK}Lietotāja saskarnes elementu lieluma izvēle
@@ -1167,9 +1168,10 @@ STR_TERRAIN_TYPE_CUSTOM :Pielāgots augs
STR_TERRAIN_TYPE_CUSTOM_VALUE :Pielāgots augstums ({NUM})
###length 4
STR_CITY_APPROVAL_LENIENT :Mīksts
STR_CITY_APPROVAL_TOLERANT :iecietīga
STR_CITY_APPROVAL_HOSTILE :naidīga
STR_CITY_APPROVAL_PERMISSIVE :pieļaujoša
STR_CITY_APPROVAL_PERMISSIVE :Pieļaujoša (nav efekta kompānijas darbībām)
STR_WARNING_NO_SUITABLE_AI :{WHITE}Nav pieejami derīgi MI...{}Jūs varat lejuplādēt dažādus MI, izmantojot sistēmu 'Tiešsaistes saturs'
@@ -1270,8 +1272,8 @@ STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT :Ja ieslēgts, s
STR_CONFIG_SETTING_DISASTERS :Katastrofas: {STRING}
STR_CONFIG_SETTING_DISASTERS_HELPTEXT :Pārslēgt katastrofas, kas laiku pa laikam var bloķēt vai iznīcināt transportlīdzekļus un infrastruktūru
STR_CONFIG_SETTING_CITY_APPROVAL :Pilsētu domju attieksme pret platības pārstrukturēšanu: {STRING}
STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Izvēlieties, cik lielā mērā trokšņi un vides bojājumi ietekmē uzņēmuma reitingu un turpmākās būvniecības darbības viņu teritorijā
STR_CONFIG_SETTING_CITY_APPROVAL :Vietējās pašvaldības attieksme: {STRING}
STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT :Izvēlieties, cik lielā mērā trokšņi un vides bojājumi ietekmē uzņēmuma reitingu un turpmākās būvniecības darbības pilsētā
STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT :Kartes augstuma ierobežojums: {STRING}
STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_HELPTEXT :Iestatiet kartes reljefa maksimālo augstumu. Izmantojot "(auto)", laba vērtība tiks izvēlēta pēc reljefa ģenerēšanas
@@ -1541,7 +1543,13 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN :zaļa
STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :{G=f}tumši zaļa
STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :{G=f}violeta
STR_CONFIG_SETTING_LINKGRAPH_COLOURS :Kravas plūsmu pārklājuma krāsas: {STRING}
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_HELPTEXT :Iestatiet kravas plūsmu pārklājumam izmantoto krāsu shēmu.
###length 4
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_RED :Zaļš uz sarkanu (orģināli)
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_BLUE :Zaļš uz zilu
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Pelēks uz sarkanu
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Pelēktonis
STR_CONFIG_SETTING_SCROLLMODE :Skatvietas ritināšanas uzvedība: {STRING}
STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Uzvedība, kad ritina karti
@@ -3638,22 +3646,33 @@ STR_FINANCES_CAPTION :{WHITE}{COMPANY
STR_FINANCES_YEAR :{WHITE}{NUM}
###length 3
STR_FINANCES_REVENUE_TITLE :{WHITE}Ieņēmumi
STR_FINANCES_OPERATING_EXPENSES_TITLE :{WHITE}Ekspluatācijas izdevumi
STR_FINANCES_CAPITAL_EXPENSES_TITLE :{WHITE}Kapitāla Izdevumi
###length 13
STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Būvniecība
STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Jauni transportlīdzekļi
STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Vilcienu kārtējās izmaksas
STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Autotransporta kārtējās izmaksas
STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Lidaparātu kārtējās izmaksas
STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Kuģu kārtējās izmaksas
STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Vilcieni
STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Autotransportlīdzekļi
STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Lidaparāts
STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Kuģi
STR_FINANCES_SECTION_INFRASTRUCTURE :{GOLD}Infrastruktūra
STR_FINANCES_SECTION_TRAIN_REVENUE :{GOLD}Vilcieni
STR_FINANCES_SECTION_ROAD_VEHICLE_REVENUE :{GOLD}Autotransportlīdzekļi
STR_FINANCES_SECTION_AIRCRAFT_REVENUE :{GOLD}Lidaparāts
STR_FINANCES_SECTION_SHIP_REVENUE :{GOLD}Kuģi
STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Aizdevuma procents
STR_FINANCES_SECTION_OTHER :{GOLD}Citi
STR_FINANCES_NEGATIVE_INCOME :{BLACK}-{CURRENCY_LONG}
STR_FINANCES_POSITIVE_INCOME :{BLACK}+{CURRENCY_LONG}
STR_FINANCES_NEGATIVE_INCOME :-{CURRENCY_LONG}
STR_FINANCES_POSITIVE_INCOME :+{CURRENCY_LONG}
STR_FINANCES_NET_PROFIT :{WHITE}Tīrā peļņa
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Bankas bilance
STR_FINANCES_OWN_FUNDS_TITLE :{WHITE}Pašu līdzekļi
STR_FINANCES_LOAN_TITLE :{WHITE}Aizdevums
STR_FINANCES_INTEREST_RATE :{WHITE}Aizdevuma procenti: {BLACK}{NUM}%
STR_FINANCES_MAX_LOAN :{WHITE}Maksimālais aizdevums: {BLACK}{CURRENCY_LONG}
STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG}
STR_FINANCES_BORROW_BUTTON :{BLACK}Aizņemties {CURRENCY_LONG}
@@ -4237,8 +4256,8 @@ STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE :{LTBLUE}{ENGINE
STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE :{LTBLUE}{ENGINE}{BLACK} Vērtība: {LTBLUE}{CURRENCY_LONG}
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT :{BLACK}Kopējā kravas ietilpība:
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT})
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) (x{NUM})
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT})
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT}) (x{NUM})
STR_VEHICLE_DETAILS_CARGO_EMPTY :{LTBLUE}Tukšs
STR_VEHICLE_DETAILS_CARGO_FROM :{LTBLUE}{CARGO_LONG} no {STATION}
@@ -4477,7 +4496,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}Šis sar
STR_TIMETABLE_STATUS_START_AT :{BLACK}Šis saraksts sāksies {STRING}
STR_TIMETABLE_STARTING_DATE :{BLACK}Sākuma datums
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Izvēlieties šī kustības saraksta sākuma datumu. Ctrl+klikšķis iestata šī saraksta sākuma datumu un vienmērīgi izplata to starp visiem transporta līdzekļiem, kuri seko šim rīkojumam, ja kustības saraksts ir pilnībā aizpildīts
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Izvēlieties datumu kā šī kustību saraksta sākuma punktu. Ctrl+Click vienmērīgi sadala visus transportlīdzekļus, kas koplieto šo pasūtījumu no norādītā datuma, pamatojoties uz to plānoto pasūtījumu, ja pasūtījums pilnībā izmanto kustību sarakstu
STR_TIMETABLE_CHANGE_TIME :{BLACK}Mainīt laiku
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Mainīt iezīmētajam maršrutam nepieciešamo laiku

2
src/lang/polish.txt
View File

@@ -4871,7 +4871,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}Ten rozk
STR_TIMETABLE_STATUS_START_AT :{BLACK}Ten rozkład jazdy rozpocznie się {STRING}
STR_TIMETABLE_STARTING_DATE :{BLACK}Data początkowa
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Wybierz początkową datę rozkładu jazdy. Ctrl+klik ustawia startowy punkt tego rozkładu oraz, jeśli ten jest kompletny, rozdziela go po kolei wszystkim pojazdom współdzielącym go, zależnie od ich kolejności ułożenia
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Wybierz początkową datę rozkładu jazdy. Ctrl+klik rozłoży równomierne wszystkie pojazdy współdzielące ten rozkład, począwszy od podanej daty, zgodnie z ich kolejnością, o ile rozkład ten jest kompletny
STR_TIMETABLE_CHANGE_TIME :{BLACK}Zmień czas
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Zmień ilość czasu którą zaznaczone zadanie powinno zająć

36
src/lang/romanian.txt
View File

@@ -1037,6 +1037,7 @@ STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART :{WHITE}Setarea
STR_GAME_OPTIONS_VIDEO_VSYNC :{BLACK}VSync
STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK}Bifați această căsuță pentru sincronizarea verticală a imaginii. Modificarea setării va fi aplicată doar după repornirea jocului și funcționează doar cu accelerarea hardware activată
STR_GAME_OPTIONS_VIDEO_DRIVER_INFO :{BLACK}Driver curent: {STRING}
STR_GAME_OPTIONS_GUI_ZOOM_FRAME :{BLACK}Mărime interfată
STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP :{BLACK}Alege mărimea elementelor de interfaţa
@@ -1540,7 +1541,13 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN :Verde
STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Verde închis
STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Mov
STR_CONFIG_SETTING_LINKGRAPH_COLOURS :Anvelopā de culori pentru flux încārcāturā: {STRING}
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_HELPTEXT :Schemă de culori pentru anvelopă flux încărcătură.
###length 4
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_RED :Din verde în roșu (original)
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREEN_TO_BLUE :Din verde în albastru
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Din gri în roșu
STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Tonuri de gri
STR_CONFIG_SETTING_SCROLLMODE :Comportament derulare vizor: {STRING}
STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Comportamentul derulării hărții
@@ -3629,22 +3636,33 @@ STR_FINANCES_CAPTION :{WHITE}Situaţi
STR_FINANCES_YEAR :{WHITE}{NUM}
###length 3
STR_FINANCES_REVENUE_TITLE :{WHITE}Venit
STR_FINANCES_OPERATING_EXPENSES_TITLE :{WHITE}Cheltuieli operaționale
STR_FINANCES_CAPITAL_EXPENSES_TITLE :{WHITE}Cheltuieli Capital
###length 13
STR_FINANCES_SECTION_CONSTRUCTION :{GOLD}Construcţii
STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Vehicule noi
STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Costuri trenuri
STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Costuri de exploatare autovehicule
STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Costuri aeronave
STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Costuri nave
STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Trenuri
STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Autovehicule
STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Aeronave
STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Nave
STR_FINANCES_SECTION_INFRASTRUCTURE :{GOLD}Infrastructură
STR_FINANCES_SECTION_TRAIN_REVENUE :{GOLD}Trenuri
STR_FINANCES_SECTION_ROAD_VEHICLE_REVENUE :{GOLD}Autovehicule
STR_FINANCES_SECTION_AIRCRAFT_REVENUE :{GOLD}Avion
STR_FINANCES_SECTION_SHIP_REVENUE :{GOLD}Nave
STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Dobânda la credit
STR_FINANCES_SECTION_OTHER :{GOLD}Altele
STR_FINANCES_NEGATIVE_INCOME :{BLACK}-{CURRENCY_LONG}
STR_FINANCES_POSITIVE_INCOME :{BLACK}+{CURRENCY_LONG}
STR_FINANCES_NEGATIVE_INCOME :-{CURRENCY_LONG}
STR_FINANCES_POSITIVE_INCOME :+{CURRENCY_LONG}
STR_FINANCES_NET_PROFIT :{WHITE}Profit Net
STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Balanţă curentă
STR_FINANCES_OWN_FUNDS_TITLE :{WHITE}Fonduri proprii
STR_FINANCES_LOAN_TITLE :{WHITE}Credite
STR_FINANCES_INTEREST_RATE :{WHITE}Dobândā la credit: {BLACK}{NUM}%
STR_FINANCES_MAX_LOAN :{WHITE}Limită credit: {BLACK}{CURRENCY_LONG}
STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG}
STR_FINANCES_BORROW_BUTTON :{BLACK}Împrumută {CURRENCY_LONG}
@@ -4227,8 +4245,8 @@ STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE :{LTBLUE}{ENGINE
STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE :{LTBLUE}{ENGINE}{BLACK} Valoare: {LTBLUE}{CURRENCY_LONG}
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT :{BLACK}Încãrcãtura totalã (capacitatea) acestui tren:
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT})
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) (x{NUM})
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT})
STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}{CARGO_LONG} ({CARGO_SHORT}) (x{NUM})
STR_VEHICLE_DETAILS_CARGO_EMPTY :{LTBLUE}Gol
STR_VEHICLE_DETAILS_CARGO_FROM :{LTBLUE}{CARGO_LONG} de la {STATION}
@@ -4467,7 +4485,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}Acest or
STR_TIMETABLE_STATUS_START_AT :{BLACK}Acest orar va începe la {STRING}
STR_TIMETABLE_STARTING_DATE :{BLACK}Dată pornire
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Alege o dată ca punct de pornire pentru acest orar. Ctrl+clic setează punctul de pornire al acestui orar și distribuie uniform comanda tuturor vehiculelor în cu comenzi similare, dacă comenzile au un orar complet
STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Alege o dată ca punct de pornire pentru acest orar. Ctrl+clic distribuie toate vehiculele uniform de la data setată bazată pe comenzile relative, dacă comenzile au un orar complet
STR_TIMETABLE_CHANGE_TIME :{BLACK}Modifică timpul
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Modifică durata de timp alocată comenzii selectate

4
src/openttd.cpp
View File

@@ -728,7 +728,7 @@ int openttd_main(int argc, char *argv[])
videodriver = "dedicated";
blitter = "null";
dedicated = true;
SetDebugString("net=3");
SetDebugString("net=3", ShowInfo);
if (mgo.opt != nullptr) {
scanner->dedicated_host = ParseFullConnectionString(mgo.opt, scanner->dedicated_port);
}
@@ -752,7 +752,7 @@ int openttd_main(int argc, char *argv[])
#if defined(_WIN32)
CreateConsole();
#endif
if (mgo.opt != nullptr) SetDebugString(mgo.opt);
if (mgo.opt != nullptr) SetDebugString(mgo.opt, ShowInfo);
break;
}
case 'e': _switch_mode = (_switch_mode == SM_LOAD_GAME || _switch_mode == SM_LOAD_SCENARIO ? SM_LOAD_SCENARIO : SM_EDITOR); break;

2
src/walltime_func.h
View File

@@ -65,7 +65,7 @@ struct Time {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif /* _MSC_VER */
return strftime(buffer, last - buffer, format, &time_struct);
return strftime(buffer, last - buffer + 1, format, &time_struct);
#ifndef _MSC_VER
#pragma GCC diagnostic pop
#endif /* _MSC_VER */