diff options
52 files changed, 78 insertions, 49 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 189fd405e..d97c4a2bc 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -3028,7 +3028,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Skakel n STR_ORDERS_LIST_TOOLTIP :{BLACK}Opdraglys - kliek op 'n opdrag om dit te verlig. CTRL + kliek senter op stasie STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Einde van Opdrae - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Einde van Gedeel Opdrae - - diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 17ffbed68..2bacd2b7e 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -3190,7 +3190,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}غير STR_ORDERS_LIST_TOOLTIP :{BLACK}قائمة الاوامر - اضغط على الامر لختيارة. مفتاح التحكم (كنترول) + الضغط لتوجة للمحطة STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - نهاية الاوامر - - STR_ORDERS_END_OF_SHARED_ORDERS :- - نهاية الأوامر المشتركة - - diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 16c8ce9ab..94e48d9d4 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -3593,7 +3593,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Праг STR_ORDERS_LIST_TOOLTIP :{BLACK}Сьпіс заданьняў - пстрыкніце заданьне для вылучэньня. Ctrl+пстрычка - агляд станцыі прызначэньня. STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Канец заданьняў - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Канец агульных заданьняў - - diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 7a92d549a..cf4683df5 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -3219,7 +3219,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Exibe o STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de ordens - clique numa ordem para a selecionar. Ctrl+Clique rola para o destino da ordem STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Fim de Ordens - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Fim de Ordens Compartilhadas - - diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 760d2f844..6143fddf0 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -3095,7 +3095,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Виж STR_ORDERS_LIST_TOOLTIP :{BLACK}Пътен лист - натиснете върху назначение за маркиране. CTRL + натискане - центрира върху дестинацията STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Край на Заповедите - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Край на Споделения пътен лист - - diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index fa4116d87..f30cc0da8 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -3234,7 +3234,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Commuta STR_ORDERS_LIST_TOOLTIP :{BLACK}Llista d'ordres - clica en una ordre per marcar-la. Ctrl+Clic desplaça cap a la destinació de l'ordre STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Fi d'Ordres - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Fi d'Ordres Compartides - - diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 3b853a1f0..f3b455bad 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -3314,7 +3314,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Promijen STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista naredbi - klikni na naredbu kako bi je označio. Ctrl+Klik klizi na odredište naredbe STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Kraj naredbi - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Kraj dijeljenih naredbi - - diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 4683a2001..443a4f7ba 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -3330,7 +3330,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Přepnou 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 cíl seznamu STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Konec příkazů - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Konec sdílených příkazů - - diff --git a/src/lang/danish.txt b/src/lang/danish.txt index a71cf77fc..6b81a27c2 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -3118,7 +3118,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Skift ti 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_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Slut på ordrer - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Slut på delt ordreliste - - diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index fae752167..366650f1e 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -3218,7 +3218,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Schakel STR_ORDERS_LIST_TOOLTIP :{BLACK}Orderlijst - klik op een order om deze te selecteren. Ctrl+klik scrollt naar het station STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Einde van orders - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Einde gedeelde orders - - diff --git a/src/lang/english.txt b/src/lang/english.txt index ace581ed2..dc81d5968 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3242,7 +3242,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Switch t STR_ORDERS_LIST_TOOLTIP :{BLACK}Order list - click on an order to highlight it. Ctrl+Click scrolls to the order's destination STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING4} {STRING2} +STR_ORDER_TEXT :{STRING4} {STRING2} {STRING} STR_ORDERS_END_OF_ORDERS :- - End of Orders - - STR_ORDERS_END_OF_SHARED_ORDERS :- - End of Shared Orders - - @@ -3382,6 +3382,8 @@ STR_ORDER_STOP_LOCATION_NEAR_END :[near end] STR_ORDER_STOP_LOCATION_MIDDLE :[middle] STR_ORDER_STOP_LOCATION_FAR_END :[far end] +STR_ORDER_OUT_OF_RANGE :{RED} (Next destination is out of range) + STR_ORDER_CONDITIONAL_UNCONDITIONAL :Jump to order {COMMA} STR_ORDER_CONDITIONAL_NUM :Jump to order {COMMA} when {STRING} {STRING} {COMMA} STR_ORDER_CONDITIONAL_TRUE_FALSE :Jump to order {COMMA} when {STRING} {STRING} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 0f8419ca4..aa0fdaad1 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -3236,7 +3236,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Switch t STR_ORDERS_LIST_TOOLTIP :{BLACK}Order list - click on an order to highlight it. Ctrl+Click scrolls to the order's destination STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - End of Orders - - STR_ORDERS_END_OF_SHARED_ORDERS :- - End of Shared Orders - - diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 7dab09c03..ae032eee6 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -3100,7 +3100,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Montri h STR_ORDERS_LIST_TOOLTIP :{BLACK}Ordonlisto - klaku ordonon por elekti. Stir+Klak rulumas al la stacio. STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Fino de Ordonoj - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Fino de Kunhavitaj Ordonoj - - diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 9d618da1d..b6536817e 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -3251,7 +3251,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Näita s STR_ORDERS_LIST_TOOLTIP :{BLACK}Sihtpunktide nimekiri. Valimiseks klõpsa sihtpunktil. Ctrl+klõps keskendab vaateakna jaama peale. STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Sihtpunktide lõpp - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Jagatud sihtpunktide lõpp - - diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index f4b3685d3..c67e9ada2 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -3236,7 +3236,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Näytä STR_ORDERS_LIST_TOOLTIP :{BLACK}Käskyt - napsauta käskyä korostaaksesi sen. Ctrl+Klik siirtää näkymän kohteeseen STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Käskyjen loppu - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Jaettujen käskyjen loppu - - diff --git a/src/lang/french.txt b/src/lang/french.txt index fa8153f00..111c7b645 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -3237,7 +3237,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Basculer STR_ORDERS_LIST_TOOLTIP :{BLACK}Liste d'ordres - cliquer sur un ordre pour le sélectionner. Ctrl-clic pour déplacer la vue sur la destination de l'ordre STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Fin des ordres - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Fin des ordres partagés - - diff --git a/src/lang/galician.txt b/src/lang/galician.txt index eecafc0c4..5c6380292 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -2957,7 +2957,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Cambiar STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de Ordes - Pincha nunha orde para seleccionala STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Fin das Ordes - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Fin das ordes compartidas - - diff --git a/src/lang/german.txt b/src/lang/german.txt index 216bc20fb..5faaef9f0 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -3237,7 +3237,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Zur Fahr STR_ORDERS_LIST_TOOLTIP :{BLACK}Auftragsliste - Auftrag anklicken, um ihn zu markieren. Strg+Klick springt zum Auftragsziel STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Ende der Aufträge - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Ende des gemeinsam genutzten Fahrplans - - diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 52dc196cf..02390f0d8 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -3224,7 +3224,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Αλλα STR_ORDERS_LIST_TOOLTIP :{BLACK}Λίστα εντολών - κλικ σε μια εντολή για να την επιλέξετε. Ctrl+κλικ μετακινεί στον προορισμό της οδηγίας STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Τέλος Εντολών - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Τέλος Μοιρασμένων Οδηγιών - - diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index a5f6e99a7..2255de8ad 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -3037,7 +3037,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}עבור STR_ORDERS_LIST_TOOLTIP :{BLACK}רשימת יעדים - לחץ על יעד על מנת להדגישו STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - סוף רשימת היעדים - - STR_ORDERS_END_OF_SHARED_ORDERS :- - סוף של הוראות משותפות - - diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 0ac8b86e1..5c2a9aa13 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -3300,7 +3300,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Átkapcs STR_ORDERS_LIST_TOOLTIP :{BLACK}Menetrend - kattints egy célpontra a kijelöléséhez. Ctrl+Kattintással az utasítás helyszínére görget STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Menetrend vége - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Megosztott menetrend vége - - diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index b385bb8b1..e4b0142fa 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -3070,7 +3070,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Skipta y STR_ORDERS_LIST_TOOLTIP :{BLACK}Áætlun - smelltu til að velja stöð. CTRL + músartakki færir sjónarhorn að stöðinni STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Endi skipana - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Endi sameiginlegra skipana - - diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 7a004d653..8937334d7 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -3103,7 +3103,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Tampilka STR_ORDERS_LIST_TOOLTIP :{BLACK}Daftar perintah - klik pada perintah untuk menandainya. CTRL + klik untuk mengunjungi tujuan STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Akhir Perintah - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Akhir Perintah Bersama - - diff --git a/src/lang/irish.txt b/src/lang/irish.txt index f262ea4ad..7f8696b8e 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -3100,7 +3100,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Athraigh STR_ORDERS_LIST_TOOLTIP :{BLACK}Liosta na n-orduithe - cliceáil ar ordú chun é a aibhisiú. Is féidir scrollú chuig an stáisiún le Ctrl+Cliceáil STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Deireadh na nOrduithe - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Deireadh na nOrduithe Comhroinnte - - diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 5984dec39..ea4c8cfe5 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -3264,7 +3264,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Passa al STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista degli ordini - fare clic su un ordine per selezionarlo e CTRL+clic per portarsi sulla destinazione corrispondente STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Fine degli ordini - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Fine degli ordini condivisi - - diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index c3de219b1..59dd7e42b 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -3141,7 +3141,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}時刻 STR_ORDERS_LIST_TOOLTIP :{BLACK}指令リスト - 指令を選択するにはクリックします STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - 指令終了 - - STR_ORDERS_END_OF_SHARED_ORDERS :- - 共有指令の終了- - diff --git a/src/lang/korean.txt b/src/lang/korean.txt index fd83a17d2..facb9da05 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -3224,7 +3224,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}시간 STR_ORDERS_LIST_TOOLTIP :{BLACK}이 열차의 경로 - 선택하려면 클릭하세요. CTRL+클릭하시면 그 역이 있는 장소로 이동합니다. STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - 경로의 끝 - - STR_ORDERS_END_OF_SHARED_ORDERS :- - 공유된 경로의 끝 - - diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index fdcbdcb42..fc74c2aa6 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -3146,7 +3146,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Pārslē STR_ORDERS_LIST_TOOLTIP :{BLACK}Rīkojumu saraksts - klik uz rīkojuma, lai atzīmētu to. Ctrl+klik ritina uz staciju STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Rīkojumu beigas - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Dalīto rīkojumu beigas - - diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 63eea09d2..418cfe15f 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -3210,7 +3210,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Pereiti 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_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Užduočių pabaiga- - STR_ORDERS_END_OF_SHARED_ORDERS :- - Bendrų užduočių pabaiga - - diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 09029091c..e592a7ee5 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -3218,7 +3218,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Wiesselt STR_ORDERS_LIST_TOOLTIP :{BLACK}Optragslëscht - Klickt op en Optrag fir en ze selectéieren. Ctrl+Klick scrollt op d'Optragdestinatioun STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Enn vun den Opträg - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Enn vun der Optragslëscht - - diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 49249660c..003775873 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -3111,7 +3111,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Skift ti STR_ORDERS_LIST_TOOLTIP :{BLACK}Ordreliste - klikk på en ordre for å markere den. Ctrl-klikk viser ordrens endestasjon. STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Slutt på ordre - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Slutt på delte ordre - - diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 7b629c3f7..0d9cb7773 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -3107,7 +3107,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Byt til STR_ORDERS_LIST_TOOLTIP :{BLACK}Ordreliste - klikk på ein ordre for å velje han. CTRL+klikk ruller til stasjonen STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Slutt på ordre - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Slutt på delte ordrar - - diff --git a/src/lang/polish.txt b/src/lang/polish.txt index ea12d98ff..dade6c046 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -3604,7 +3604,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Otwórz STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista poleceń - kliknij na poleceniu, aby zaznaczyć. Ctrl+kliknięcie przenosi do stacji docelowej STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Koniec poleceń - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Koniec współdzielonych poleceń - - diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index be41ffa09..54d3c93fc 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -3167,7 +3167,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Mudar pa STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de ordens - clique numa ordem para a seleccionar. Ctrl+Clique mostra o destino da ordem STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Fim de Ordens - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Fim de Ordens Partilhadas - - diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index d7747b6db..b8135d5b5 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -3218,7 +3218,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Comuta i STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de comenzi - clic pe o comandă pentru a o selecta. Ctrl+Click poziţionează ecranul pe staţia destinație STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Sfârşitul comenzilor - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Sfârşitul comenzilor sincronizate - - diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 6ec0eeeaf..e5d11ba3a 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -3430,7 +3430,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Прос STR_ORDERS_LIST_TOOLTIP :{BLACK}Список заданий - щёлкните задание для выделения. Ctrl+щелчок - обзор станции назначения. STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Конец заданий - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Конец общих заданий - - diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 0dc121470..63f9d8357 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -3403,7 +3403,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Prelazi STR_ORDERS_LIST_TOOLTIP :{BLACK}Spisak naredbi - klikom se obeležava naredba. Sa Ctrl+Klik se prelazi na lokaciju stanice STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Kraj Naredbi - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Kraj Zajedničkih Naredbi - - diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 369f310e4..ebb185836 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -3128,7 +3128,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}切换 STR_ORDERS_LIST_TOOLTIP :{BLACK}调度列表{}单击一个调度指令可以使之高亮化{}CTRL + 单击{}可以将视点移动到相应的车站 STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :-- 调度计划结束 -- STR_ORDERS_END_OF_SHARED_ORDERS :- - 共享调度计划结束 - - diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 69b25fae9..ee3374f0b 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -3237,7 +3237,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Prepnút STR_ORDERS_LIST_TOOLTIP :{BLACK}Zoznam príkazov - kliknúť na príkaz pre označenie. CTRL+klik presunie sa na miesto zmeny STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Koniec prikazov - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Koniec zdielanych prikazov - - diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 4b2ae8021..5ef9fe668 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -3284,7 +3284,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Preklop STR_ORDERS_LIST_TOOLTIP :{BLACK}Seznam navodil - klikni na ukaz, da ga izbereš. CTRL+Klik premakne na destinacijo STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Konec ukazov - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Konec ukazov v skupni rabi - - diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 38915e0bf..59cce2f65 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -3237,7 +3237,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Cambiar STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de órdenes - Click en una orden para resaltarla. Ctrl+Click para desplazarse a la estación de la orden STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Fin de órdenes - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Fin de órdenes compartidas - - diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index ec87aa064..7735c54c8 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -3235,7 +3235,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Ändra t STR_ORDERS_LIST_TOOLTIP :{BLACK}Orderlista - klicka på order för att markera det. Ctrl+klick visar order-destinationen i huvudförstret STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Slut på order - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Slut på delade order - - diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 8b50e2faa..70cb0527b 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -3109,7 +3109,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}切換 STR_ORDERS_LIST_TOOLTIP :{BLACK}指令清單 - 點選可選擇該指令，按住 CTRL 點選可跳到車站位置 STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - 指令結束 - - STR_ORDERS_END_OF_SHARED_ORDERS :- - 共享指令結束 - - diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 0e0a4c55b..1c0461e42 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -3132,7 +3132,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Zaman ta STR_ORDERS_LIST_TOOLTIP :{BLACK}Talimat listesi - seçmek için komutu tıklayın. CTRL + tıklama istasyona kaydırir STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Talimatların Sonu - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Paylaşılmış talimat sonu - - diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 1be2538df..9630e08c1 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -3238,7 +3238,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Пере STR_ORDERS_LIST_TOOLTIP :{BLACK}Маршрутний лист - клацніть на завданні для його вибору. CTRL+клік мишкою показує станцію STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Кінець наказів - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Кінець спільних наказів - - diff --git a/src/lang/unfinished/faroese.txt b/src/lang/unfinished/faroese.txt index cbe37938c..f5bcee55e 100644 --- a/src/lang/unfinished/faroese.txt +++ b/src/lang/unfinished/faroese.txt @@ -1139,7 +1139,7 @@ STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY :{LTBLUE}- {CARG # Order view STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} # Order bottom buttons diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 2ebd663ae..89990ef86 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -3200,7 +3200,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Lịch t 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_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Kết thúc - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Kết thúc - - diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index b391400a2..098c13342 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -3190,7 +3190,7 @@ STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Newid i' STR_ORDERS_LIST_TOOLTIP :{BLACK}Rhestr orchmynion - cliciwch orchymyn i'w amlygu. Mae Ctrl+Clic yn sgrolio i gyrchfan yr orchymyn STR_ORDER_INDEX :{COMMA}:{NBSP} -STR_ORDER_TEXT :{STRING} {STRING} +STR_ORDER_TEXT :{STRING} {STRING} {STRING} STR_ORDERS_END_OF_ORDERS :- - Diwedd Gorchmynion - - STR_ORDERS_END_OF_SHARED_ORDERS :- - Diwedd y Gorchmynion sydd wedi'u Rhannu - - diff --git a/src/order_base.h b/src/order_base.h index c724df241..d0e4b4da6 100644 --- a/src/order_base.h +++ b/src/order_base.h @@ -80,6 +80,15 @@ public: void MakeImplicit(StationID destination); /** + * Is this a 'goto' order with a real destination? + * @return True if the type sis either #OT_GOTO_WAYPOINT, #OT_GOTO_DEPOT or #OT_GOTO_STATION. + */ + inline bool IsGotoOrder() const + { + return IsType(OT_GOTO_WAYPOINT) || IsType(OT_GOTO_DEPOT) || IsType(OT_GOTO_STATION); + } + + /** * Gets the destination of this order. * @pre IsType(OT_GOTO_WAYPOINT) || IsType(OT_GOTO_DEPOT) || IsType(OT_GOTO_STATION). * @return the destination of the order. diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 44012a085..44f6f295e 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -580,7 +580,16 @@ TileIndex Order::GetLocation(const Vehicle *v, bool airport) const } } -static uint GetOrderDistance(const Order *prev, const Order *cur, const Vehicle *v, int conditional_depth = 0) +/** + * Get the distance between two orders of a vehicle. Conditional orders are resolved + * and the bigger distance of the two order branches is returned. + * @param prev Origin order. + * @param cur Destination order. + * @param v The vehicle to get the distance for. + * @param conditional_depth Internal param for resolving conditional orders. + * @return Maximum distance between the two orders. + */ +uint GetOrderDistance(const Order *prev, const Order *cur, const Vehicle *v, int conditional_depth) { if (cur->IsType(OT_CONDITIONAL)) { if (conditional_depth > v->GetNumOrders()) return 0; diff --git a/src/order_func.h b/src/order_func.h index ba3d7e6b5..abdbf3f55 100644 --- a/src/order_func.h +++ b/src/order_func.h @@ -24,6 +24,7 @@ void DeleteVehicleOrders(Vehicle *v, bool keep_orderlist = false, bool reset_ord bool ProcessOrders(Vehicle *v); bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth = 0, bool pbs_look_ahead = false); VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle *v); +uint GetOrderDistance(const Order *prev, const Order *cur, const Vehicle *v, int conditional_depth = 0); void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int left, int middle, int right); diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 513e7b0e2..adfc34798 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -29,6 +29,7 @@ #include "waypoint_base.h" #include "core/geometry_func.hpp" #include "hotkeys.h" +#include "aircraft.h" #include "table/strings.h" @@ -260,6 +261,13 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int DrawString(left, rtl ? right - 2 * sprite_size.width - 3 : middle, y, STR_ORDER_INDEX, colour, SA_RIGHT | SA_FORCE); SetDParam(5, STR_EMPTY); + SetDParam(8, STR_EMPTY); + + /* Check range for aircraft. */ + if (v->type == VEH_AIRCRAFT && Aircraft::From(v)->GetRange() > 0 && order->IsGotoOrder()) { + const Order *next = order->next != NULL ? order->next : v->GetFirstOrder(); + if (GetOrderDistance(order, next, v) > Aircraft::From(v)->acache.cached_max_range_sqr) SetDParam(8, STR_ORDER_OUT_OF_RANGE); + } switch (order->GetType()) { case OT_DUMMY: |