mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r23505) -Add: Indication in the order list if the next destination of an order is out of range.

release/1.2
michi_cc 2011-12-13 00:43:48 +00:00
parent def8e7215b
commit 34ffd08a19
52 changed files with 78 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/afrikaans.txt
View File

@ -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 - -

2
src/lang/arabic_egypt.txt
View File

@ -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 :- - نهاية الأوامر المشتركة - -

2
src/lang/belarusian.txt
View File

@ -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 :- - Канец агульных заданьняў - -

2
src/lang/brazilian_portuguese.txt
View File

@ -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 - -

2
src/lang/bulgarian.txt
View File

@ -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 :- - Край на Споделения пътен лист - -

2
src/lang/catalan.txt
View File

@ -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 - -

2
src/lang/croatian.txt
View File

@ -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 - -

2
src/lang/czech.txt
View File

@ -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ů - -

2
src/lang/danish.txt
View File

@ -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 - -

2
src/lang/dutch.txt
View File

@ -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 - -

4
src/lang/english.txt
View File

@ -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}

2
src/lang/english_US.txt
View File

@ -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 - -

2
src/lang/esperanto.txt
View File

@ -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 - -

2
src/lang/estonian.txt
View File

@ -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 - -

2
src/lang/finnish.txt
View File

@ -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 - -

2
src/lang/french.txt
View File

@ -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 - -

2
src/lang/galician.txt
View File

@ -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 - -

2
src/lang/german.txt
View File

@ -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 - -

2
src/lang/greek.txt
View File

@ -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 :- - Τέλος Μοιρασμένων Οδηγιών - -

2
src/lang/hebrew.txt
View File

@ -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 :- - סוף של הוראות משותפות - -

2
src/lang/hungarian.txt
View File

@ -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 - -

2
src/lang/icelandic.txt
View File

@ -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 - -

2
src/lang/indonesian.txt
View File

@ -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 - -

2
src/lang/irish.txt
View File

@ -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 - -

2
src/lang/italian.txt
View File

@ -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 - -

2
src/lang/japanese.txt
View File

@ -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 :- - 共有指令の終了- -

2
src/lang/korean.txt
View File

@ -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 :- - 공유된 경로의 끝 - -

2
src/lang/latvian.txt
View File

@ -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 - -

2
src/lang/lithuanian.txt
View File

@ -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 - -

2
src/lang/luxembourgish.txt
View File

@ -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 - -

2
src/lang/norwegian_bokmal.txt
View File

@ -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 - -

2
src/lang/norwegian_nynorsk.txt
View File

@ -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 - -

2
src/lang/polish.txt
View File

@ -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ń - -

2
src/lang/portuguese.txt
View File

@ -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 - -

2
src/lang/romanian.txt
View File

@ -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 - -

2
src/lang/russian.txt
View File

@ -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 :- - Конец общих заданий - -

2
src/lang/serbian.txt
View File

@ -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 - -

2
src/lang/simplified_chinese.txt
View File

@ -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 :- - 共享调度计划结束 - -

2
src/lang/slovak.txt
View File

@ -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 - -

2
src/lang/slovenian.txt
View File

@ -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 - -

2
src/lang/spanish.txt
View File

@ -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 - -

2
src/lang/swedish.txt
View File

@ -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 - -

2
src/lang/traditional_chinese.txt
View File

@ -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 :- - 共享指令結束 - -

2
src/lang/turkish.txt
View File

@ -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 - -

2
src/lang/ukrainian.txt
View File

@ -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 :- - Кінець спільних наказів - -

2
src/lang/unfinished/faroese.txt
View File

@ -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

2
src/lang/vietnamese.txt
View File

@ -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 - -

2
src/lang/welsh.txt
View File

@ -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 - -

9
src/order_base.h
View File

@ -79,6 +79,15 @@ public:
void MakeConditional(VehicleOrderID order);
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).

11
src/order_cmd.cpp
View File

@ -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;

1
src/order_func.h
View File

@ -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);

8
src/order_gui.cpp
View File

@ -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: