(svn r18304) -Codechange: don't use SETX for the arrival/departure panel; some languages don't have short abbreviations :(

10 files changed, 4 insertions, 65 deletions

diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index e0f9201d2..8fafc8b73 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -3162,15 +3162,9 @@ STR_TIMETABLE_SCHEDULED                                         :{BLACK}Schema
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Wissel tussen verwacht and schema
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_ARRIVAL                                           :A:{SETX 30}{STRING}
-STR_TIMETABLE_ARRIVAL_EARLY                                     :A:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_ARRIVAL_LATE                                      :A:{SETX 30}{RED}{STRING}
 #####
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_DEPARTURE                                         :D:{SETX 30}{STRING}
-STR_TIMETABLE_DEPARTURE_EARLY                                   :D:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_DEPARTURE_LATE                                    :D:{SETX 30}{RED}{STRING}
 #####
 
 
diff --git a/src/lang/english.txt b/src/lang/english.txt
index fa83699fd..68f7cad15 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -3161,17 +3161,8 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Expected
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Scheduled
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Switch between expected and schedule
 
-### Do not separate or reorder ###
-STR_TIMETABLE_ARRIVAL                                           :A:{SETX 30}{STRING1}
-STR_TIMETABLE_ARRIVAL_EARLY                                     :A:{SETX 30}{GREEN}{STRING1}
-STR_TIMETABLE_ARRIVAL_LATE                                      :A:{SETX 30}{RED}{STRING1}
-#####
-
-### Do not separate or reorder ###
-STR_TIMETABLE_DEPARTURE                                         :D:{SETX 30}{STRING1}
-STR_TIMETABLE_DEPARTURE_EARLY                                   :D:{SETX 30}{GREEN}{STRING1}
-STR_TIMETABLE_DEPARTURE_LATE                                    :D:{SETX 30}{RED}{STRING1}
-#####
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
 
 
 # Date window (for timetable)
@@ -4047,6 +4038,8 @@ STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_TINY_BLACK_STATION                                          :{TINYFONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{RAW_STRING}
+STR_GREEN_STRING                                                :{GREEN}{STRING}
+STR_RED_STRING                                                  :{RED}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 STR_TINY_RIGHT_ARROW                                            :{TINYFONT}{RIGHTARROW}
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index f2472cbff..629679c64 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -3162,15 +3162,9 @@ STR_TIMETABLE_SCHEDULED                                         :{BLACK}Aikataul
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Vaihda odotetun ja aikataulun välillä
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_ARRIVAL                                           :S:{SETX 30}{STRING}
-STR_TIMETABLE_ARRIVAL_EARLY                                     :S:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_ARRIVAL_LATE                                      :S:{SETX 30}{RED}{STRING}
 #####
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_DEPARTURE                                         :L:{SETX 30}{STRING}
-STR_TIMETABLE_DEPARTURE_EARLY                                   :L:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_DEPARTURE_LATE                                    :L:{SETX 30}{RED}{STRING}
 #####
 
 
diff --git a/src/lang/german.txt b/src/lang/german.txt
index cd78df4eb..445d0ef0c 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -3163,15 +3163,9 @@ STR_TIMETABLE_SCHEDULED                                         :{BLACK}Geplant
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Umschalten zwischen erwarteter Ankunftszeit und Fahrplan
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_ARRIVAL                                           :Ankunft:{SETX 30}{STRING}
-STR_TIMETABLE_ARRIVAL_EARLY                                     :Ankunft:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_ARRIVAL_LATE                                      :Ankunft:{SETX 30}{RED}{STRING}
 #####
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_DEPARTURE                                         :Abfahrt:{SETX 30}{STRING}
-STR_TIMETABLE_DEPARTURE_EARLY                                   :Abfahrt:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_DEPARTURE_LATE                                    :Abfahrt:{SETX 30}{RED}{STRING}
 #####
 
 
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index 80cfb618b..8245212d3 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -3259,15 +3259,9 @@ STR_TIMETABLE_SCHEDULED                                         :{BLACK}Προγ
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Εναλλάγη μεταξύ αναμένομενης και προγραμματισμένης
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_ARRIVAL                                           :ΑΦΙΞ:{SETX 30}{STRING}
-STR_TIMETABLE_ARRIVAL_EARLY                                     :ΑΦΙΞ:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_ARRIVAL_LATE                                      :ΑΦΙΞ:{SETX 30}{RED}{STRING}
 #####
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_DEPARTURE                                         :ΑΝΑΧ:{SETX 30}{STRING}
-STR_TIMETABLE_DEPARTURE_EARLY                                   :ΑΝΑΧ:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_DEPARTURE_LATE                                    :ΑΝΑΧ:{SETX 30}{RED}{STRING}
 #####
 
 
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 264d8936a..7c968ea1c 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -3160,15 +3160,9 @@ STR_TIMETABLE_SCHEDULED                                         :{BLACK}Programm
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Alterna fra la visualizzazione degli orari attesi e degli orari programmati
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_ARRIVAL                                           :A:{SETX 30}{STRING}
-STR_TIMETABLE_ARRIVAL_EARLY                                     :A:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_ARRIVAL_LATE                                      :A:{SETX 30}{RED}{STRING}
 #####
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_DEPARTURE                                         :P:{SETX 30}{STRING}
-STR_TIMETABLE_DEPARTURE_EARLY                                   :P:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_DEPARTURE_LATE                                    :P:{SETX 30}{RED}{STRING}
 #####
 
 
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index bbdc63c31..44b9bbc36 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -3543,15 +3543,9 @@ STR_TIMETABLE_SCHEDULED                                         :{BLACK}Schedule
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Switch between expected and schedule
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_ARRIVAL                                           :A:{SETX 30}{STRING}
-STR_TIMETABLE_ARRIVAL_EARLY                                     :A:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_ARRIVAL_LATE                                      :A:{SETX 30}{RED}{STRING}
 #####
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_DEPARTURE                                         :D:{SETX 30}{STRING}
-STR_TIMETABLE_DEPARTURE_EARLY                                   :D:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_DEPARTURE_LATE                                    :D:{SETX 30}{RED}{STRING}
 #####
 
 # AI debug window
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index 5d78a6352..67a8071fa 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -3161,15 +3161,9 @@ STR_TIMETABLE_SCHEDULED                                         :{BLACK}Marcado
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Alterne entre tempo esperado e marcado
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_ARRIVAL                                           :C:{SETX 30}{STRING}
-STR_TIMETABLE_ARRIVAL_EARLY                                     :C:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_ARRIVAL_LATE                                      :C:{SETX 30}{RED}{STRING}
 #####
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_DEPARTURE                                         :P:{SETX 30}{STRING}
-STR_TIMETABLE_DEPARTURE_EARLY                                   :P:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_DEPARTURE_LATE                                    :P:{SETX 30}{RED}{STRING}
 #####
 
 
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index b20270d15..8a281867c 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -3357,15 +3357,9 @@ STR_TIMETABLE_SCHEDULED                                         :{BLACK}Po planu
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Prebacivanje između prikaza očekivanog i po planu
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_ARRIVAL                                           :D:{SETX 30}{STRING}
-STR_TIMETABLE_ARRIVAL_EARLY                                     :D:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_ARRIVAL_LATE                                      :D:{SETX 30}{RED}{STRING}
 #####
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_DEPARTURE                                         :P:{SETX 30}{STRING}
-STR_TIMETABLE_DEPARTURE_EARLY                                   :P:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_DEPARTURE_LATE                                    :P:{SETX 30}{RED}{STRING}
 #####
 
 
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index a84a477e9..6e7986bb4 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -3159,15 +3159,9 @@ STR_TIMETABLE_SCHEDULED                                         :{BLACK}Programa
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Alternar entre esperado y programado
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_ARRIVAL                                           :Ll:{SETX 30}{STRING}
-STR_TIMETABLE_ARRIVAL_EARLY                                     :Ll:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_ARRIVAL_LATE                                      :Ll:{SETX 30}{RED}{STRING}
 #####
 
 ### Do not separate or reorder ###
-STR_TIMETABLE_DEPARTURE                                         :S:{SETX 30}{STRING}
-STR_TIMETABLE_DEPARTURE_EARLY                                   :S:{SETX 30}{GREEN}{STRING}
-STR_TIMETABLE_DEPARTURE_LATE                                    :S:{SETX 30}{RED}{STRING}
 #####