diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index e08c7d889d..1cfa5e45f1 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -2947,7 +2947,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :is waar
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :is fals
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Die waarde teen die voertuig data te vergelyk
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Tik in die waarde om teen te vergelyk
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Sprong
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index 2edd404ce9..d9c022f71d 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -3038,7 +3038,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :صحيح
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :خاطئ
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}القيمة التي يتم مقارنة العربة معها
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}ادخل قيمة للمقارنة معها
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}تجاوز
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index fe1e3e30cf..c5a8088dd4 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -3036,7 +3036,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :é verdadeiro
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :é falso
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}O valor a comparar com os dados do veículo
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Digite o valor a ser comparado
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltar
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index b7a9f1dd07..4ade0ee6be 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -2994,7 +2994,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :е правил
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :е неправилно
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Стойност, с която да сравня данните на превозното средство
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Вкарай стойност за сравнение
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Остави
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index d9a970507f..60dce2e031 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -3038,7 +3038,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :és verdader
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :és fals
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}El valor amb el que comparar de les dades del vehicle
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Introdueix el valor amb el que comparar
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Salta
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index e1fce36488..870dff5282 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -3063,7 +3063,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :je istinito
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :je lažno
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Vrijednost s kojim se uspoređuju podaci vozila
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Unesi vrijednost s kojom će se porediti
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Preskoči
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 706e480176..b67ad9b157 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -3096,7 +3096,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :je pravda
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :není pravda
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Hodnota, se kterou srovnat vlastnost vozidla
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Zadej hodnotu pro srovnávání
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Přeskočit
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 226b9b1cf2..e62b43871c 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -3035,7 +3035,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :er sand
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :er falsk
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Værdi data skal sammenlignes med
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Skriv værdi der sammenlignes med
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Spring over
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index 943b66bf9f..3950fa78b9 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -3038,7 +3038,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :is waar
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :is niet waar
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}De waarde waartegen het voertuig wordt vergeleken
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Geef waarde voor de vergelijking
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Sla over
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 267dd0d4b4..43a877cb96 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -3047,7 +3047,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :is true
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :is false
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}The value to compare the vehicle data against
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Enter value to compare against
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Skip
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index e33d71fa37..98900ee0b6 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -3034,7 +3034,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :is true
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :is false
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}The value to compare the vehicle data against
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Enter value to compare against
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Skip
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index 62202f73ff..1087259d50 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -3094,7 +3094,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :on tõene
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :on väär
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Väärtus, millega sõiduki andmeid võrreldakse
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Sisesta väärtus, millega võrrelda
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Jäta vahele
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index a1368568af..f4cf8991c2 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -3047,7 +3047,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :on tosi
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :on epätosi
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Arvo, johon kulkuneuvon tietoja verrataan
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Syötä arvo, johon verrataan
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Ohita
diff --git a/src/lang/french.txt b/src/lang/french.txt
index 06bd2f85af..d6ba1b6af2 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -3048,7 +3048,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :est vrai
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :est faux
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}La valeur à comparer aux données du véhicule
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Entrer la valeur à comparer
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Suivant
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index 80682da5c8..30c44bcc07 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -2986,7 +2986,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :é verdadeiro
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :é falso
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}O valor co que se compararán os datos do vehículo
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Escribe o valor co que comparar
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltar
diff --git a/src/lang/german.txt b/src/lang/german.txt
index b51e59559e..dde68a2c5c 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -3048,7 +3048,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :wahr
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :falsch
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Wert der mit Farzeuginformation verglichen wird
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Wert für den Vergleich eingeben
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Überspringen
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index 63eeb38c60..a47b8bd458 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -3108,7 +3108,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :είναι αλ
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :είναι ψευδές
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Η τιμή για να γίνει η σύγκριση με τα δεδομένα του οχήματος
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Δώστε τίμη για να συγκριθεί
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Παράκαμψη
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index 860e4ef38f..46558b6576 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -3033,7 +3033,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :אמת
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :שקר
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}ערך להשוואה מול נתוני כלי הרכב
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}:הכנס ערך כבסיס להשוואהֿ
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}דלג
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 404e7a762f..80447cf7f3 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -3072,7 +3072,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :igaz
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :hamis
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Az érték amihez a jármű egy adatát viszonyítjuk
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Írd be az értéket amihez viszonyítani szeretnél
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Kihagy
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index 1a30b5e7a0..c8432d84fc 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -3010,7 +3010,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :er satt
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :er ósatt
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Gildið sem bera á við gögn farartækis
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Skrifa skal tölu til að bera saman við
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Sleppa
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index ff726d6157..3ca93b3690 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -3038,7 +3038,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :benar
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :bukan
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Nilai untuk dibandingkan dengan kondisi
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Masukkan nilai untuk perbandingan
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Lewati
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index e663f42d5a..f960a54e58 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -3049,7 +3049,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :è vero
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :è falso
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Valore col quale confrontare il dato del veicolo
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Inserire il valore da confrontare
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Salta
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index c497c38fb0..ddb2bbb6f8 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -2961,7 +2961,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :である
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :ではない
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}乗り物のデータと比較する値
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}比較に用いる値を入力
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}スキップ
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index ec2d020250..2634f9eb8a 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -3035,7 +3035,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :이 있을 때
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :이 없을 때
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}차량 데이터에 대해 비교하기 위한 값
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}비교할 값을 입력하세요
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}건너뛰기
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index 8c82e9fd11..c42d86eaa6 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -3030,7 +3030,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :ir patiess
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :ir nepatiess
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Vērtība transporta datu salīdzināšanai pret
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Ievadiet vērtību ar kuru salīdzināsiet
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Izlaist
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index f75009aba0..91a1836e6d 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -3019,7 +3019,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :daugiau arba ly
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :tiesa
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :klaida
 
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Įveskite kainą palyginti su
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Praleisti
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index 48ac999d01..a88d18682d 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -3006,7 +3006,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :as wouer(true)
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :as falsch(false)
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Den Wert deen mat den Gefiertsdaten verglach gëtt
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Wert anginn fir ze vergläichen
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Iwersprangen
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index e422a318a1..afa3c90a8f 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -3032,7 +3032,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :er sant
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :er usant
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Verdien til å sammenligne kjøretøyets data mot
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Skriv inn verdi til å sammenligne mot
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Hopp over
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 5e5dba6e89..c0dcfcdf3e 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -2977,7 +2977,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :er rett
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :er feil
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Verdien som informasjon frå køyretøyet vert samanlikna med
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Skriv inn verdi å samanlikne med
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Hopp over
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index 195527ae4f..1ac1c582bc 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -3433,7 +3433,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :prawda
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :fałsz
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Wartość do porównania z danymi pojazdu
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Podaj wartość do porównania
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Pomiń
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index 68c85afd3a..05ea754e26 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -3038,7 +3038,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :é verdadeiro
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :é falso
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}O parâmetro para comparar os dados do veículo com
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Introduza um valor para comparar
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltar
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index 228490816a..00609ec0b7 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -3037,7 +3037,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :este adevărat
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :este fals
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Valoarea cu care se compară
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Introduceţi valoarea de comparat
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Treci la următoarea
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 24efac9269..35ebd7a784 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -3207,7 +3207,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :истина
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :ложь
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Значение для сравнения с данными транспорта
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Введите значение для сравнения
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Пропуск
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index a361eb3a65..61ba286df0 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -3233,7 +3233,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :potreban
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :nepotreban
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Vrednost za poređenje sa podatkom o vozilu
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Unos vrednosti za poređenje
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Preskoči
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index 9d50132292..4793d4dc91 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -3037,7 +3037,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :为是
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :为否
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}要比较车辆的数据值
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}请输入要比较的值
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}跳过
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 3451551bae..5cfb7cc9b6 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -3104,7 +3104,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :je pravda
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :je nepravda
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Hodnota, s ktorou sa majú porovnat dáta vozidla
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Zadajte hodnotu voci ktorej sa ma porovnat
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Preskocit
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index 659b0e7426..74af2d48ff 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -3051,7 +3051,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :dejavno
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :nedejavno
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Primerjalna vrednost za podatke vozila
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Vnesi primerjalno vrednost
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Preskoči
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index b6dd6bc865..1689b8317a 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -3048,7 +3048,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :es verdadero
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :es falso
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}El valor a comparar de los datos del vehículo contra
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Introduce el valor a comparar
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltarse
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index eccb5b3f76..88ed5501ed 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -3035,7 +3035,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :sant
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :falskt
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Värde att jämföra fordonsdata mot
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Skriv in värde att jämföra mot
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Skippa
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index 96bc1b3102..3f14d4856d 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -3038,7 +3038,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :為是
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :為否
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}與交通工具資料比對的數值
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}輸入想比對的數值
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}跳過
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index e1482c27e7..429be8b4a4 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -3036,7 +3036,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :doğrudur
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :yanlıştır
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Araç verisi ile karşılaştırılacak değer
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Karşılaştırma yapılacak değeri giriniz
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Atla
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 7389e5b7c0..d36462d395 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -3172,7 +3172,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :- так
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :- ні
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Значення, з яким порівнювати дані транспорту
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Введіть значення для порівняння
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Пропуск
diff --git a/src/lang/unfinished/basque.txt b/src/lang/unfinished/basque.txt
index a29a75e882..e4aef59034 100644
--- a/src/lang/unfinished/basque.txt
+++ b/src/lang/unfinished/basque.txt
@@ -1194,7 +1194,6 @@ STR_ORDER_SELECTED                                              :{RIGHTARROW}{SE
 
 
 
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 
 
 
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index df342fae5c..bd4ea16531 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -3009,7 +3009,6 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :yn wir
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :yn anghywir
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK} Y gwerth i gymharu data'r cerbyd yn ei erbyn
-STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Rhowch y gwerth i'w gymharu'n ei erbyn
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Hepgor
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 847a38ecbb..65ed865cb2 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -952,7 +952,7 @@ public:
 				if (order != NULL && order->IsType(OT_CONDITIONAL)) {
 					uint value = order->GetConditionValue();
 					if (order->GetConditionVariable() == OCV_MAX_SPEED) value = ConvertSpeedToDisplaySpeed(value);
-					SetDParam(1, value);
+					SetDParam(0, value);
 				}
 				break;
 			}
@@ -1321,7 +1321,7 @@ static const NWidgetPart _nested_orders_train_widgets[] = {
 				NWidget(NWID_BUTTON_DRPDOWN, COLOUR_GREY, ORDER_WIDGET_SERVICE), SetMinimalSize(124, 12), SetFill(true, false),
 														SetDataTip(STR_ORDER_SERVICE, STR_ORDER_SERVICE_TOOLTIP), SetResize(1, 0),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ORDER_WIDGET_COND_VALUE), SetMinimalSize(124, 12), SetFill(true, false),
-														SetDataTip(STR_ORDER_CONDITIONAL_VALUE, STR_ORDER_CONDITIONAL_VALUE_TOOLTIP), SetResize(1, 0),
+														SetDataTip(STR_BLACK_COMMA, STR_ORDER_CONDITIONAL_VALUE_TOOLTIP), SetResize(1, 0),
 			EndContainer(),
 		EndContainer(),
 		NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, ORDER_WIDGET_SHARED_ORDER_LIST), SetMinimalSize(12, 12), SetDataTip(SPR_SHARED_ORDERS_ICON, STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP),
@@ -1386,7 +1386,7 @@ static const NWidgetPart _nested_orders_widgets[] = {
 				NWidget(WWT_DROPDOWN, COLOUR_GREY, ORDER_WIDGET_COND_COMPARATOR), SetMinimalSize(124, 12), SetFill(true, false),
 													SetDataTip(STR_NULL, STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP), SetResize(1, 0),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ORDER_WIDGET_COND_VALUE), SetMinimalSize(124, 12), SetFill(true, false),
-													SetDataTip(STR_ORDER_CONDITIONAL_VALUE, STR_ORDER_CONDITIONAL_VALUE_TOOLTIP), SetResize(1, 0),
+													SetDataTip(STR_BLACK_COMMA, STR_ORDER_CONDITIONAL_VALUE_TOOLTIP), SetResize(1, 0),
 			EndContainer(),
 		EndContainer(),