summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2009-11-28 15:12:24 +0000
committerfrosch <frosch@openttd.org>2009-11-28 15:12:24 +0000
commit49aca1edc096b70bdfa57534fd867abe717c2bb9 (patch)
treefcc43f0d33e2216a5fa64b922126f6a329bb3e14
parent1f0da3710f955c7fd4a747ac814d449847e73884 (diff)
downloadopenttd-49aca1edc096b70bdfa57534fd867abe717c2bb9.tar.xz
(svn r18325) -Codechange: Use GetSpriteSize() instead of hard {SETX}. Also make the 'current order'-arrow in order and timetable GUI RTL aware.
-rw-r--r--src/lang/afrikaans.txt12
-rw-r--r--src/lang/arabic_egypt.txt12
-rw-r--r--src/lang/brazilian_portuguese.txt12
-rw-r--r--src/lang/bulgarian.txt12
-rw-r--r--src/lang/catalan.txt12
-rw-r--r--src/lang/croatian.txt12
-rw-r--r--src/lang/czech.txt12
-rw-r--r--src/lang/danish.txt12
-rw-r--r--src/lang/dutch.txt12
-rw-r--r--src/lang/english.txt14
-rw-r--r--src/lang/english_US.txt12
-rw-r--r--src/lang/esperanto.txt4
-rw-r--r--src/lang/estonian.txt12
-rw-r--r--src/lang/finnish.txt12
-rw-r--r--src/lang/french.txt12
-rw-r--r--src/lang/galician.txt12
-rw-r--r--src/lang/german.txt12
-rw-r--r--src/lang/greek.txt12
-rw-r--r--src/lang/hebrew.txt12
-rw-r--r--src/lang/hungarian.txt12
-rw-r--r--src/lang/icelandic.txt12
-rw-r--r--src/lang/indonesian.txt12
-rw-r--r--src/lang/italian.txt12
-rw-r--r--src/lang/japanese.txt10
-rw-r--r--src/lang/korean.txt12
-rw-r--r--src/lang/latvian.txt12
-rw-r--r--src/lang/lithuanian.txt8
-rw-r--r--src/lang/luxembourgish.txt12
-rw-r--r--src/lang/norwegian_bokmal.txt12
-rw-r--r--src/lang/norwegian_nynorsk.txt12
-rw-r--r--src/lang/polish.txt12
-rw-r--r--src/lang/portuguese.txt12
-rw-r--r--src/lang/romanian.txt12
-rw-r--r--src/lang/russian.txt12
-rw-r--r--src/lang/serbian.txt12
-rw-r--r--src/lang/simplified_chinese.txt12
-rw-r--r--src/lang/slovak.txt12
-rw-r--r--src/lang/slovenian.txt12
-rw-r--r--src/lang/spanish.txt12
-rw-r--r--src/lang/swedish.txt12
-rw-r--r--src/lang/traditional_chinese.txt12
-rw-r--r--src/lang/turkish.txt12
-rw-r--r--src/lang/ukrainian.txt12
-rw-r--r--src/lang/unfinished/basque.txt2
-rw-r--r--src/lang/unfinished/persian.txt4
-rw-r--r--src/lang/unfinished/thai.txt2
-rw-r--r--src/lang/unfinished/vietnamese.txt6
-rw-r--r--src/lang/welsh.txt12
-rw-r--r--src/order_func.h2
-rw-r--r--src/order_gui.cpp112
-rw-r--r--src/timetable_gui.cpp9
51 files changed, 297 insertions, 356 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index e9a72c9fe..59aabb252 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -2884,11 +2884,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Rooster
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Skakel na die rooster uitsig
STR_ORDERS_LIST_TOOLTIP :{BLACK}Opdraglys - kliek op 'n opdrag om dit te verlig. CTRL + kliek senter op stasie
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Einde van Opdrae - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Einde van Gedeel Opdrae - -
+STR_ORDERS_END_OF_ORDERS :- - Einde van Opdrae - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Einde van Gedeel Opdrae - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Sonder-stop
@@ -3010,9 +3008,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Verander
STR_TIMETABLE_TOOLTIP :{BLACK}Rooster - kliek op 'n opdrag om dit te verlig
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Geen reis
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Reis (Nie gerooster nie)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Reis vir {STRING}
+STR_TIMETABLE_NO_TRAVEL :Geen reis
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Reis (Nie gerooster nie)
+STR_TIMETABLE_TRAVEL_FOR :Reis vir {STRING}
STR_TIMETABLE_STAY_FOR :en bly vir {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :en reis vir {STRING}
STR_TIMETABLE_DAYS :{COMMA} da{P g e}
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index 7b2f9f0ed..d8d4a7819 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -2986,11 +2986,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}جدول
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}غير الى نافذة جدولة الاوامر
STR_ORDERS_LIST_TOOLTIP :{BLACK}قائمة الاوامر - اضغط على الامر لختيارة. مفتاح التحكم (كنترول) + الضغط لتوجة للمحطة
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - نهاية الاوامر - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - نهاية الأوامر المشتركة - -
+STR_ORDERS_END_OF_ORDERS :- - نهاية الاوامر - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - نهاية الأوامر المشتركة - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}بدون توقف
@@ -3113,9 +3111,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}حول
STR_TIMETABLE_TOOLTIP :{BLACK}جدولة الأوامر - اضغط على الامر لاظهارة
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}لا رحيل
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}مسافر (ليس هناك جدولة)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}مسافر لـ {STRING}
+STR_TIMETABLE_NO_TRAVEL :لا رحيل
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :مسافر (ليس هناك جدولة)
+STR_TIMETABLE_TRAVEL_FOR :مسافر لـ {STRING}
STR_TIMETABLE_STAY_FOR :ويبقى لـ {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :ويسافر لـ {STRING}
STR_TIMETABLE_DAYS :{COMMA}يوم
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index f12353065..37657b208 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -2973,11 +2973,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Plano de
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Exibe o plano de horário
STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de ordens - clique numa ordem para a selecionar
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Fim de Ordens - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Fim de Ordens Compartilhadas - -
+STR_ORDERS_END_OF_ORDERS :- - Fim de Ordens - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Fim de Ordens Compartilhadas - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Sem parar
@@ -3100,9 +3098,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Alternar
STR_TIMETABLE_TOOLTIP :{BLACK}Plano de horário - selecione uma ordem clicando nela
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Não viajar
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Viajar (não progamado)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Viajar para {STRING}
+STR_TIMETABLE_NO_TRAVEL :Não viajar
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Viajar (não progamado)
+STR_TIMETABLE_TRAVEL_FOR :Viajar para {STRING}
STR_TIMETABLE_STAY_FOR :e ficar durante {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :e viajar por {STRING}
STR_TIMETABLE_DAYS :{COMMA} dia{P "" s}
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index a3cefff77..fdfa371a4 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -2930,11 +2930,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Разп
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Виж разписанието
STR_ORDERS_LIST_TOOLTIP :{BLACK}Пътен лист - натиснете върху назначение за маркиране. CTRL + натискане - центрира върху станцията
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Край на Заповедите - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Край на Споделения пътен лист - -
+STR_ORDERS_END_OF_ORDERS :- - Край на Заповедите - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Край на Споделения пътен лист - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Без спирка
@@ -3057,9 +3055,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Пром
STR_TIMETABLE_TOOLTIP :{BLACK}Времетаблица - кликни върху заповед за да я маркираш.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Без преминаване
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Патувай (без разписание)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Патувай за {STRING}
+STR_TIMETABLE_NO_TRAVEL :Без преминаване
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Патувай (без разписание)
+STR_TIMETABLE_TRAVEL_FOR :Патувай за {STRING}
STR_TIMETABLE_STAY_FOR :и остани за {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :и отпътувай към {STRING}
STR_TIMETABLE_DAYS :{COMMA} ден{P "" s}
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index a408e1f2a..f55e258ac 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -2991,11 +2991,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Horari
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Commuta a la vista d'horaris
STR_ORDERS_LIST_TOOLTIP :{BLACK}Llista d'ordres - clica en una per seleccionar-la
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Fi d'Ordres - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Fi d'Ordres Compartides - -
+STR_ORDERS_END_OF_ORDERS :- - Fi d'Ordres - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Fi d'Ordres Compartides - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Sense parar
@@ -3118,9 +3116,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Commuta
STR_TIMETABLE_TOOLTIP :{BLACK}Horari - clica sobre l'ordre per marcar-la.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Sense viatge
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Viatge (fora d'horari)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Viatge a {STRING}
+STR_TIMETABLE_NO_TRAVEL :Sense viatge
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Viatge (fora d'horari)
+STR_TIMETABLE_TRAVEL_FOR :Viatge a {STRING}
STR_TIMETABLE_STAY_FOR :i estigues {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :i viatge per {STRING}
STR_TIMETABLE_DAYS :{COMMA} di{P a es}
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index e870e968a..1c00af0ab 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -3044,11 +3044,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK} Raspore
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Prebacivanje na pogled rasporeda
STR_ORDERS_LIST_TOOLTIP :{BLACK}Popis naredbi - klikni na naredbu kako bi ju označio. CTRL + klik klizi na postaju
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Kraj naredbi - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Kraj dijeljenih naredbi - -
+STR_ORDERS_END_OF_ORDERS :- - Kraj naredbi - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Kraj dijeljenih naredbi - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Neprestano
@@ -3171,9 +3169,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Prebaci
STR_TIMETABLE_TOOLTIP :{BLACK}Raspored - klikni na naredbu da ju označiš.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Nema putovanja
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Putovanje (bez rasporeda)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Putovanje za {STRING}
+STR_TIMETABLE_NO_TRAVEL :Nema putovanja
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Putovanje (bez rasporeda)
+STR_TIMETABLE_TRAVEL_FOR :Putovanje za {STRING}
STR_TIMETABLE_STAY_FOR :i boravak za {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :i putovanja za {STRING}
STR_TIMETABLE_DAYS :{COMMA} dan{P "" a a}
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 026e13ae5..a1409615c 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -3038,11 +3038,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Jízdní
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Přepnout na jízdní řád
STR_ORDERS_LIST_TOOLTIP :{BLACK}Seznam příkazů - stiskni příkaz pro označení. Kliknutím na příkaz se stisknutým CTRL se nastaví pohled na stanici
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Konec příkazů - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Konec sdílených příkazů - -
+STR_ORDERS_END_OF_ORDERS :- - Konec příkazů - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Konec sdílených příkazů - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Jet bez zastavení
@@ -3165,9 +3163,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Přepnou
STR_TIMETABLE_TOOLTIP :{BLACK}Jízdní řád - příkaz vybereš kliknutím.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Nikam nejet
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Jet do (mimo jízdní řád)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Jet do {STRING}
+STR_TIMETABLE_NO_TRAVEL :Nikam nejet
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Jet do (mimo jízdní řád)
+STR_TIMETABLE_TRAVEL_FOR :Jet do {STRING}
STR_TIMETABLE_STAY_FOR :a zůstat {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :a jet {STRING}
STR_TIMETABLE_DAYS :{COMMA} d{P en ny nů}
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index a9606410e..f4d24382a 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -2971,11 +2971,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Kørepla
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Skift til køreplan-visning
STR_ORDERS_LIST_TOOLTIP :{BLACK}Ordreliste - klik på en ordre for at markere den. CTRL-klik for at centrere skærmen over stationen
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Slut på ordrer - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Slut på delt ordreliste - -
+STR_ORDERS_END_OF_ORDERS :- - Slut på ordrer - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Slut på delt ordreliste - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Uden stop
@@ -3098,9 +3096,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Skift ti
STR_TIMETABLE_TOOLTIP :{BLACK}Køreplan - klik på en ordre for at markere den.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Rejs ikke
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Rejs (ikke iflg. køreplan)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Rejs i {STRING}
+STR_TIMETABLE_NO_TRAVEL :Rejs ikke
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Rejs (ikke iflg. køreplan)
+STR_TIMETABLE_TRAVEL_FOR :Rejs i {STRING}
STR_TIMETABLE_STAY_FOR :og vent i {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :og rejs i {STRING}
STR_TIMETABLE_DAYS :{COMMA} dag{P "" e}
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index 6b738ca97..c487e826e 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -2998,11 +2998,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Dienstre
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Schakel naar de dienstregeling
STR_ORDERS_LIST_TOOLTIP :{BLACK}Orderlijst - klik op een order om deze te selecteren. Ctrl+klik gaat naar het station
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Einde van orders - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Einde gedeelde orders - -
+STR_ORDERS_END_OF_ORDERS :- - Einde van orders - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Einde gedeelde orders - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Non-stop
@@ -3125,9 +3123,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Ga naar
STR_TIMETABLE_TOOLTIP :{BLACK}Dienstregeling - klik op een opdracht om het te selecteren
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Niet rijden
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Reis (geen dienstregeling)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Reis naar {STRING}
+STR_TIMETABLE_NO_TRAVEL :Niet rijden
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Reis (geen dienstregeling)
+STR_TIMETABLE_TRAVEL_FOR :Reis naar {STRING}
STR_TIMETABLE_STAY_FOR :en blijf voor {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :en rijdt naar {STRING}
STR_TIMETABLE_DAYS :{COMMA} dag{P "" en}
diff --git a/src/lang/english.txt b/src/lang/english.txt
index e4a77dda1..2baca19ec 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -2998,11 +2998,11 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Timetabl
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Switch to the timetable view
STR_ORDERS_LIST_TOOLTIP :{BLACK}Orders list - click on an order to highlight it. Ctrl+Click scrolls to the station
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING4} {STRING2}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING4} {STRING2}
+STR_ORDER_INDEX :{COMMA}:{NBSP}
+STR_ORDER_TEXT :{STRING4} {STRING2}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - End of Orders - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - End of Shared Orders - -
+STR_ORDERS_END_OF_ORDERS :- - End of Orders - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - End of Shared Orders - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Non-stop
@@ -3125,9 +3125,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Switch t
STR_TIMETABLE_TOOLTIP :{BLACK}Timetable - click on an order to highlight it.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}No travel
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Travel (not timetabled)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Travel for {STRING1}
+STR_TIMETABLE_NO_TRAVEL :No travel
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Travel (not timetabled)
+STR_TIMETABLE_TRAVEL_FOR :Travel for {STRING1}
STR_TIMETABLE_STAY_FOR :and stay for {STRING1}
STR_TIMETABLE_AND_TRAVEL_FOR :and travel for {STRING1}
STR_TIMETABLE_DAYS :{COMMA} day{P "" s}
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index faea262fa..2823a7e75 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -2970,11 +2970,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Timetabl
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Switch to the timetable view
STR_ORDERS_LIST_TOOLTIP :{BLACK}Orders list - click on order to highlight it
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - End of Orders - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - End of Shared Orders - -
+STR_ORDERS_END_OF_ORDERS :- - End of Orders - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - End of Shared Orders - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Non-stop
@@ -3097,9 +3095,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Switch t
STR_TIMETABLE_TOOLTIP :{BLACK}Timetable - click on an order to highlight it.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}No travel
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Travel (not timetabled)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Travel for {STRING}
+STR_TIMETABLE_NO_TRAVEL :No travel
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Travel (not timetabled)
+STR_TIMETABLE_TRAVEL_FOR :Travel for {STRING}
STR_TIMETABLE_STAY_FOR :and stay for {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :and travel for {STRING}
STR_TIMETABLE_DAYS :{COMMA} day{P "" s}
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index 920d83a57..f83600f92 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -2715,8 +2715,8 @@ STR_ORDERS_CAPTION :{WHITE}{VEHICLE
STR_ORDERS_LIST_TOOLTIP :{BLACK}Ordena listo - alklaku ordenon por elekti. CTRL + klako skrolas al la stacio
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Fino de Ordenoj - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Fino de Dividitaj Ordenoj - -
+STR_ORDERS_END_OF_ORDERS :- - Fino de Ordenoj - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Fino de Dividitaj Ordenoj - -
# Order bottom buttons
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index d721d4779..2bb097ba0 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -3030,11 +3030,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Sõidupl
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Näita sõiduplaani
STR_ORDERS_LIST_TOOLTIP :{BLACK}Sihtpunktide nimekiri. Valimiseks klõpsa sihtpunktil. CTRL + klikk keskendab vaateakna jaama peale.
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Sihtpunktide lõpp - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Jagatud sihtpunktide lõpp - -
+STR_ORDERS_END_OF_ORDERS :- - Sihtpunktide lõpp - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Jagatud sihtpunktide lõpp - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Peatusteta
@@ -3157,9 +3155,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Lülita
STR_TIMETABLE_TOOLTIP :{BLACK}Sõiduplaan - esiletõstmiseks klõpsa sihtpunktil
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Sõitu pole
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Sõitmine (sõiduplaanita)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Sõida {STRING}
+STR_TIMETABLE_NO_TRAVEL :Sõitu pole
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Sõitmine (sõiduplaanita)
+STR_TIMETABLE_TRAVEL_FOR :Sõida {STRING}
STR_TIMETABLE_STAY_FOR :ja oota {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :ja sõida {STRING} jaoks
STR_TIMETABLE_DAYS :{COMMA} päev{P "" a}
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index 83427d443..0359b6895 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -2998,11 +2998,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Aikataul
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Näytä aikataulu
STR_ORDERS_LIST_TOOLTIP :{BLACK}Aikataulu - napsauta määräystä korostaaksesi.
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - aikataulun loppu - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - jaetun aikataulun loppu - -
+STR_ORDERS_END_OF_ORDERS :- - aikataulun loppu - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - jaetun aikataulun loppu - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Nonstop
@@ -3125,9 +3123,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Vaihda m
STR_TIMETABLE_TOOLTIP :{BLACK}Aikataulu - valitse rivi
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Ei kulkua
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Kiertävä (ei aikataulua)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Kulje kohteeseen {STRING}
+STR_TIMETABLE_NO_TRAVEL :Ei kulkua
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Kiertävä (ei aikataulua)
+STR_TIMETABLE_TRAVEL_FOR :Kulje kohteeseen {STRING}
STR_TIMETABLE_STAY_FOR :ja odota {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :ja kulje {STRING}
STR_TIMETABLE_DAYS :{COMMA} päivä{P "" ä}
diff --git a/src/lang/french.txt b/src/lang/french.txt
index 663ca9431..71e4dedc4 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -2999,11 +2999,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Horaire
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Basculer vers la vue horaire
STR_ORDERS_LIST_TOOLTIP :{BLACK}Liste des ordres - Cliquer sur un ordre pour le sélectionner. Ctrl-clic pour déplacer la vue sur la station
-STR_ORDER :{SETX 10}{COMMA}{NBSP}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}{NBSP}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Fin des ordres - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Fin des ordres partagés - -
+STR_ORDERS_END_OF_ORDERS :- - Fin des ordres - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Fin des ordres partagés - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Sans arrêt
@@ -3126,9 +3124,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Basculer
STR_TIMETABLE_TOOLTIP :{BLACK}Horaire - cliquer sur un ordre pour le séléctionner.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Pas de voyage
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Voyager (sans horaires)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Voyager pendant {STRING}
+STR_TIMETABLE_NO_TRAVEL :Pas de voyage
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Voyager (sans horaires)
+STR_TIMETABLE_TRAVEL_FOR :Voyager pendant {STRING}
STR_TIMETABLE_STAY_FOR :et rester pendant {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :et voyager pendant {STRING}
STR_TIMETABLE_DAYS :{COMMA} jour{P "" s}
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index d0d22d51f..f4ddda88d 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -2922,11 +2922,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Horario
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Cambiar á vista de horarios
STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de Ordes - Pincha nunha orde para seleccionala
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Fin das Ordes - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Fin das ordes compartidas - -
+STR_ORDERS_END_OF_ORDERS :- - Fin das Ordes - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Fin das ordes compartidas - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Sen parar
@@ -3047,9 +3045,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Cambiar
STR_TIMETABLE_TOOLTIP :{BLACK}Horario - pincha nunha orde para seleccionala
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Sen viaxe
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Viaxar (sen horario)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Viaxar durante {STRING}
+STR_TIMETABLE_NO_TRAVEL :Sen viaxe
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Viaxar (sen horario)
+STR_TIMETABLE_TRAVEL_FOR :Viaxar durante {STRING}
STR_TIMETABLE_STAY_FOR :e parar durante {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :e viaxar durante {STRING}
STR_TIMETABLE_DAYS :{COMMA} día{P "" s}
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 6d55ba624..84399e25d 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -2999,11 +2999,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Fahrplan
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Zur Fahrplanansicht wechseln
STR_ORDERS_LIST_TOOLTIP :{BLACK}Auftragsliste - zum Markieren hier anklicken. Strg+Klick springt zum Bahnhof
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Ende der Aufträge - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Ende des gemeinsam genutzten Fahrplans - -
+STR_ORDERS_END_OF_ORDERS :- - Ende der Aufträge - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Ende des gemeinsam genutzten Fahrplans - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}ohne Halt
@@ -3126,9 +3124,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Zur Auft
STR_TIMETABLE_TOOLTIP :{BLACK}Fahrplan - Einträge anklicken, um sie zu markieren.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Nicht unterwegs
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Unterwegs (ohne Fahrplan)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Unterwegs für {STRING}
+STR_TIMETABLE_NO_TRAVEL :Nicht unterwegs
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Unterwegs (ohne Fahrplan)
+STR_TIMETABLE_TRAVEL_FOR :Unterwegs für {STRING}
STR_TIMETABLE_STAY_FOR :und {STRING} lang bleiben
STR_TIMETABLE_AND_TRAVEL_FOR :und {STRING} lang unterwegs
STR_TIMETABLE_DAYS :{COMMA} Tag{P "" e}
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index 71b007872..9405529f4 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -3099,11 +3099,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Δρομ
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Αλλαγή στην προβολή δρομολογίων
STR_ORDERS_LIST_TOOLTIP :{BLACK}Λίστα εντολών - κλικ σε μια εντολή για να την επιλέξετε. Ctrl+κλικ μετακινεί σε σταθμό
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Τέλος Εντολών - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Τέλος Μοιρασμένων Οδηγιών - -
+STR_ORDERS_END_OF_ORDERS :- - Τέλος Εντολών - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Τέλος Μοιρασμένων Οδηγιών - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Χωρίς στάση
@@ -3226,9 +3224,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Αλλα
STR_TIMETABLE_TOOLTIP :{BLACK}Δρομολόγια - κλικ σε μια εντολή για την τονίσετε.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Μη ταξιδέψεις
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Ταξίδεψε (όχι μεσώ δρομολογίου)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Ταξίδεψε για {STRING}
+STR_TIMETABLE_NO_TRAVEL :Μη ταξιδέψεις
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Ταξίδεψε (όχι μεσώ δρομολογίου)
+STR_TIMETABLE_TRAVEL_FOR :Ταξίδεψε για {STRING}
STR_TIMETABLE_STAY_FOR :και μείνε για {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :και ταξίδεψε για {STRING}
STR_TIMETABLE_DAYS :{COMMA} μέρ{P α ες}
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index d5c19ab61..f9dec595b 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -2984,11 +2984,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}לוח
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}עבור להצגת לוח זמנים
STR_ORDERS_LIST_TOOLTIP :{BLACK}רשימת יעדים - לחץ על יעד על מנת להדגישו
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - סוף רשימת היעדים - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - סוף של הוראות משותפות - -
+STR_ORDERS_END_OF_ORDERS :- - סוף רשימת היעדים - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - סוף של הוראות משותפות - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}ללא עצירה
@@ -3111,9 +3109,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}עבור
STR_TIMETABLE_TOOLTIP :{BLACK}לוח זמנים – בחר יעד
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}ללא מסע
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}(מסע (ללא לוח זמנים
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}{STRING} ערוך מסע ל
+STR_TIMETABLE_NO_TRAVEL :ללא מסע
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :(מסע (ללא לוח זמנים
+STR_TIMETABLE_TRAVEL_FOR :{STRING} ערוך מסע ל
STR_TIMETABLE_STAY_FOR :{STRING} והמתן למשך
STR_TIMETABLE_AND_TRAVEL_FOR :{STRING} וערוך מסע ל
STR_TIMETABLE_DAYS :ימים {COMMA}
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 84039d516..cbff980e4 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -3032,11 +3032,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Menetren
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Átkapcsolás menetrendi nézetre
STR_ORDERS_LIST_TOOLTIP :{BLACK}Menetrend - kattints egy célpontra a kijelöléséhez
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Menetrend vége - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Megosztott menetrend vége - -
+STR_ORDERS_END_OF_ORDERS :- - Menetrend vége - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Megosztott menetrend vége - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Non-stop
@@ -3159,9 +3157,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Átkapcs
STR_TIMETABLE_TOOLTIP :{BLACK}Menetrend - kijelöléshez kattints egy elemére
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Nincs utazás
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Következő célpontig a menetidő időzítetlen
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Következő célpontig rendelkezésre álló menetidő: {STRING}
+STR_TIMETABLE_NO_TRAVEL :Nincs utazás
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Következő célpontig a menetidő időzítetlen
+STR_TIMETABLE_TRAVEL_FOR :Következő célpontig rendelkezésre álló menetidő: {STRING}
STR_TIMETABLE_STAY_FOR :állomásra és maradj ott {STRING.t}ig
STR_TIMETABLE_AND_TRAVEL_FOR :és menj {STRING}
STR_TIMETABLE_DAYS :{COMMA} nap
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index 3767df1c7..4a651da98 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -2946,11 +2946,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Áætlun
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Skipta yfir í áætlanasýn
STR_ORDERS_LIST_TOOLTIP :{BLACK}Áætlun - smelltu til að velja stöð. CTRL + músartakki færir sjónarhorn að stöðinni
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Endi skipana - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Endi sameiginlegra skipana - -
+STR_ORDERS_END_OF_ORDERS :- - Endi skipana - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Endi sameiginlegra skipana - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Hraðleið
@@ -3073,9 +3071,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Skipta y
STR_TIMETABLE_TOOLTIP :{BLACK}Áætlun - smelltu á skipun til að velja hana.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Engin ferðalög
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Ferðalag (ekki sett í áætlun)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Ferðast í {STRING}
+STR_TIMETABLE_NO_TRAVEL :Engin ferðalög
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Ferðalag (ekki sett í áætlun)
+STR_TIMETABLE_TRAVEL_FOR :Ferðast í {STRING}
STR_TIMETABLE_STAY_FOR :og bíða í {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :og ferðast í {STRING}
STR_TIMETABLE_DAYS :{COMMA} dag{P "" a}
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index fbe216c41..427fdb7f7 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -2986,11 +2986,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Jadwal
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Tampilkan daftar jadwal keberangkatan
STR_ORDERS_LIST_TOOLTIP :{BLACK}Daftar perintah - klik pada perintah untuk menandainya. CTRL + klik ke stasiun
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Akhir Perintah - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Akhir Perintah Bersama - -
+STR_ORDERS_END_OF_ORDERS :- - Akhir Perintah - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Akhir Perintah Bersama - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Non-stop
@@ -3113,9 +3111,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Tampilka
STR_TIMETABLE_TOOLTIP :{BLACK}Daftar Jadwal Keberangkatan - Klik salah satu tujuan untuk memilihnya.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Tidak berjalan
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Perjalanan belum terjadwal
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Berjalan selama {STRING}
+STR_TIMETABLE_NO_TRAVEL :Tidak berjalan
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Perjalanan belum terjadwal
+STR_TIMETABLE_TRAVEL_FOR :Berjalan selama {STRING}
STR_TIMETABLE_STAY_FOR :dan tinggal selama {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :dan berjalan selama {STRING}
STR_TIMETABLE_DAYS :{COMMA} hari
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index c8979e3ed..8ad9bf632 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -3000,11 +3000,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Orario
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Passa alla visualizzazione della tabella oraria
STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista degli ordini - fare clic su un ordine per selezionarlo e CTRL+clic per portarsi sulla stazione corrispondente
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Fine degli ordini - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Fine degli ordini condivisi - -
+STR_ORDERS_END_OF_ORDERS :- - Fine degli ordini - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Fine degli ordini condivisi - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}No-stop
@@ -3127,9 +3125,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Passa al
STR_TIMETABLE_TOOLTIP :{BLACK}Tabella oraria - fare clic su un ordine per selezionarlo
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Nessun viaggio
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Viaggia senza orario
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Viaggia per {STRING}
+STR_TIMETABLE_NO_TRAVEL :Nessun viaggio
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Viaggia senza orario
+STR_TIMETABLE_TRAVEL_FOR :Viaggia per {STRING}
STR_TIMETABLE_STAY_FOR :e sosta per {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :e viaggia per {STRING}
STR_TIMETABLE_DAYS :{COMMA} giorn{P o i}
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index b98f244c2..a9a22be8b 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -2900,11 +2900,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}時刻
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}時刻表を表示します
STR_ORDERS_LIST_TOOLTIP :{BLACK}指令リスト - 指令を選択するにはクリックします
-STR_ORDER :{SETX 10}{COMMA}:{SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}:{SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - 指令終了 - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - 共有指令の終了- -
+STR_ORDERS_END_OF_ORDERS :- - 指令終了 - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - 共有指令の終了- -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}直行便
@@ -3016,8 +3014,8 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}指令
STR_TIMETABLE_TOOLTIP :{BLACK}時刻表 - 指令を選択するにはクリックします。
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}運行(未計画)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}{STRING}運行
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :運行(未計画)
+STR_TIMETABLE_TRAVEL_FOR :{STRING}運行
STR_TIMETABLE_STAY_FOR :{STRING}停車
STR_TIMETABLE_DAYS :{COMMA}日間
STR_TIMETABLE_TICKS :{COMMA}ティック
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 670038d2f..a329538ed 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -2987,11 +2987,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}시간
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}시간표 보기 전환
STR_ORDERS_LIST_TOOLTIP :{BLACK}이 열차의 경로 - 선택하려면 클릭하세요. CTRL+클릭하시면 그 역이 있는 장소로 이동합니다.
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - 경로의 끝 - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - 공유된 경로의 끝 - -
+STR_ORDERS_END_OF_ORDERS :- - 경로의 끝 - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - 공유된 경로의 끝 - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}통과 설정
@@ -3114,9 +3112,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}순서
STR_TIMETABLE_TOOLTIP :{BLACK}시간표 - 경로를 클릭하면 선택합니다.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}운행정보 없음
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}여행 (시간표 없음)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}{STRING}로 여행
+STR_TIMETABLE_NO_TRAVEL :운행정보 없음
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :여행 (시간표 없음)
+STR_TIMETABLE_TRAVEL_FOR :{STRING}로 여행
STR_TIMETABLE_STAY_FOR :그리고 {STRING}에 머무름
STR_TIMETABLE_AND_TRAVEL_FOR :그리고 {STRING}(으)로 이동
STR_TIMETABLE_DAYS :{COMMA} 일
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index 75d2689ca..508b9c077 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -2966,11 +2966,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Saraksts
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Pārslēgties uz Saraksta skatu
STR_ORDERS_LIST_TOOLTIP :{BLACK}Rīkojumu saraksts - klik uz rīkojuma, lai atzīmētu to. Ctrl+klik ritina uz staciju
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Rīkojumu beigas - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Dalīto rīkojumu beigas - -
+STR_ORDERS_END_OF_ORDERS :- - Rīkojumu beigas - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Dalīto rīkojumu beigas - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Nestāties
@@ -3093,9 +3091,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Pārslē
STR_TIMETABLE_TOOLTIP :{BLACK}Saraksts-uzklikšķiniet uz maršrutu, lai izceltu to
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Bez braukšanas
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Braukšana (nav pēc saraksta )
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Braukt līdz{STRING}
+STR_TIMETABLE_NO_TRAVEL :Bez braukšanas
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Braukšana (nav pēc saraksta )
+STR_TIMETABLE_TRAVEL_FOR :Braukt līdz{STRING}
STR_TIMETABLE_STAY_FOR :un palikt līdz{STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :un braukt līdz{STRING}
STR_TIMETABLE_DAYS :{COMMA} dien{P a as u}
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index 79da0b0c1..42adbd7ef 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -2961,11 +2961,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Tvarkara
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Pereiti į tvarkaraštį
STR_ORDERS_LIST_TOOLTIP :{BLACK}Nurodymų sąrašas - nurodymas pažymimas ant jo spragtelėjus. Spregtelėjimas laikant VALD (CTRL) nukelia į stotį
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Užduočių pabaiga- -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Bendrų užduočių pabaiga - -
+STR_ORDERS_END_OF_ORDERS :- - Užduočių pabaiga- -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Bendrų užduočių pabaiga - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Nesustoti
@@ -3077,7 +3075,7 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Pereiti
STR_TIMETABLE_TOOLTIP :{BLACK}Grafikas - spausti ant nurodymo paryškinant jį.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Nėra kelionių
+STR_TIMETABLE_NO_TRAVEL :Nėra kelionių
STR_TIMETABLE_TOTAL_TIME :{BLACK}Apvažiuos visą maršrutą per {STRING}
STR_TIMETABLE_TOTAL_TIME_INCOMPLETE :{BLACK}Šis maršrutas užtruks mažiausiai {STRING} (ne viskas turi nustatytą laiką)
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index 2ad0e03d4..c5a141f15 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -2942,11 +2942,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Fuerplan
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Wiesselt op d'Fuerplangunzeig
STR_ORDERS_LIST_TOOLTIP :{BLACK}Optragslëscht - Klickt op en Optrag fir en ze selectéieren. CTRL+Klick hëlt d'Usiicht op d'Statioun
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Enn vun den Opträg - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Enn vun der Optragslëscht - -
+STR_ORDERS_END_OF_ORDERS :- - Enn vun den Opträg - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Enn vun der Optragslëscht - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Non-stop
@@ -3069,9 +3067,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Wiesselt
STR_TIMETABLE_TOOLTIP :{BLACK}Zäitplang - klickt op en Ueder fir en ze wielen
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Net ënnerwee
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Ënnerwee (ouni Fuerplang)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Ënnerwee fir {STRING}
+STR_TIMETABLE_NO_TRAVEL :Net ënnerwee
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Ënnerwee (ouni Fuerplang)
+STR_TIMETABLE_TRAVEL_FOR :Ënnerwee fir {STRING}
STR_TIMETABLE_STAY_FOR :an bleif fir {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :an ënnerwee op {STRING}
STR_TIMETABLE_DAYS :{COMMA} D{P ag eeg}
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index bedfb01ea..50bb9fae9 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -2974,11 +2974,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Tidstabe
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Bytt til tidstabellvisning
STR_ORDERS_LIST_TOOLTIP :{BLACK}Ordreliste - trykk på en ordre for å velge den
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Slutt på ordre - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Slutt på delte ordre - -
+STR_ORDERS_END_OF_ORDERS :- - Slutt på ordre - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Slutt på delte ordre - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Uten stopp
@@ -3101,9 +3099,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Bytt til
STR_TIMETABLE_TOOLTIP :{BLACK}Tidstabell - klikk en ordre for å merke den.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Ingen reise
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Reise (uten tidstabell)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Reise for {STRING}
+STR_TIMETABLE_NO_TRAVEL :Ingen reise
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Reise (uten tidstabell)
+STR_TIMETABLE_TRAVEL_FOR :Reise for {STRING}
STR_TIMETABLE_STAY_FOR :og bli værende i {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :og reis til{STRING}
STR_TIMETABLE_DAYS :{COMMA} dag{P "" s}
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index ef787352a..204ea2bdf 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -2927,11 +2927,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Rutetabe
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Bytt til rutetabellvinauge
STR_ORDERS_LIST_TOOLTIP :{BLACK}Ordreliste - trykk på ein ordre for å velje han
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Slutt på ordre - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Slutt på delte ordrar - -
+STR_ORDERS_END_OF_ORDERS :- - Slutt på ordre - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Slutt på delte ordrar - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Utan stopp
@@ -3051,9 +3049,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Bytt til
STR_TIMETABLE_TOOLTIP :{BLACK}Rutetabell - klikk på ei ordre for å merka den
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Ingen reise
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Reis (ikke på rutetabell)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Reis i {STRING}
+STR_TIMETABLE_NO_TRAVEL :Ingen reise
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Reis (ikke på rutetabell)
+STR_TIMETABLE_TRAVEL_FOR :Reis i {STRING}
STR_TIMETABLE_STAY_FOR :stå i {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :og reis for {STRING}
STR_TIMETABLE_DAYS :{COMMA} dag{P "" ar}
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index c52c510e6..361b44d45 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -3384,11 +3384,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Rozkład
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Otwórz widok rozkładu jazdy
STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista poleceń - klik na poleceniu, aby zaznaczyć. Ctrl+klik przenosi do stacji
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Koniec poleceń - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Koniec współdzielonych poleceń - -
+STR_ORDERS_END_OF_ORDERS :- - Koniec poleceń - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Koniec współdzielonych poleceń - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Non-stop
@@ -3511,9 +3509,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Przełą
STR_TIMETABLE_TOOLTIP :{BLACK}Rozkład jazdy - kliknij na poleceniu aby je zaznaczyć.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Nie podróżuje
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Przejazd (bez ustalonego czasu)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Przejazd przez {STRING}
+STR_TIMETABLE_NO_TRAVEL :Nie podróżuje
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Przejazd (bez ustalonego czasu)
+STR_TIMETABLE_TRAVEL_FOR :Przejazd przez {STRING}
STR_TIMETABLE_STAY_FOR :i zostań tam przez {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :i podróżuje przez{STRING}
STR_TIMETABLE_DAYS :{COMMA} d{P zień ni ni}
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index ae3b05f4a..a97a976c5 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -2998,11 +2998,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Horário
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Mudar para a vista de horário
STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de ordens - clique numa ordem para a seleccionar
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Fim de Ordens - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Fim de Ordens Partilhadas - -
+STR_ORDERS_END_OF_ORDERS :- - Fim de Ordens - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Fim de Ordens Partilhadas - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Sem paragens
@@ -3125,9 +3123,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Mudar pa
STR_TIMETABLE_TOOLTIP :{BLACK}Horário - clique numa ordem para a seleccionar.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Não viaja
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Viagem (sem programação)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Viajar durante {STRING}
+STR_TIMETABLE_NO_TRAVEL :Não viaja
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Viagem (sem programação)
+STR_TIMETABLE_TRAVEL_FOR :Viajar durante {STRING}
STR_TIMETABLE_STAY_FOR :e ficar durante {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :e viaja para {STRING}
STR_TIMETABLE_DAYS :{COMMA} dia{P "" s}
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index 7225ce740..3beca3a35 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -2997,11 +2997,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Orar
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Comuta in modul de vizualizare orar
STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de comenzi - clic pe o comandă pentru a o selecta. Ctrl+clic poziţionează ecranul pe staţie
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Sfârşitul comenzilor - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Sfârşitul comenzilor sincronizate - -
+STR_ORDERS_END_OF_ORDERS :- - Sfârşitul comenzilor - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Sfârşitul comenzilor sincronizate - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Non-stop
@@ -3124,9 +3122,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Schimba
STR_TIMETABLE_TOOLTIP :{BLACK}Orar - click pe un ordin pentru a-l selecta
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}NU este calatorie
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Calatorie (fara orar)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Calatorii pentru {STRING}
+STR_TIMETABLE_NO_TRAVEL :NU este calatorie
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Calatorie (fara orar)
+STR_TIMETABLE_TRAVEL_FOR :Calatorii pentru {STRING}
STR_TIMETABLE_STAY_FOR :si opriri pentru {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :si calatoreste pentru {STRING}
STR_TIMETABLE_DAYS :{COMMA} zi{P "" le}
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 8e67e1010..ea69edfa4 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -3155,11 +3155,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Расп
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Просмотр расписания
STR_ORDERS_LIST_TOOLTIP :{BLACK}Показ списка заданий - щёлкните для выделения. Если зажать Ctrl - обзор станции.
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Конец заданий - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Конец общих заданий - -
+STR_ORDERS_END_OF_ORDERS :- - Конец заданий - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Конец общих заданий - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Без остановки
@@ -3282,9 +3280,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Пере
STR_TIMETABLE_TOOLTIP :{BLACK}Расписание - выберите задание.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Нет назначения
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Время в пути (неизвестно)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Время в пути - {STRING}
+STR_TIMETABLE_NO_TRAVEL :Нет назначения
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Время в пути (неизвестно)
+STR_TIMETABLE_TRAVEL_FOR :Время в пути - {STRING}
STR_TIMETABLE_STAY_FOR :и ждать {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :и идти до {STRING}
STR_TIMETABLE_DAYS :{COMMA} д{P ень ня ней}
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index 18faefd4a..ba6d27d8f 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -3193,11 +3193,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Raspored
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Prelazi na raspored
STR_ORDERS_LIST_TOOLTIP :{BLACK}Spisak naredbi - klikom se obeležava naredba. Sa Ctrl+Klik se prelazi na lokaciju stanice
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Kraj Naredbi - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Kraj Zajedničkih Naredbi - -
+STR_ORDERS_END_OF_ORDERS :- - Kraj Naredbi - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Kraj Zajedničkih Naredbi - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Direktno
@@ -3320,9 +3318,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Prelazi
STR_TIMETABLE_TOOLTIP :{BLACK}Raspored - klikom se obeležava naredba.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Nema putovanja
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Putovanje (bez rasporeda)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Putovanje za {STRING}
+STR_TIMETABLE_NO_TRAVEL :Nema putovanja
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Putovanje (bez rasporeda)
+STR_TIMETABLE_TRAVEL_FOR :Putovanje za {STRING}
STR_TIMETABLE_STAY_FOR :i ostani {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :i putuj {STRING}
STR_TIMETABLE_DAYS :{COMMA} dan{P "" a a}
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index fd80e783f..47b0c4d1a 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -2973,11 +2973,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}时间
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}切换到时间表视图
STR_ORDERS_LIST_TOOLTIP :{BLACK}调度列表{}单击一个调度指令可以使之高亮化{}CTRL + 单击{}可以将视点移动到相应的车站
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}-- 调度计划结束 --
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - 共享调度计划结束 - -
+STR_ORDERS_END_OF_ORDERS :-- 调度计划结束 --
+STR_ORDERS_END_OF_SHARED_ORDERS :- - 共享调度计划结束 - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}不停车
@@ -3100,9 +3098,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}切换
STR_TIMETABLE_TOOLTIP :{BLACK}时间表 - 单击一个命令可以使其高亮。
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}原地待命
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}行驶 (无时间表)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}途中行驶 {STRING}
+STR_TIMETABLE_NO_TRAVEL :原地待命
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :行驶 (无时间表)
+STR_TIMETABLE_TRAVEL_FOR :途中行驶 {STRING}
STR_TIMETABLE_STAY_FOR :并且停留 {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :并行驶{STRING}
STR_TIMETABLE_DAYS :{COMMA} 天
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index c8e3a0e17..ced73345c 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -3040,11 +3040,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}CP
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Prepnút na zobrazenie cestovného poriadku
STR_ORDERS_LIST_TOOLTIP :{BLACK}Zoznam prikazov - kliknut na prikaz pre oznacenie
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Koniec prikazov - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Koniec zdielanych prikazov - -
+STR_ORDERS_END_OF_ORDERS :- - Koniec prikazov - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Koniec zdielanych prikazov - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Non-stop
@@ -3167,9 +3165,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Prepnút
STR_TIMETABLE_TOOLTIP :{BLACK}Cestovný poriadok - kliknite na príkaz pre jeho oznacenie
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Necestuj
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Cesta (neurcený cas)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Cesta do {STRING}
+STR_TIMETABLE_NO_TRAVEL :Necestuj
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Cesta (neurcený cas)
+STR_TIMETABLE_TRAVEL_FOR :Cesta do {STRING}
STR_TIMETABLE_STAY_FOR :prestávka {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :a cestuj {STRING}
STR_TIMETABLE_DAYS :{COMMA} d{P en ni ní}
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index efafe7db5..f83f2164a 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -2987,11 +2987,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Časovna
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Preklop na pogled časovnih tabel
STR_ORDERS_LIST_TOOLTIP :{BLACK}Seznam navodil - klikni na ukaz, da ga izbereš. CTRL+klik prikaže postajo
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Konec ukazov - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Konec ukazov v skupni rabi - -
+STR_ORDERS_END_OF_ORDERS :- - Konec ukazov - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Konec ukazov v skupni rabi - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Non-stop
@@ -3114,9 +3112,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Preklop
STR_TIMETABLE_TOOLTIP :{BLACK}Časovna tabela - clikni na ukaz za ga označit.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Brez potovanja
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Potovanje (brez časovnih tabel)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Potuj za {STRING}
+STR_TIMETABLE_NO_TRAVEL :Brez potovanja
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Potovanje (brez časovnih tabel)
+STR_TIMETABLE_TRAVEL_FOR :Potuj za {STRING}
STR_TIMETABLE_STAY_FOR :in ostani za {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :s potovanjem za {STRING}
STR_TIMETABLE_DAYS :{COMMA} d{P an neva i i}
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index c6049e773..4abae47cf 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -2999,11 +2999,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Horarios
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Cambiar a la vista de horarios
STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de órdenes - click en orden para resaltarla
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Fin de pedidos - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Fin de órdenes compartidas - -
+STR_ORDERS_END_OF_ORDERS :- - Fin de pedidos - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Fin de órdenes compartidas - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Sin paradas
@@ -3126,9 +3124,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Cambiar
STR_TIMETABLE_TOOLTIP :{BLACK}Horarios - pulse en una orden para marcarla.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Sin viaje
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Viaje (sin horarios)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Viaje para {STRING}
+STR_TIMETABLE_NO_TRAVEL :Sin viaje
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Viaje (sin horarios)
+STR_TIMETABLE_TRAVEL_FOR :Viaje para {STRING}
STR_TIMETABLE_STAY_FOR :y estancia en {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :y viajar por {STRING}
STR_TIMETABLE_DAYS :{COMMA} días{P "" s}
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index 2cce99779..7f9f934ab 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -2998,11 +2998,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Tidtabel
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Ändra till tidtabellsvy
STR_ORDERS_LIST_TOOLTIP :{BLACK}Orderlista - klicka på order för att markera det
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Slut på order - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Slut på delade order - -
+STR_ORDERS_END_OF_ORDERS :- - Slut på order - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Slut på delade order - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Utan uppehåll
@@ -3125,9 +3123,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Byt till
STR_TIMETABLE_TOOLTIP :{BLACK}Tidstabell - klicka på en order för att markera den.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Ingen resa
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Avres (Inte tillagd i tidtabell)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Res till {STRING}
+STR_TIMETABLE_NO_TRAVEL :Ingen resa
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Avres (Inte tillagd i tidtabell)
+STR_TIMETABLE_TRAVEL_FOR :Res till {STRING}
STR_TIMETABLE_STAY_FOR :och stanna i {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :och resa för {STRING}
STR_TIMETABLE_DAYS :{COMMA} dag{P "" ar}
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index f39d9689f..e2c87e3df 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -2989,11 +2989,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}時刻
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}切換至時刻表檢視模式
STR_ORDERS_LIST_TOOLTIP :{BLACK}指令清單 - 點選可選擇該指令,按住 CTRL 點選可跳到車站位置
-STR_ORDER :{SETX 10}{COMMA}:{SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}:{SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - 指令結束 - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - 共享指令結束 - -
+STR_ORDERS_END_OF_ORDERS :- - 指令結束 - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - 共享指令結束 - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}直達
@@ -3116,9 +3114,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}切到
STR_TIMETABLE_TOOLTIP :{BLACK}時刻表 - 點選一個命令可以標示
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}原地待命
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}運行中 (未訂時刻表)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}運行需時 {STRING}
+STR_TIMETABLE_NO_TRAVEL :原地待命
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :運行中 (未訂時刻表)
+STR_TIMETABLE_TRAVEL_FOR :運行需時 {STRING}
STR_TIMETABLE_STAY_FOR :並等待 {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :並運行 {STRING}
STR_TIMETABLE_DAYS :{COMMA} 日
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index 449437f9d..e12fb259b 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -2972,11 +2972,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Zaman ç
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Zaman tablosu görünümüne geç
STR_ORDERS_LIST_TOOLTIP :{BLACK}Talimat listesi - seçmek için komutu tıklayın. CTRL + tıklama istasyona kaydırir
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Talimatların Sonu - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Paylaşılmış talimat sonu - -
+STR_ORDERS_END_OF_ORDERS :- - Talimatların Sonu - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Paylaşılmış talimat sonu - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Durmaksızın
@@ -3099,9 +3097,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Emir gö
STR_TIMETABLE_TOOLTIP :{BLACK}Zaman çizelgesi - işaretlemek için bir talimata tıklayın.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Sefer yok
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Gezi (zamanlı değil)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}{STRING} boyunca yol al
+STR_TIMETABLE_NO_TRAVEL :Sefer yok
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Gezi (zamanlı değil)
+STR_TIMETABLE_TRAVEL_FOR :{STRING} boyunca yol al
STR_TIMETABLE_STAY_FOR :{STRING} bekle
STR_TIMETABLE_AND_TRAVEL_FOR :ve şuraya sefer yap: {STRING}
STR_TIMETABLE_DAYS :{COMMA} gün
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 3ae41b63e..25e3a1d95 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -3108,11 +3108,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Розк
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Переключитись на розклад
STR_ORDERS_LIST_TOOLTIP :{BLACK}Маршрутний лист - клікніть на завданні для його вибору. CTRL + клік показати станцію
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Кінець наказів - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Кінець наказів - -
+STR_ORDERS_END_OF_ORDERS :- - Кінець наказів - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Кінець наказів - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Без зупинки
@@ -3235,9 +3233,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Пере
STR_TIMETABLE_TOOLTIP :{BLACK}Розклад - клікніть на наказі, щоб виділити.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Не прямувати
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Прямує (не за розкладом)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Прямує до {STRING}
+STR_TIMETABLE_NO_TRAVEL :Не прямувати
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Прямує (не за розкладом)
+STR_TIMETABLE_TRAVEL_FOR :Прямує до {STRING}
STR_TIMETABLE_STAY_FOR :і стояти {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :і прямувати до {STRING}
STR_TIMETABLE_DAYS :{COMMA} д{P ень ні нів}
diff --git a/src/lang/unfinished/basque.txt b/src/lang/unfinished/basque.txt
index bb3d4bbba..9ddccbf12 100644
--- a/src/lang/unfinished/basque.txt
+++ b/src/lang/unfinished/basque.txt
@@ -1175,8 +1175,6 @@ STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARG
# Order view
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
# Order bottom buttons
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index e0e989afa..948644f18 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -1461,10 +1461,8 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP :{BLACK}تعمی
STR_ORDERS_CAPTION :{WHITE}{VEHICLE} (دستورات)
STR_ORDERS_LIST_TOOLTIP :{BLACK}لیست دستورات - برای مشخص کردن دستور روی آن کلیک کنید. Ctrl+click به ایستگاه میرود
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - پایان دستورات - -
+STR_ORDERS_END_OF_ORDERS :- - پایان دستورات - -
# Order bottom buttons
diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt
index efc2368e2..2fdd1ca68 100644
--- a/src/lang/unfinished/thai.txt
+++ b/src/lang/unfinished/thai.txt
@@ -1403,7 +1403,7 @@ STR_VEHICLE_DETAIL_TAB_CAPACITIES :{BLACK}ปร
# Order view
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - สิ้นสุดรายการที่ใช้ร่วมกัน - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - สิ้นสุดรายการที่ใช้ร่วมกัน - -
# Order bottom buttons
diff --git a/src/lang/unfinished/vietnamese.txt b/src/lang/unfinished/vietnamese.txt
index b7e90f896..c221f286b 100644
--- a/src/lang/unfinished/vietnamese.txt
+++ b/src/lang/unfinished/vietnamese.txt
@@ -1819,11 +1819,9 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Thay m
STR_ORDERS_TIMETABLE_VIEW :{BLACK}Lịch chạy
STR_ORDERS_LIST_TOOLTIP :{BLACK}Lịch trình - click để tô sáng một thứ tự nào đó. Ctr+Click để nhảy đến nhà ga tương ứng
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Kết thúc - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Kết thúc - -
+STR_ORDERS_END_OF_ORDERS :- - Kết thúc - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Kết thúc - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Chạy suốt
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index 402bf3b2d..b8763daff 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -2945,11 +2945,9 @@ STR_ORDERS_TIMETABLE_VIEW :{BLACK}Amserlen
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Newid i'r golwg amserlen
STR_ORDERS_LIST_TOOLTIP :{BLACK}Rhestr orchmynion - cliciwch orchymyn i'w amlygu. mae CTRL + clic yn eich sgrolio i'r orsaf
-STR_ORDER :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDER_SELECTED :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
-STR_ORDERS_END_OF_ORDERS :{SETX 10}- - Diwedd Gorchmynion - -
-STR_ORDERS_END_OF_SHARED_ORDERS :{SETX 10}- - Diwedd y Gorchmynion sydd wedi'u Rhannu - -
+STR_ORDERS_END_OF_ORDERS :- - Diwedd Gorchmynion - -
+STR_ORDERS_END_OF_SHARED_ORDERS :- - Diwedd y Gorchmynion sydd wedi'u Rhannu - -
# Order bottom buttons
STR_ORDER_NON_STOP :{BLACK}Heb stop
@@ -3072,9 +3070,9 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Newid i'
STR_TIMETABLE_TOOLTIP :{BLACK}Amserlen - cliciwch ar orchymyn er mwyn ei amlygu.
-STR_TIMETABLE_NO_TRAVEL :{SETX 30}Dim teithio
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :{SETX 30}Teithio (heb ei amserlenu)
-STR_TIMETABLE_TRAVEL_FOR :{SETX 30}Teithio am{STRING}
+STR_TIMETABLE_NO_TRAVEL :Dim teithio
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Teithio (heb ei amserlenu)
+STR_TIMETABLE_TRAVEL_FOR :Teithio am{STRING}
STR_TIMETABLE_STAY_FOR :aros am {STRING}
STR_TIMETABLE_AND_TRAVEL_FOR :a theithio am {STRING}
STR_TIMETABLE_DAYS :{COMMA} diwrnod{P "" au}
diff --git a/src/order_func.h b/src/order_func.h
index 0ba62fab6..1e016858b 100644
--- a/src/order_func.h
+++ b/src/order_func.h
@@ -47,7 +47,7 @@ bool ProcessOrders(Vehicle *v);
bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth = 0);
VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle *v);
-void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int left, int right);
+void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int left, int middle, int right);
#define MIN_SERVINT_PERCENT 5
#define MAX_SERVINT_PERCENT 90
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index a4895b9c2..cf5cb4ff8 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -176,36 +176,58 @@ static int DepotActionStringIndex(const Order *order)
}
}
-void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int left, int right)
+/**
+ * Draws an order in order or timetable GUI
+ * @param v Vehicle the order belongs to
+ * @param order The order to draw
+ * @param order_index Index of the order in the orders of the vehicle
+ * @param y Y position for drawing
+ * @param selected True, if the order is selected
+ * @param timetable True, when drawing in the timetable GUI
+ * @param left Left border for text drawing
+ * @param middle X position between order index and order text
+ * @param right Right border for text drawing
+ */
+void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int left, int middle, int right)
{
- StringID str = (v->cur_order_index == order_index) ? STR_ORDER_SELECTED : STR_ORDER;
- SetDParam(6, STR_EMPTY);
+ bool rtl = _dynlang.text_dir == TD_RTL;
+
+ SpriteID sprite = rtl ? SPR_ARROW_LEFT : SPR_ARROW_RIGHT;
+ Dimension sprite_size = GetSpriteSize(sprite);
+ if (v->cur_order_index == order_index) {
+ DrawSprite(sprite, PAL_NONE, rtl ? right - sprite_size.width : left, y + (FONT_HEIGHT_NORMAL - sprite_size.height) / 2);
+ }
+
+ SetDParam(0, order_index + 1);
+ DrawString(left, rtl ? right - sprite_size.width - 3 : middle, y, STR_ORDER_INDEX, selected ? TC_WHITE : TC_BLACK, SA_RIGHT | SA_FORCE);
+
+ SetDParam(5, STR_EMPTY);
switch (order->GetType()) {
case OT_DUMMY:
- SetDParam(1, STR_INVALID_ORDER);
- SetDParam(2, order->GetDestination());
+ SetDParam(0, STR_INVALID_ORDER);
+ SetDParam(1, order->GetDestination());
break;
case OT_GOTO_STATION: {
OrderLoadFlags load = order->GetLoadType();
OrderUnloadFlags unload = order->GetUnloadType();
- SetDParam(1, STR_ORDER_GO_TO_STATION);
- SetDParam(2, STR_ORDER_GO_TO + ((v->type == VEH_TRAIN || v->type == VEH_ROAD) ? order->GetNonStopType() : 0));
- SetDParam(3, order->GetDestination());
+ SetDParam(0, STR_ORDER_GO_TO_STATION);
+ SetDParam(1, STR_ORDER_GO_TO + ((v->type == VEH_TRAIN || v->type == VEH_ROAD) ? order->GetNonStopType() : 0));
+ SetDParam(2, order->GetDestination());
if (timetable) {
- SetDParam(4, STR_EMPTY);
+ SetDParam(3, STR_EMPTY);
if (order->wait_time > 0) {
- SetDParam(6, STR_TIMETABLE_STAY_FOR);
- SetTimetableParams(7, 8, order->wait_time);
+ SetDParam(5, STR_TIMETABLE_STAY_FOR);
+ SetTimetableParams(6, 7, order->wait_time);
}
} else {
- SetDParam(4, (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) ? STR_EMPTY : _station_load_types[unload][load]);
+ SetDParam(3, (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) ? STR_EMPTY : _station_load_types[unload][load]);
if (v->type == VEH_TRAIN && (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) == 0) {
- SetDParam(6, order->GetStopLocation() + STR_ORDER_STOP_LOCATION_NEAR_END);
+ SetDParam(5, order->GetStopLocation() + STR_ORDER_STOP_LOCATION_NEAR_END);
}
}
} break;
@@ -213,74 +235,73 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
case OT_GOTO_DEPOT:
if (v->type == VEH_AIRCRAFT) {
if (order->GetDepotActionType() & ODATFB_NEAREST_DEPOT) {
- SetDParam(1, STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT);
- SetDParam(3, STR_ORDER_NEAREST_HANGAR);
+ SetDParam(0, STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT);
+ SetDParam(2, STR_ORDER_NEAREST_HANGAR);
} else {
- SetDParam(1, STR_ORDER_GO_TO_HANGAR_FORMAT);
- SetDParam(3, order->GetDestination());
+ SetDParam(0, STR_ORDER_GO_TO_HANGAR_FORMAT);
+ SetDParam(2, order->GetDestination());
}
- SetDParam(4, STR_EMPTY);
+ SetDParam(3, STR_EMPTY);
} else {
if (order->GetDepotActionType() & ODATFB_NEAREST_DEPOT) {
- SetDParam(1, STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT);
- SetDParam(3, STR_ORDER_NEAREST_DEPOT);
+ SetDParam(0, STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT);
+ SetDParam(2, STR_ORDER_NEAREST_DEPOT);
} else {
- SetDParam(1, STR_ORDER_GO_TO_DEPOT_FORMAT);
- SetDParam(3, Depot::Get(order->GetDestination())->town_index);
+ SetDParam(0, STR_ORDER_GO_TO_DEPOT_FORMAT);
+ SetDParam(2, Depot::Get(order->GetDestination())->town_index);
}
- SetDParam(4, STR_ORDER_TRAIN_DEPOT + v->type);
+ SetDParam(3, STR_ORDER_TRAIN_DEPOT + v->type);
}
if (order->GetDepotOrderType() & ODTFB_SERVICE) {
- SetDParam(2, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_SERVICE_NON_STOP_AT : STR_ORDER_SERVICE_AT);
+ SetDParam(1, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_SERVICE_NON_STOP_AT : STR_ORDER_SERVICE_AT);
} else {
- SetDParam(2, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_GO_NON_STOP_TO : STR_ORDER_GO_TO);
+ SetDParam(1, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_GO_NON_STOP_TO : STR_ORDER_GO_TO);
}
if (!timetable && (order->GetDepotActionType() & ODATFB_HALT)) {
- SetDParam(6, STR_ORDER_STOP_ORDER);
+ SetDParam(5, STR_ORDER_STOP_ORDER);
}
if (!timetable && order->IsRefit()) {
- SetDParam(6, (order->GetDepotActionType() & ODATFB_HALT) ? STR_ORDER_REFIT_STOP_ORDER : STR_ORDER_REFIT_ORDER);
- SetDParam(7, CargoSpec::Get(order->GetRefitCargo())->name);
+ SetDParam(5, (order->GetDepotActionType() & ODATFB_HALT) ? STR_ORDER_REFIT_STOP_ORDER : STR_ORDER_REFIT_ORDER);
+ SetDParam(6, CargoSpec::Get(order->GetRefitCargo())->name);
}
break;
case OT_GOTO_WAYPOINT:
- SetDParam(1, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_GO_NON_STOP_TO_WAYPOINT : STR_ORDER_GO_TO_WAYPOINT);
- SetDParam(2, order->GetDestination());
+ SetDParam(0, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_GO_NON_STOP_TO_WAYPOINT : STR_ORDER_GO_TO_WAYPOINT);
+ SetDParam(1, order->GetDestination());
break;
case OT_CONDITIONAL:
- SetDParam(2, order->GetConditionSkipToOrder() + 1);
+ SetDParam(1, order->GetConditionSkipToOrder() + 1);
if (order->GetConditionVariable() == OCV_UNCONDITIONALLY) {
- SetDParam(1, STR_ORDER_CONDITIONAL_UNCONDITIONAL);
+ SetDParam(0, STR_ORDER_CONDITIONAL_UNCONDITIONAL);
} else {
OrderConditionComparator occ = order->GetConditionComparator();
- SetDParam(1, (occ == OCC_IS_TRUE || occ == OCC_IS_FALSE) ? STR_ORDER_CONDITIONAL_TRUE_FALSE : STR_ORDER_CONDITIONAL_NUM);
- SetDParam(3, STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE + order->GetConditionVariable());
- SetDParam(4, STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS + occ);
+ SetDParam(0, (occ == OCC_IS_TRUE || occ == OCC_IS_FALSE) ? STR_ORDER_CONDITIONAL_TRUE_FALSE : STR_ORDER_CONDITIONAL_NUM);
+ SetDParam(2, STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE + order->GetConditionVariable());
+ SetDParam(3, STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS + occ);
uint value = order->GetConditionValue();
if (order->GetConditionVariable() == OCV_MAX_SPEED) value = ConvertSpeedToDisplaySpeed(value);
- SetDParam(5, value);
+ SetDParam(4, value);
}
if (timetable && order->wait_time > 0) {
- SetDParam(6, STR_TIMETABLE_AND_TRAVEL_FOR);
- SetTimetableParams(7, 8, order->wait_time);
+ SetDParam(5, STR_TIMETABLE_AND_TRAVEL_FOR);
+ SetTimetableParams(6, 7, order->wait_time);
} else {
- SetDParam(6, STR_EMPTY);
+ SetDParam(5, STR_EMPTY);
}
break;
default: NOT_REACHED();
}
- SetDParam(0, order_index + 1);
- DrawString(left, right, y, str, selected ? TC_WHITE : TC_BLACK);
+ DrawString(rtl ? left : middle, rtl ? middle : right, y, STR_ORDER_TEXT, selected ? TC_WHITE : TC_BLACK);
}
@@ -914,6 +935,11 @@ public:
{
if (widget != ORDER_WIDGET_ORDER_LIST) return;
+ bool rtl = _dynlang.text_dir == TD_RTL;
+ SetDParam(0, 99);
+ int index_column_width = GetStringBoundingBox(STR_ORDER_INDEX).width + GetSpriteSize(rtl ? SPR_ARROW_RIGHT : SPR_ARROW_LEFT).width + 3;
+ int middle = rtl ? r.right - WD_FRAMETEXT_RIGHT - index_column_width : r.left + WD_FRAMETEXT_LEFT + index_column_width;
+
int y = r.top + WD_FRAMERECT_TOP;
int i = this->vscroll.GetPosition();
@@ -923,7 +949,7 @@ public:
/* Don't draw anything if it extends past the end of the window. */
if (!this->vscroll.IsVisible(i)) break;
- DrawOrderString(this->vehicle, order, i, y, i == this->selected_order, false, r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT);
+ DrawOrderString(this->vehicle, order, i, y, i == this->selected_order, false, r.left + WD_FRAMETEXT_LEFT, middle, r.right - WD_FRAMETEXT_RIGHT);
y += this->resize.step_height;
i++;
@@ -932,7 +958,7 @@ public:
if (this->vscroll.IsVisible(i)) {
str = this->vehicle->IsOrderListShared() ? STR_ORDERS_END_OF_SHARED_ORDERS : STR_ORDERS_END_OF_ORDERS;
- DrawString(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, str, (i == this->selected_order) ? TC_WHITE : TC_BLACK);
+ DrawString(rtl ? r.left + WD_FRAMETEXT_LEFT : middle, rtl ? middle : r.right - WD_FRAMETEXT_RIGHT, y, str, (i == this->selected_order) ? TC_WHITE : TC_BLACK);
}
}
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index 2143dadae..da4c8c519 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -361,13 +361,18 @@ struct TimetableWindow : Window {
VehicleOrderID order_id = (i + 1) / 2;
bool final_order = false;
+ bool rtl = _dynlang.text_dir == TD_RTL;
+ SetDParam(0, 99);
+ int index_column_width = GetStringBoundingBox(STR_ORDER_INDEX).width + GetSpriteSize(rtl ? SPR_ARROW_RIGHT : SPR_ARROW_LEFT).width + 3;
+ int middle = rtl ? r.right - WD_FRAMERECT_RIGHT - index_column_width : r.left + WD_FRAMERECT_LEFT + index_column_width;
+
const Order *order = v->GetOrder(order_id);
while (order != NULL) {
/* Don't draw anything if it extends past the end of the window. */
if (!this->vscroll.IsVisible(i)) break;
if (i % 2 == 0) {
- DrawOrderString(v, order, order_id, y, i == selected, true, r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT);
+ DrawOrderString(v, order, order_id, y, i == selected, true, r.left + WD_FRAMERECT_LEFT, middle, r.right - WD_FRAMERECT_RIGHT);
order_id++;
@@ -389,7 +394,7 @@ struct TimetableWindow : Window {
string = STR_TIMETABLE_TRAVEL_FOR;
}
- DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y, string, (i == selected) ? TC_WHITE : TC_BLACK);
+ DrawString(rtl ? r.left + WD_FRAMERECT_LEFT : middle, rtl ? middle : r.right - WD_FRAMERECT_LEFT, y, string, (i == selected) ? TC_WHITE : TC_BLACK);
if (final_order) break;
}