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

Simplify strings for tracerestrict change counter action

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-10-13 19:04:59 +01:00
parent 91af0c82d3
commit 7167175aa5
6 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/czech.txt
View File

@@ -3114,7 +3114,7 @@ STR_TRACE_RESTRICT_VARIABLE_TRAIN_MAX_TE_WEIGHT_RATIO :poměr maximál
STR_TRACE_RESTRICT_VARIABLE_TRAIN_OWNER :vlastník vlaku STR_TRACE_RESTRICT_VARIABLE_TRAIN_OWNER :vlastník vlaku
STR_TRACE_RESTRICT_VARIABLE_TRAIN_STATUS :stav vlaku STR_TRACE_RESTRICT_VARIABLE_TRAIN_STATUS :stav vlaku
STR_TRACE_RESTRICT_VARIABLE_UNDEFINED :nedefinováno STR_TRACE_RESTRICT_VARIABLE_UNDEFINED :nedefinováno
STR_TRACE_RESTRICT_VARIABLE_UNDEFINED_RED :{RED}nedefinováno STR_TRACE_RESTRICT_VARIABLE_UNDEFINED_RED :{PUSH_COLOUR}{RED}nedefinováno{POP_COLOUR}
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_INTEGER :{STRING} {STRING} {STRING} {COMMA} pak STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_INTEGER :{STRING} {STRING} {STRING} {COMMA} pak
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_SPEED :{STRING} {STRING} {STRING} {VELOCITY} pak STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_SPEED :{STRING} {STRING} {STRING} {VELOCITY} pak
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_WEIGHT :{STRING} {STRING} {STRING} {WEIGHT_SHORT} pak STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_WEIGHT :{STRING} {STRING} {STRING} {WEIGHT_SHORT} pak

8
src/lang/english.txt
View File

@@ -3287,7 +3287,7 @@ STR_TRACE_RESTRICT_VARIABLE_TRAIN_STATUS :train status
STR_TRACE_RESTRICT_VARIABLE_TRAIN_ENGINE_CLASS :engine class STR_TRACE_RESTRICT_VARIABLE_TRAIN_ENGINE_CLASS :engine class
STR_TRACE_RESTRICT_VARIABLE_ORDER_TARGET_DIRECTION :direction of order target STR_TRACE_RESTRICT_VARIABLE_ORDER_TARGET_DIRECTION :direction of order target
STR_TRACE_RESTRICT_VARIABLE_UNDEFINED :undefined STR_TRACE_RESTRICT_VARIABLE_UNDEFINED :undefined
STR_TRACE_RESTRICT_VARIABLE_UNDEFINED_RED :{RED}undefined STR_TRACE_RESTRICT_VARIABLE_UNDEFINED_RED :{PUSH_COLOUR}{RED}undefined{POP_COLOUR}
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_INTEGER :{STRING} {STRING} {STRING} {COMMA} then STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_INTEGER :{STRING} {STRING} {STRING} {COMMA} then
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_SPEED :{STRING} {STRING} {STRING} {VELOCITY} then STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_SPEED :{STRING} {STRING} {STRING} {VELOCITY} then
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_WEIGHT :{STRING} {STRING} {STRING} {WEIGHT_SHORT} then STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_WEIGHT :{STRING} {STRING} {STRING} {WEIGHT_SHORT} then
@@ -3383,9 +3383,9 @@ STR_TRACE_RESTRICT_COUNTER_NAME :{TRCOUNTER}
STR_TRACE_RESTRICT_COUNTER_INCREASE :Increase STR_TRACE_RESTRICT_COUNTER_INCREASE :Increase
STR_TRACE_RESTRICT_COUNTER_DECREASE :Decrease STR_TRACE_RESTRICT_COUNTER_DECREASE :Decrease
STR_TRACE_RESTRICT_COUNTER_SET :Set STR_TRACE_RESTRICT_COUNTER_SET :Set
STR_TRACE_RESTRICT_COUNTER_INCREASE_ITEM :Increase counter: {STRING1}{BLACK}{STRING} by {COMMA} STR_TRACE_RESTRICT_COUNTER_INCREASE_ITEM :Increase counter: {STRING1} by {COMMA}
STR_TRACE_RESTRICT_COUNTER_DECREASE_ITEM :Decrease counter: {STRING1}{BLACK}{STRING} by {COMMA} STR_TRACE_RESTRICT_COUNTER_DECREASE_ITEM :Decrease counter: {STRING1} by {COMMA}
STR_TRACE_RESTRICT_COUNTER_SET_ITEM :Set counter: {STRING1}{BLACK}{STRING} to {COMMA} STR_TRACE_RESTRICT_COUNTER_SET_ITEM :Set counter: {STRING1} to {COMMA}
STR_TRACE_RESTRICT_TRAIN_STATUS_EMPTY :empty STR_TRACE_RESTRICT_TRAIN_STATUS_EMPTY :empty
STR_TRACE_RESTRICT_TRAIN_STATUS_FULL :full STR_TRACE_RESTRICT_TRAIN_STATUS_FULL :full
STR_TRACE_RESTRICT_TRAIN_STATUS_BROKEN_DOWN :broken down STR_TRACE_RESTRICT_TRAIN_STATUS_BROKEN_DOWN :broken down

8
src/lang/galician.txt
View File

@@ -6046,7 +6046,7 @@ STR_TRACE_RESTRICT_VARIABLE_TRAIN_OWNER :propietario do
STR_TRACE_RESTRICT_VARIABLE_TRAIN_STATUS :estado do tren STR_TRACE_RESTRICT_VARIABLE_TRAIN_STATUS :estado do tren
STR_TRACE_RESTRICT_VARIABLE_TRAIN_ENGINE_CLASS :clase do motor STR_TRACE_RESTRICT_VARIABLE_TRAIN_ENGINE_CLASS :clase do motor
STR_TRACE_RESTRICT_VARIABLE_UNDEFINED :indefinido STR_TRACE_RESTRICT_VARIABLE_UNDEFINED :indefinido
STR_TRACE_RESTRICT_VARIABLE_UNDEFINED_RED :{RED}indefinido STR_TRACE_RESTRICT_VARIABLE_UNDEFINED_RED :{PUSH_COLOUR}{RED}indefinido{POP_COLOUR}
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_INTEGER :{STRING} {STRING} {STRING} {COMMA} then STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_INTEGER :{STRING} {STRING} {STRING} {COMMA} then
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_SPEED :{STRING} {STRING} {STRING} {VELOCITY} then STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_SPEED :{STRING} {STRING} {STRING} {VELOCITY} then
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_WEIGHT :{STRING} {STRING} {STRING} {WEIGHT_SHORT} then STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_WEIGHT :{STRING} {STRING} {STRING} {WEIGHT_SHORT} then
@@ -6140,11 +6140,11 @@ STR_TRACE_RESTRICT_SLOT_LIST_HEADER :{BLACK}Slot{CON
STR_TRACE_RESTRICT_SLOT_LIST_SEPARATOR :{BLACK}, {LTBLUE} STR_TRACE_RESTRICT_SLOT_LIST_SEPARATOR :{BLACK}, {LTBLUE}
STR_TRACE_RESTRICT_COUNTER_NAME :{TRCOUNTER} STR_TRACE_RESTRICT_COUNTER_NAME :{TRCOUNTER}
STR_TRACE_RESTRICT_COUNTER_INCREASE :Incrementar STR_TRACE_RESTRICT_COUNTER_INCREASE :Incrementar
STR_TRACE_RESTRICT_COUNTER_INCREASE_ITEM :Incrementar contador: {STRING}{BLACK}{STRING} en {COMMA} STR_TRACE_RESTRICT_COUNTER_INCREASE_ITEM :Incrementar contador: {STRING} en {COMMA}
STR_TRACE_RESTRICT_COUNTER_DECREASE :Disminuir STR_TRACE_RESTRICT_COUNTER_DECREASE :Disminuir
STR_TRACE_RESTRICT_COUNTER_DECREASE_ITEM :Disminuir contador: {STRING}{BLACK}{STRING} en {COMMA} STR_TRACE_RESTRICT_COUNTER_DECREASE_ITEM :Disminuir contador: {STRING} en {COMMA}
STR_TRACE_RESTRICT_COUNTER_SET :Fixar STR_TRACE_RESTRICT_COUNTER_SET :Fixar
STR_TRACE_RESTRICT_COUNTER_SET_ITEM :Fixar contador: {STRING}{BLACK}{STRING} a {COMMA} STR_TRACE_RESTRICT_COUNTER_SET_ITEM :Fixar contador: {STRING} a {COMMA}
STR_TRACE_RESTRICT_COUNTER_SET_VALUE :{BLACK}Fixar valor STR_TRACE_RESTRICT_COUNTER_SET_VALUE :{BLACK}Fixar valor
STR_TRACE_RESTRICT_COUNTER_SET_VALUE_TOOLTIP :{BLACK}Fixar o valor do contador seleccionado STR_TRACE_RESTRICT_COUNTER_SET_VALUE_TOOLTIP :{BLACK}Fixar o valor do contador seleccionado
STR_TRACE_RESTRICT_COUNTER_SET_VALUE_CAPTION :{BLACK}Fixar o valor do contador STR_TRACE_RESTRICT_COUNTER_SET_VALUE_CAPTION :{BLACK}Fixar o valor do contador

8
src/lang/german.txt
View File

@@ -3264,7 +3264,7 @@ STR_TRACE_RESTRICT_VARIABLE_TRAIN_OWNER :Zugbesitzer
STR_TRACE_RESTRICT_VARIABLE_TRAIN_STATUS :Zugstatus STR_TRACE_RESTRICT_VARIABLE_TRAIN_STATUS :Zugstatus
STR_TRACE_RESTRICT_VARIABLE_TRAIN_ENGINE_CLASS :Antriebsart STR_TRACE_RESTRICT_VARIABLE_TRAIN_ENGINE_CLASS :Antriebsart
STR_TRACE_RESTRICT_VARIABLE_UNDEFINED :undefiniert STR_TRACE_RESTRICT_VARIABLE_UNDEFINED :undefiniert
STR_TRACE_RESTRICT_VARIABLE_UNDEFINED_RED :{RED}undefiniert STR_TRACE_RESTRICT_VARIABLE_UNDEFINED_RED :{PUSH_COLOUR}{RED}undefiniert{POP_COLOUR}
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_INTEGER :{STRING} {STRING} {STRING} {COMMA} dann STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_INTEGER :{STRING} {STRING} {STRING} {COMMA} dann
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_SPEED :{STRING} {STRING} {STRING} {VELOCITY} dann STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_SPEED :{STRING} {STRING} {STRING} {VELOCITY} dann
STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_WEIGHT :{STRING} {STRING} {STRING} {WEIGHT_SHORT} dann STR_TRACE_RESTRICT_CONDITIONAL_COMPARE_WEIGHT :{STRING} {STRING} {STRING} {WEIGHT_SHORT} dann
@@ -3359,9 +3359,9 @@ STR_TRACE_RESTRICT_COUNTER_NAME :{TRCOUNTER}
STR_TRACE_RESTRICT_COUNTER_INCREASE :Inkrementiere STR_TRACE_RESTRICT_COUNTER_INCREASE :Inkrementiere
STR_TRACE_RESTRICT_COUNTER_DECREASE :Dekrementiere STR_TRACE_RESTRICT_COUNTER_DECREASE :Dekrementiere
STR_TRACE_RESTRICT_COUNTER_SET :Setze STR_TRACE_RESTRICT_COUNTER_SET :Setze
STR_TRACE_RESTRICT_COUNTER_INCREASE_ITEM :Inkrementiere Zähler: {STRING}{BLACK}{STRING} um {COMMA} STR_TRACE_RESTRICT_COUNTER_INCREASE_ITEM :Inkrementiere Zähler: {STRING} um {COMMA}
STR_TRACE_RESTRICT_COUNTER_DECREASE_ITEM :Dekrementiere Zähler: {STRING}{BLACK}{STRING} um {COMMA} STR_TRACE_RESTRICT_COUNTER_DECREASE_ITEM :Dekrementiere Zähler: {STRING} um {COMMA}
STR_TRACE_RESTRICT_COUNTER_SET_ITEM :Setze Zähler: {STRING}{BLACK}{STRING} auf {COMMA} STR_TRACE_RESTRICT_COUNTER_SET_ITEM :Setze Zähler: {STRING} auf {COMMA}
STR_TRACE_RESTRICT_TRAIN_STATUS_EMPTY :leer STR_TRACE_RESTRICT_TRAIN_STATUS_EMPTY :leer
STR_TRACE_RESTRICT_TRAIN_STATUS_FULL :voll STR_TRACE_RESTRICT_TRAIN_STATUS_FULL :voll
STR_TRACE_RESTRICT_TRAIN_STATUS_BROKEN_DOWN :hat eine Panne STR_TRACE_RESTRICT_TRAIN_STATUS_BROKEN_DOWN :hat eine Panne

6
src/lang/korean.txt
View File

@@ -3362,9 +3362,9 @@ STR_TRACE_RESTRICT_COUNTER_NAME :{TRCOUNTER}
STR_TRACE_RESTRICT_COUNTER_INCREASE :증가 STR_TRACE_RESTRICT_COUNTER_INCREASE :증가
STR_TRACE_RESTRICT_COUNTER_DECREASE :감소 STR_TRACE_RESTRICT_COUNTER_DECREASE :감소
STR_TRACE_RESTRICT_COUNTER_SET :설정 STR_TRACE_RESTRICT_COUNTER_SET :설정
STR_TRACE_RESTRICT_COUNTER_INCREASE_ITEM :카운터: {0:STRING}{BLACK}{1:STRING}의 값을 {2:COMMA}만큼 증가 STR_TRACE_RESTRICT_COUNTER_INCREASE_ITEM :카운터: {0:STRING}의 값을 {1:COMMA}만큼 증가
STR_TRACE_RESTRICT_COUNTER_DECREASE_ITEM :카운터: {0:STRING}{BLACK}{1:STRING}의 값을 {2:COMMA}만큼 감소 STR_TRACE_RESTRICT_COUNTER_DECREASE_ITEM :카운터: {0:STRING}의 값을 {1:COMMA}만큼 감소
STR_TRACE_RESTRICT_COUNTER_SET_ITEM :카운터: {0:STRING}{BLACK}{1:STRING}의 값을 {2:COMMA}(으)로 설정 STR_TRACE_RESTRICT_COUNTER_SET_ITEM :카운터: {0:STRING}의 값을 {1:COMMA}(으)로 설정
STR_TRACE_RESTRICT_TRAIN_STATUS_EMPTY :{G=f}빈 상태 STR_TRACE_RESTRICT_TRAIN_STATUS_EMPTY :{G=f}빈 상태
STR_TRACE_RESTRICT_TRAIN_STATUS_FULL :{G=f}가득 찬 상태 STR_TRACE_RESTRICT_TRAIN_STATUS_FULL :{G=f}가득 찬 상태
STR_TRACE_RESTRICT_TRAIN_STATUS_BROKEN_DOWN :{G=f}고장난 상태 STR_TRACE_RESTRICT_TRAIN_STATUS_BROKEN_DOWN :{G=f}고장난 상태

3
src/tracerestrict_gui.cpp
View File

@@ -1676,8 +1676,7 @@ static void DrawInstructionString(const TraceRestrictProgram *prog, TraceRestric
SetDParam(0, STR_TRACE_RESTRICT_COUNTER_NAME); SetDParam(0, STR_TRACE_RESTRICT_COUNTER_NAME);
SetDParam(1, GetTraceRestrictValue(item)); SetDParam(1, GetTraceRestrictValue(item));
} }
SetDParam(2, selected ? STR_TRACE_RESTRICT_WHITE : STR_EMPTY); SetDParam(2, value);
SetDParam(3, value);
break; break;
} }