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

Merge PR #268 into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-06-14 00:53:59 +01:00
parent 229f856327 fd4b5cc083
commit 2cd1740c01
71 changed files with 385 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/graph_gui.cpp
View File

@@ -22,6 +22,7 @@
#include "core/geometry_func.hpp"
#include "currency.h"
#include "zoom_func.h"
#include "unit_conversion.h"
#include "widgets/graph_widget.h"
@@ -39,6 +40,8 @@ static CargoTypes _legend_excluded_cargo;
static const OverflowSafeInt64 INVALID_DATAPOINT(INT64_MAX); // Value used for a datapoint that shouldn't be drawn.
static const uint INVALID_DATAPOINT_POS = UINT_MAX; // Used to determine if the previous point was drawn.
uint8 _cargo_payment_x_mode;
/****************/
/* GRAPH LEGEND */
/****************/
@@ -887,19 +890,40 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
this->num_on_x_axis = 20;
this->num_vert_lines = 20;
this->month = 0xFF;
this->x_values_start = 10;
this->x_values_increment = 10;
this->SetXAxis();
this->CreateNestedTree();
this->vscroll = this->GetScrollbar(WID_CPR_MATRIX_SCROLLBAR);
this->vscroll->SetCount(_sorted_standard_cargo_specs_size);
this->SetWidgetLoweredState(WID_CPR_DAYS, _cargo_payment_x_mode == 0);
this->SetWidgetLoweredState(WID_CPR_SPEED, _cargo_payment_x_mode == 1);
/* Initialise the dataset */
this->OnHundredthTick();
this->FinishInitNested(window_number);
}
void SetXAxis()
{
uint16 x_scale = 10;
if (_cargo_payment_x_mode) {
switch (_settings_game.locale.units_velocity) {
case 2:
x_scale = 5;
break;
case 3:
x_scale = 1;
break;
default:
x_scale = 10;
}
}
this->x_values_start = x_scale;
this->x_values_increment = x_scale;
}
void OnInit() override
{
/* Width of the legend blob. */
@@ -1018,6 +1042,16 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
}
break;
}
case WID_CPR_DAYS:
case WID_CPR_SPEED:
_cargo_payment_x_mode = widget - WID_CPR_DAYS;
this->SetWidgetLoweredState(WID_CPR_DAYS, _cargo_payment_x_mode == 0);
this->SetWidgetLoweredState(WID_CPR_SPEED, _cargo_payment_x_mode == 1);
this->SetXAxis();
this->OnHundredthTick();
this->SetDirty();
break;
}
}
@@ -1039,6 +1073,7 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
void OnInvalidateData(int data = 0, bool gui_scope = true) override
{
if (!gui_scope) return;
this->SetXAxis();
this->OnHundredthTick();
}
@@ -1048,15 +1083,32 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
int i = 0;
const CargoSpec *cs;
const float factor = 200.0f * 28.57f * 0.4f * ConvertSpeedToUnitDisplaySpeed(1 << 16) / (1.6f * static_cast<float>(1 << 16));
FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
this->colours[i] = cs->legend_colour;
for (uint j = 0; j != 20; j++) {
this->cost[i][j] = GetTransportedGoodsIncome(10, 20, j * 4 + 4, cs->Index());
for (int j = 0; j != 20; j++) {
const byte ctt = _cargo_payment_x_mode ? static_cast<byte>(factor / static_cast<float>((j + 1) * this->x_values_increment)) : (j + 1) * 4;
this->cost[i][j] = GetTransportedGoodsIncome(10, 20, ctt, cs->Index());
}
i++;
}
this->num_dataset = i;
}
void SetStringParameters(int widget) const override
{
switch (widget) {
case WID_CPR_FOOTER:
if (_cargo_payment_x_mode) {
SetDParam(0, STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL_SPEED);
SetDParam(1, STR_UNIT_NAME_VELOCITY_IMPERIAL + _settings_game.locale.units_velocity);
} else {
SetDParam(0, STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL);
}
break;
}
}
};
static const NWidgetPart _nested_cargo_payment_rates_widgets[] = {
@@ -1076,6 +1128,8 @@ static const NWidgetPart _nested_cargo_payment_rates_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_EMPTY, COLOUR_BROWN, WID_CPR_GRAPH), SetMinimalSize(495, 0), SetFill(1, 1), SetResize(1, 1),
NWidget(NWID_VERTICAL),
NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_CPR_DAYS), SetDataTip(STR_GRAPH_CARGO_DAYS_MODE, STR_GRAPH_CARGO_TOOLTIP_DAYS_MODE), SetFill(1, 0),
NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_CPR_SPEED), SetDataTip(STR_GRAPH_CARGO_SPEED_MODE, STR_GRAPH_CARGO_TOOLTIP_SPEED_MODE), SetFill(1, 0),
NWidget(NWID_SPACER), SetMinimalSize(0, 24), SetFill(0, 1),
NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CPR_ENABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_ENABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL), SetFill(1, 0),
NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_CPR_DISABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_DISABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL), SetFill(1, 0),
@@ -1089,9 +1143,8 @@ static const NWidgetPart _nested_cargo_payment_rates_widgets[] = {
NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(0, 1), SetResize(0, 1),
EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(NWID_SPACER), SetMinimalSize(WD_RESIZEBOX_WIDTH, 0), SetFill(1, 0), SetResize(1, 0),
NWidget(WWT_TEXT, COLOUR_BROWN, WID_CPR_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetDataTip(STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL, STR_NULL),
NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
NWidget(NWID_SPACER), SetMinimalSize(WD_RESIZEBOX_WIDTH, 0), SetFill(0, 0), SetResize(0, 0),
NWidget(WWT_TEXT, COLOUR_BROWN, WID_CPR_FOOTER), SetMinimalSize(0, 6), SetAlignment(SA_CENTER), SetPadding(2, 0, 2, 0), SetDataTip(STR_JUST_STRING1, STR_NULL), SetFill(1, 0), SetResize(1, 0),
NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_CPR_RESIZE),
EndContainer(),
EndContainer(),

2
src/graph_gui.h
View File

@@ -10,6 +10,8 @@
#ifndef GRAPH_GUI_H
#define GRAPH_GUI_H
extern uint8 _cargo_payment_x_mode;
void ShowOperatingProfitGraph();
void ShowIncomeGraph();
void ShowDeliveredCargoGraph();

4
src/lang/afrikaans.txt
View File

@@ -196,6 +196,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mpu
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}pk
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}pk
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/arabic_egypt.txt
View File

@@ -195,6 +195,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}ك
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}م/ث
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}مربعات/ اليوم
STR_UNIT_NAME_VELOCITY_IMPERIAL :ميل/س
STR_UNIT_NAME_VELOCITY_METRIC :كم/س
STR_UNIT_NAME_VELOCITY_SI :م/ث
STR_UNIT_NAME_VELOCITY_GAMEUNITS :مربعات/ اليوم
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}حصان
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}حصان
STR_UNITS_POWER_SI :{COMMA}{NBSP}ك واط

4
src/lang/basque.txt
View File

@@ -194,6 +194,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/belarusian.txt
View File

@@ -507,6 +507,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}м
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}км/г
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}м/с
STR_UNIT_NAME_VELOCITY_IMPERIAL :міль/г
STR_UNIT_NAME_VELOCITY_METRIC :км/г
STR_UNIT_NAME_VELOCITY_SI :м/с
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}к.с.
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}к.с.
STR_UNITS_POWER_SI :{COMMA}{NBSP}кВт

5
src/lang/brazilian_portuguese.txt
View File

@@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}quadrados/dia
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :quadrados/dia
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}cv
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/catalan.txt
View File

@@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}cel·les/dia
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :cel·les/dia
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}cv
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}cv
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/chuvash.txt
View File

@@ -155,6 +155,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} мил/
STR_UNITS_VELOCITY_METRIC :{COMMA} км/с
STR_UNITS_VELOCITY_SI :{COMMA} м/ҫ
STR_UNIT_NAME_VELOCITY_IMPERIAL :мил/с
STR_UNIT_NAME_VELOCITY_METRIC :км/с
STR_UNIT_NAME_VELOCITY_SI :м/ҫ
STR_UNITS_POWER_SI :{COMMA}кВт

4
src/lang/croatian.txt
View File

@@ -291,6 +291,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}KS
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}KS
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/czech.txt
View File

@@ -271,6 +271,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}políčka/den
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :políčka/den
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/danish.txt
View File

@@ -195,6 +195,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} miles/t
STR_UNITS_VELOCITY_METRIC :{COMMA} km/t
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :miles/t
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}hk
STR_UNITS_POWER_METRIC :{COMMA}hk
STR_UNITS_POWER_SI :{COMMA}kW

5
src/lang/dutch.txt
View File

@@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}tegels/dag
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/u
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :tegels/dag
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}pk
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}pk
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

11
src/lang/english.txt
View File

@@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}tiles/day
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :tiles/day
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW
@@ -599,6 +604,7 @@ STR_GRAPH_COMPANY_VALUES_CAPTION :{WHITE}Company
STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION :{WHITE}Cargo Payment Rates
STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL :{TINY_FONT}{BLACK}Days in transit
STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL_SPEED :{TINY_FONT}{BLACK}Average transit speed ({STRING})
STR_GRAPH_CARGO_PAYMENT_RATES_TITLE :{TINY_FONT}{BLACK}Payment for delivering 10 units (or 10,000 litres) of cargo a distance of 20 squares
STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLACK}Enable all
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Disable all
@@ -607,6 +613,11 @@ STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Display
STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Toggle graph for cargo type on/off
STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING}
STR_GRAPH_CARGO_DAYS_MODE :{TINY_FONT}{BLACK}Days in transit
STR_GRAPH_CARGO_SPEED_MODE :{TINY_FONT}{BLACK}Average speed
STR_GRAPH_CARGO_TOOLTIP_DAYS_MODE :{BLACK}Display days in transit on the x-axis of the graph
STR_GRAPH_CARGO_TOOLTIP_SPEED_MODE :{BLACK}Display average transit speed on the x-axis of the graph
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Show detailed performance ratings
# Graph key window

4
src/lang/english_AU.txt
View File

@@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/english_US.txt
View File

@@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}tiles/day
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :tiles/day
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/esperanto.txt
View File

@@ -194,6 +194,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}ĉp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}ĉp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/estonian.txt
View File

@@ -253,6 +253,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA} km/h
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ruutu/päev
STR_UNIT_NAME_VELOCITY_IMPERIAL :miili tunnis
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :ruutu/päev
STR_UNITS_POWER_IMPERIAL :{COMMA}hj
STR_UNITS_POWER_METRIC :{COMMA}hj
STR_UNITS_POWER_SI :{COMMA}kW

4
src/lang/faroese.txt
View File

@@ -194,6 +194,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph
STR_UNITS_VELOCITY_METRIC :{COMMA} km/t
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/t
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}hp
STR_UNITS_POWER_METRIC :{COMMA}hp
STR_UNITS_POWER_SI :{COMMA}kW

5
src/lang/finnish.txt
View File

@@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ruutua/vrk
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :ruutua/vrk
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hv
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hv
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/french.txt
View File

@@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}cases/jour
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :cases/jour
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}ch
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/frisian.txt
View File

@@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/o
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mpo
STR_UNIT_NAME_VELOCITY_METRIC :km/o
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/gaelic.txt
View File

@@ -381,6 +381,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/galician.txt
View File

@@ -196,6 +196,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph
STR_UNITS_VELOCITY_METRIC :{COMMA} km/h
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}cv
STR_UNITS_POWER_METRIC :{COMMA}cv
STR_UNITS_POWER_SI :{COMMA}kW

5
src/lang/german.txt
View File

@@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}Kacheln/Tag
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :Kacheln/Tag
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}PS
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}PS
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/greek.txt
View File

@@ -256,6 +256,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}μ
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}χλμ/ώρα
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :μίλια/ώρα
STR_UNIT_NAME_VELOCITY_METRIC :χλμ/ώρα
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/hebrew.txt
View File

@@ -207,6 +207,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} מיי
STR_UNITS_VELOCITY_METRIC :{COMMA} קמ"ש
STR_UNITS_VELOCITY_SI :{COMMA} מטר\שניה
STR_UNIT_NAME_VELOCITY_IMPERIAL :מייל לשעה
STR_UNIT_NAME_VELOCITY_METRIC :קמ"ש
STR_UNIT_NAME_VELOCITY_SI :מטר\שניה
STR_UNITS_POWER_IMPERIAL :{COMMA}כ"ס
STR_UNITS_POWER_METRIC :{COMMA}כ"ס
STR_UNITS_POWER_SI :{COMMA}קילו וואט

5
src/lang/hungarian.txt
View File

@@ -259,6 +259,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}mező/nap
STR_UNIT_NAME_VELOCITY_IMPERIAL :mi/h
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :mező/nap
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}LE
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}LE
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/icelandic.txt
View File

@@ -194,6 +194,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mílur/
STR_UNITS_VELOCITY_METRIC :{COMMA} km/klst
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mílur/klst
STR_UNIT_NAME_VELOCITY_METRIC :km/klst
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}hö.
STR_UNITS_POWER_METRIC :{COMMA}hö.
STR_UNITS_POWER_SI :{COMMA}kW

4
src/lang/ido.txt
View File

@@ -192,6 +192,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph
STR_UNITS_VELOCITY_METRIC :{COMMA} km/h
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}kp
STR_UNITS_POWER_METRIC :{COMMA}kp
STR_UNITS_POWER_SI :{COMMA}kW

5
src/lang/indonesian.txt
View File

@@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}meter/detik
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ubin/hari
STR_UNIT_NAME_VELOCITY_IMPERIAL :mil/j
STR_UNIT_NAME_VELOCITY_METRIC :km/jam
STR_UNIT_NAME_VELOCITY_SI :meter/detik
STR_UNIT_NAME_VELOCITY_GAMEUNITS :ubin/hari
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}dk
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}dk
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/irish.txt
View File

@@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}m/
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/u
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :m/u
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}hp
STR_UNITS_POWER_METRIC :{COMMA}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/italian.txt
View File

@@ -198,6 +198,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}riquadri/giorno
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :riquadri/giorno
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/japanese.txt
View File

@@ -194,6 +194,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}mph
STR_UNITS_VELOCITY_METRIC :{COMMA}km/h
STR_UNITS_VELOCITY_SI :{COMMA}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}英馬力
STR_UNITS_POWER_METRIC :{COMMA}仏馬力
STR_UNITS_POWER_SI :{COMMA}kW

5
src/lang/korean.txt
View File

@@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}km/h
STR_UNITS_VELOCITY_SI :{COMMA}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}칸/일
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :칸/일
STR_UNITS_POWER_IMPERIAL :{COMMA}마력
STR_UNITS_POWER_METRIC :{COMMA}마력
STR_UNITS_POWER_SI :{COMMA}kW

4
src/lang/latin.txt
View File

@@ -383,6 +383,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/latvian.txt
View File

@@ -198,6 +198,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}lauciņi/diena
STR_UNIT_NAME_VELOCITY_IMPERIAL :jūdzes stundā
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :lauciņi/diena
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}ZS
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}ZS
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/lithuanian.txt
View File

@@ -391,6 +391,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}langeliai per dieną
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :langeliai per dieną
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}AG
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}AG
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/luxembourgish.txt
View File

@@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}Felder/Dag
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :Felder/Dag
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}bhp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}ps
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/macedonian.txt
View File

@@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph
STR_UNITS_VELOCITY_METRIC :{COMMA} km/h
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}кс
STR_UNITS_POWER_METRIC :{COMMA}кс
STR_UNITS_POWER_SI :{COMMA}kW

4
src/lang/malay.txt
View File

@@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} bp/j
STR_UNITS_VELOCITY_METRIC :{COMMA} km/j
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :bp/j
STR_UNIT_NAME_VELOCITY_METRIC :km/j
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}kk
STR_UNITS_POWER_METRIC :{COMMA}kk
STR_UNITS_POWER_SI :{COMMA}kW

4
src/lang/maltese.txt
View File

@@ -146,6 +146,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph
STR_UNITS_VELOCITY_METRIC :{COMMA} km/h
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}hp
STR_UNITS_POWER_METRIC :{COMMA}hp
STR_UNITS_POWER_SI :{COMMA}kW

4
src/lang/marathi.txt
View File

@@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph
STR_UNITS_VELOCITY_METRIC :{COMMA} किमी / तास
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :किमी / तास
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}hp
STR_UNITS_POWER_METRIC :{COMMA}hp

5
src/lang/norwegian_bokmal.txt
View File

@@ -198,6 +198,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ruter/dag
STR_UNIT_NAME_VELOCITY_IMPERIAL :mi/t
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :ruter/dag
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hk
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hk
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/norwegian_nynorsk.txt
View File

@@ -195,6 +195,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mi/t
STR_UNITS_VELOCITY_METRIC :{COMMA} km/t
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mi/t
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA} hk
STR_UNITS_POWER_METRIC :{COMMA} hk
STR_UNITS_POWER_SI :{COMMA} kW

4
src/lang/persian.txt
View File

@@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}م
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}کیلومتر بر ساعت
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}متر بر ثانیه
STR_UNIT_NAME_VELOCITY_IMPERIAL :مایل بر ساعت
STR_UNIT_NAME_VELOCITY_METRIC :کیلومتر بر ساعت
STR_UNIT_NAME_VELOCITY_SI :متر بر ثانیه
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}اسب بخار
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}اسب بخار
STR_UNITS_POWER_SI :{COMMA}{NBSP}کیلووات

5
src/lang/polish.txt
View File

@@ -575,6 +575,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}p{P ole ola ól}/dzień
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :pola/dzień
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}KM
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}KM
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/portuguese.txt
View File

@@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA} km/h
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP} blocos / dia
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :quadrados/dia
STR_UNITS_POWER_IMPERIAL :{COMMA}cv
STR_UNITS_POWER_METRIC :{COMMA}cv
STR_UNITS_POWER_SI :{COMMA}kW

5
src/lang/romanian.txt
View File

@@ -182,6 +182,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA} km/h
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}dale/zi
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :dale/zi
STR_UNITS_POWER_IMPERIAL :{COMMA}cp
STR_UNITS_POWER_METRIC :{COMMA}cp
STR_UNITS_POWER_SI :{COMMA}kW

5
src/lang/russian.txt
View File

@@ -322,6 +322,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}к
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}м/с
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}кл./день
STR_UNIT_NAME_VELOCITY_IMPERIAL :миль/ч
STR_UNIT_NAME_VELOCITY_METRIC :км/ч
STR_UNIT_NAME_VELOCITY_SI :м/с
STR_UNIT_NAME_VELOCITY_GAMEUNITS :клетки в день
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}лс
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}лс
STR_UNITS_POWER_SI :{COMMA}{NBSP}кВт

5
src/lang/serbian.txt
View File

@@ -384,6 +384,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA} km/h
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}pločica/dan
STR_UNIT_NAME_VELOCITY_IMPERIAL :milja na sat
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :pločica/dan
STR_UNITS_POWER_IMPERIAL :{COMMA}ks
STR_UNITS_POWER_METRIC :{COMMA}ks
STR_UNITS_POWER_SI :{COMMA}kW

5
src/lang/simplified_chinese.txt
View File

@@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}米/秒
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}格/天
STR_UNIT_NAME_VELOCITY_IMPERIAL :英里/小时
STR_UNIT_NAME_VELOCITY_METRIC :千米/小时
STR_UNIT_NAME_VELOCITY_SI :米/秒
STR_UNIT_NAME_VELOCITY_GAMEUNITS :格/天
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}匹马力
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}匹马力
STR_UNITS_POWER_SI :{COMMA}{NBSP}千瓦

5
src/lang/slovak.txt
View File

@@ -260,6 +260,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA} km/h
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}políč{P ko ka ok}/deň
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :políčka/deň
STR_UNITS_POWER_IMPERIAL :{COMMA}hp
STR_UNITS_POWER_METRIC :{COMMA}hp
STR_UNITS_POWER_SI :{COMMA}kW

4
src/lang/slovenian.txt
View File

@@ -346,6 +346,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph
STR_UNITS_VELOCITY_METRIC :{COMMA} km/h
STR_UNITS_VELOCITY_SI :{COMMA} m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}KM
STR_UNITS_POWER_METRIC :{COMMA}KM
STR_UNITS_POWER_SI :{COMMA} kW

5
src/lang/spanish.txt
View File

@@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}casillas/día
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :casillas/día
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}cv
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/spanish_MX.txt
View File

@@ -197,6 +197,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}casillas/día
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :casillas/día
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}cv
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/swedish.txt
View File

@@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}rutor/dag
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :rutor/dag
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hk
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hk
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/tamil.txt
View File

@@ -195,6 +195,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/thai.txt
View File

@@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} ไม
STR_UNITS_VELOCITY_METRIC :{COMMA} กม./ชม.
STR_UNITS_VELOCITY_SI :{COMMA} ม./วิ.
STR_UNIT_NAME_VELOCITY_IMPERIAL :ไมล์/ชม.
STR_UNIT_NAME_VELOCITY_METRIC :กม./ชม.
STR_UNIT_NAME_VELOCITY_SI :ม./วิ.
STR_UNITS_POWER_IMPERIAL :{COMMA} แรงม้า
STR_UNITS_POWER_METRIC :{COMMA} แรงม้า
STR_UNITS_POWER_SI :{COMMA} กิโลวัตต์

4
src/lang/traditional_chinese.txt
View File

@@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}公里/小時
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}米/秒
STR_UNIT_NAME_VELOCITY_IMPERIAL :英里/小時
STR_UNIT_NAME_VELOCITY_METRIC :公里/小時
STR_UNIT_NAME_VELOCITY_SI :米/秒
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}匹
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}匹
STR_UNITS_POWER_SI :{COMMA}{NBSP}千瓦

4
src/lang/turkish.txt
View File

@@ -196,6 +196,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mi
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/s
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mil/s
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}bg
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}bg
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

5
src/lang/ukrainian.txt
View File

@@ -321,6 +321,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}к
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}м/с
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}клітинок/день
STR_UNIT_NAME_VELOCITY_IMPERIAL :миль/год
STR_UNIT_NAME_VELOCITY_METRIC :км/год
STR_UNIT_NAME_VELOCITY_SI :м/с
STR_UNIT_NAME_VELOCITY_GAMEUNITS :клітинок/день
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}к.с.
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}к.с.
STR_UNITS_POWER_SI :{COMMA}{NBSP}кВт

4
src/lang/urdu.txt
View File

@@ -194,6 +194,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA} میل
STR_UNITS_VELOCITY_METRIC :{COMMA} کلو میٹر فی گھنٹھ
STR_UNITS_VELOCITY_SI :{COMMA} میٹر فی سیکنڈ
STR_UNIT_NAME_VELOCITY_IMPERIAL :میل فی گھنٹھ
STR_UNIT_NAME_VELOCITY_METRIC :کلو میٹر فی گھنٹھ
STR_UNIT_NAME_VELOCITY_SI :میٹر فی سیکنڈ
STR_UNITS_POWER_IMPERIAL :{COMMA} ھارس پآور
STR_UNITS_POWER_METRIC :{COMMA} ھارس پآور
STR_UNITS_POWER_SI :{COMMA} کلو واٹ

5
src/lang/vietnamese.txt
View File

@@ -196,6 +196,11 @@ STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ô/ngày
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNIT_NAME_VELOCITY_GAMEUNITS :ô/ngày
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

4
src/lang/welsh.txt
View File

@@ -193,6 +193,10 @@ STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mp
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/h
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
STR_UNIT_NAME_VELOCITY_IMPERIAL :mph
STR_UNIT_NAME_VELOCITY_METRIC :km/h
STR_UNIT_NAME_VELOCITY_SI :m/s
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hp
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hp
STR_UNITS_POWER_SI :{COMMA}{NBSP}kW

7
src/settings.cpp
View File

@@ -73,6 +73,7 @@
#include "viewport_func.h"
#include "gui.h"
#include "statusbar_gui.h"
#include "graph_gui.h"
#include "void_map.h"
#include "station_base.h"
@@ -1522,6 +1523,12 @@ static bool ClimateThresholdModeChanged(int32 p1)
return true;
}
static bool VelocityUnitsChanged(int32 p1) {
InvalidateWindowClassesData(WC_PAYMENT_RATES);
MarkWholeScreenDirty();
return true;
}
/** Checks if any settings are set to incorrect values, and sets them to correct values in that case. */
static void ValidateSettings()
{

14
src/strings.cpp
View File

@@ -798,6 +798,20 @@ uint ConvertSpeedToDisplaySpeed(uint speed)
return _units_velocity[_settings_game.locale.units_velocity].c.ToDisplay(speed, false);
}
/**
* Convert the given (internal) speed to the display speed, in units (not decimal values).
* @param speed the speed to convert
* @return the converted speed.
*/
uint ConvertSpeedToUnitDisplaySpeed(uint speed)
{
uint result = ConvertSpeedToDisplaySpeed(speed);
for (uint i = 0; i < _units_velocity[_settings_game.locale.units_velocity].decimal_places; i++) {
result /= 10;
}
return result;
}
/**
* Convert the given display speed to the (internal) speed.
* @param speed the speed to convert

8
src/table/misc_settings.ini
View File

@@ -381,5 +381,13 @@ min = 0
max = ZEM_END - 1
cat = SC_BASIC
[SDTG_VAR]
name = ""cargo_payment_x_mode""
type = SLE_UINT8
var = _cargo_payment_x_mode
def = 0
min = 0
max = 1
[SDTG_END]

3
src/table/settings.ini
View File

@@ -61,6 +61,7 @@ static bool ViewportMapShowTunnelModeChanged(int32 p1);
static bool ViewportMapLandscapeModeChanged(int32 p1);
static bool UpdateLinkgraphColours(int32 p1);
static bool ClimateThresholdModeChanged(int32 p1);
static bool VelocityUnitsChanged(int32 p1);
static bool UpdateClientName(int32 p1);
static bool UpdateServerPassword(int32 p1);
@@ -4103,7 +4104,7 @@ guiflags = SGF_MULTISTRING
def = 1
max = 3
full = _locale_units
proc = RedrawScreen
proc = VelocityUnitsChanged
cat = SC_BASIC
str = STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY
strhelp = STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT

1
src/unit_conversion.h
View File

@@ -8,6 +8,7 @@
/** @file unit_conversion.h Functions related to unit conversion. */
uint ConvertSpeedToDisplaySpeed(uint speed);
uint ConvertSpeedToUnitDisplaySpeed(uint speed);
uint ConvertDisplaySpeedToSpeed(uint speed);
uint ConvertWeightToDisplayWeight(uint weight);
uint ConvertDisplayWeightToWeight(uint weight);

2
src/widgets/graph_widget.h
View File

@@ -49,6 +49,8 @@ enum CargoPaymentRatesWidgets {
WID_CPR_DISABLE_CARGOES, ///< Disable cargoes button.
WID_CPR_MATRIX, ///< Cargo list.
WID_CPR_MATRIX_SCROLLBAR,///< Cargo list scrollbar.
WID_CPR_DAYS, ///< Days in transit mode.
WID_CPR_SPEED, ///< Speed mode.
};
/** Widget of the #CompanyLeagueWindow class. */