(svn r16695) -Update: WebTranslator2 update to 2009-06-30 10:00:57

japanese   - 6 fixed by nex259 (6)
norwegian_bokmal - 8 fixed by jankmi (8)
portuguese - 9 fixed by SnowFlake (9)
serbian    - 111 fixed by etran (111)
spanish    - 1 fixed by erregerre (1)

6 files changed, 150 insertions, 15 deletions

diff --git a/src/lang/english.txt b/src/lang/english.txt
index 863ddffc1..98d6c032f 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1,12 +1,12 @@
 ##name English (UK)
 ##ownname English (UK)
 ##isocode en_GB
-##winlangid 0x0809
-##grflangid 0x01
 ##plural 0
 ##textdir ltr
 ##digitsep ,
 ##digitsepcur ,
+##winlangid 0x0809
+##grflangid 0x01
 
 #
 
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 5ae331102..07008ca8e 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -1,12 +1,12 @@
 ##name Japanese
 ##ownname 日本語
 ##isocode ja_JP
-##winlangid 0x0411
-##grflangid 0x39
 ##plural 1
 ##textdir ltr
 ##digitsep ,
 ##digitsepcur ,
+##winlangid 0x0411
+##grflangid 0x39
 
 #
 
@@ -655,6 +655,7 @@ STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}この�
 STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}オリジナル
 STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}改善した道路
 STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2の格子
+STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 格子
 STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}ランダム
 
 STR_NEWS_MESSAGE                                                :{STRING} - {STRING}
@@ -847,8 +848,10 @@ STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}スク�
 STR_OPTIONS_SCREENSHOT_FORMAT_CBO                               :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}スクリーンショットのファイルフォーマットを選択します
 
+STR_OPTIONS_BASE_GRF                                            :{BLACK}ベースGRFセット
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}使用するGRFの選択
+STR_OPTIONS_BASE_GRF_DESCRIPTION_TIP                            :{BLACK}ベースGRFセットについての追加情報
 
 STR_AUTOSAVE_FAILED                                             :{WHITE}自動保存に失敗しました
 
@@ -885,6 +888,7 @@ STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}指令�
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}指令リストをコピーできません...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - 共有指令の終了- -
 
+STR_TRAIN_IS_STUCK                                              :{WHITE}{VEHICLE} は目的地への経路を見つけられません。
 STR_TRAIN_IS_LOST                                               :{WHITE}{VEHICLE} が迷っています。
 STR_VEHICLE_IS_UNPROFITABLE                                     :{WHITE}昨年 {VEHICLE} の利益は {CURRENCY}。
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}欧州通貨統合！{}{}我が国はここからユーロを通貨として使用！
@@ -2722,7 +2726,9 @@ STR_ERROR_CAN_T_MODIFY_THIS_ORDER                               :{WHITE}この�
 STR_ERROR_CAN_T_MOVE_THIS_ORDER                                 :{WHITE}この指令を移動できません...
 STR_ERROR_CAN_T_SKIP_ORDER                                      :{WHITE}実行中の指令はスキップできません...
 STR_ERROR_CAN_T_SKIP_TO_ORDER                                   :{WHITE}選択した指令へスキップできません...
+STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}乗り物は全ての駅に行くことが出来ません
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}その駅に行けません
+STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}命令を共有使用とする乗り物はその駅に行くことが出来ません。
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}この車輌を移動できません...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}ダブルヘッドの場合、後部の機関車は常に前部の機関車について行きます
 STR_CARGO_N_A                                                   :N/A{SKIP}
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 2c9264d87..bc9c4e0f7 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -1,12 +1,12 @@
 ##name Norwegian (Bokmal)
 ##ownname Norsk (bokmål)
 ##isocode nb_NO
-##winlangid 0x0414
-##grflangid 0x2f
 ##plural 0
 ##textdir ltr
 ##digitsep .
 ##digitsepcur .
+##winlangid 0x0414
+##grflangid 0x2f
 
 #
 
@@ -320,6 +320,7 @@ STR_ABANDON_GAME_QUERY                                          :{YELLOW}Er du s
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Avslutt spill
 STR_SORT_ORDER_TIP                                              :{BLACK}Velg sorteringsrekkefølge (synkende/stigende)
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Velg sorteringskriterier
+STR_FILTER_CRITERIA_TIP                                         :{BLACK}Velg filtreringskriterier
 STR_SORT_BY                                                     :{BLACK}Sorter etter
 
 STR_SORT_BY_POPULATION                                          :{BLACK}Innbyggertall
@@ -342,6 +343,8 @@ STR_SORT_BY_LENGTH                                              :Lengde
 STR_SORT_BY_LIFE_TIME                                           :Tilovers livs tid
 STR_SORT_BY_FACILITY                                            :Stasjonstype
 STR_SORT_BY_WAITING                                             :Verdi av ventende last
+STR_SORT_BY_RATING_MAX                                          :Høyeste godskvalitet
+STR_SORT_BY_RATING_MIN                                          :Laveste godskvalitet
 STR_ENGINE_SORT_ENGINE_ID                                       :MaskinID (klassisk type)
 STR_ENGINE_SORT_COST                                            :Kostnad
 STR_ENGINE_SORT_POWER                                           :Kraft
@@ -737,6 +740,7 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_12_MONTHS              :Hver 12. måned
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start nytt spill
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Last inn et lagret spill
 STR_INTRO_TOOLTIP_SCENARIO_EDITOR                               :{BLACK}Spesiallag en spillverden eller et scenario
+STR_INTRO_TOOLTIP_MULTIPLAYER                                   :{BLACK}Start et flerspiller-spill
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Vis spillinnstillinger
 STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS                            :{BLACK}Vis vanskelighetsgrad
 STR_INTRO_TOOLTIP_PLAY_SCENARIO                                 :{BLACK}Start et nytt spill som bruker et scenario
@@ -1044,6 +1048,7 @@ STR_CONFIG_SETTING_AI_BUILDS_ROADVEH                            :{LTBLUE}Hindre
 STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Hindre datamaskinen i å bygge fly: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}Hindre datamaskinen i å bygge skip: {ORANGE}{STRING}
 
+STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Tillat AIer i flerspiller: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}Vedlikeholdsintervaller i prosent: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Standard vedlikeholdsintervall for tog: {ORANGE}{STRING} dager
@@ -1674,6 +1679,8 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Sentrer
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Bytt navn på byen
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passasjerer forrige måned: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Post forrige måned: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
+STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Godsbehov for byekspansjon:
+STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} levert sist måned
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Høyhus
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Kontorblokk
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Leilighetsblokk
@@ -2774,6 +2781,7 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Fjern va
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Nullstill senhetstelleren slik at kjøretøyet ankommer i tide
 STR_SERVICE_HINT                                                :{BLACK}Hopp over ordren med mindre vedlikehold trengs.
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Koster: {CURRENCY} Vekt: {WEIGHT_S}{}Fart: {VELOCITY}  Kraft: {POWER}{}Driftkostnader: {CURRENCY}/år{}Kapasitet: {CARGO}
+STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Kostnad: {CURRENCY} Max. Hastighet: {VELOCITY}{}Kapasitet: {CARGO}, {CARGO}{}Løpende kostnader: {CURRENCY}/yr
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Stoppet
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Kan ikke tvinge tog til å kjøre på rødt lys ved fare...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Krasjet
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index f089d9dd0..3737e4a95 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -1,12 +1,12 @@
 ##name Portuguese
 ##ownname Português
 ##isocode pt_PT
-##winlangid 0x0816
-##grflangid 0x36
 ##plural 0
 ##textdir ltr
 ##digitsep .
 ##digitsepcur .
+##winlangid 0x0816
+##grflangid 0x36
 
 #
 
@@ -320,6 +320,7 @@ STR_ABANDON_GAME_QUERY                                          :{YELLOW}Tem a c
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Abandonar jogo
 STR_SORT_ORDER_TIP                                              :{BLACK}Seleccione forma de ordenação (descendente/ascendente)
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Seleccione critério de ordenação
+STR_FILTER_CRITERIA_TIP                                         :{BLACK}Seleccione o critério de filtragem/procura
 STR_SORT_BY                                                     :{BLACK}Ordenar por
 
 STR_SORT_BY_POPULATION                                          :{BLACK}População
@@ -342,6 +343,8 @@ STR_SORT_BY_LENGTH                                              :Comprimento
 STR_SORT_BY_LIFE_TIME                                           :Restante tempo de vida
 STR_SORT_BY_FACILITY                                            :Tipo de Estação
 STR_SORT_BY_WAITING                                             :Valor da carga em espera
+STR_SORT_BY_RATING_MAX                                          :Maior carga
+STR_SORT_BY_RATING_MIN                                          :Menor carga
 STR_ENGINE_SORT_ENGINE_ID                                       :EngineID (ordernação clássica)
 STR_ENGINE_SORT_COST                                            :Custo
 STR_ENGINE_SORT_POWER                                           :Potência
@@ -940,6 +943,9 @@ STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Mostrar
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Mostrar sinais no lado da circulação: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Mostrar janela das finanças no fim do ano: {ORANGE}{STRING}
 STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT                           :{LTBLUE}New orders are 'non-stop' by default: {ORANGE}{STRING}
+STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END                       :perto do fim
+STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE                         :no meio
+STR_CONFIG_SETTING_STOP_LOCATION_FAR_END                        :longe do fim
 STR_CONFIG_SETTING_ROADVEH_QUEUE                                :{LTBLUE}Fila de veículos de estrada (com efeitos de quantidade): {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTOSCROLL                                   :{LTBLUE}Deslocar janela quando o rato está na borda do mapa: {ORANGE}{STRING}
 STR_CONFIG_SETTING_BRIBE                                        :{LTBLUE}Permitir o suborno da autoridade local: {ORANGE}{STRING}
@@ -2608,6 +2614,9 @@ STR_ORDER_GO_TO                                                 :Ir para
 STR_ORDER_GO_NON_STOP_TO                                        :Ir, sem paragens, para
 STR_ORDER_GO_VIA                                                :Ir via
 STR_ORDER_GO_NON_STOP_VIA                                       :Ir, sem paragens, via
+STR_ORDER_STOP_LOCATION_NEAR_END                                :[perto do fim]
+STR_ORDER_STOP_LOCATION_MIDDLE                                  :[no meio]
+STR_ORDER_STOP_LOCATION_FAR_END                                 :[longe do fim]
 STR_ORDER_TOGGLE_FULL_LOAD                                      :{BLACK}Carga completa de qualquer mercadoria
 STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Carregar se disponível
 STR_ORDER_DROP_FULL_LOAD_ALL                                    :Carga completa de todas as mercadorias
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index f6a8e926e..28f10aed3 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -1,12 +1,12 @@
 ##name Serbian
 ##ownname Srpski
 ##isocode srp
-##winlangid 0x7c1a
-##grflangid 0x0d
 ##plural 6
 ##textdir ltr
 ##digitsep .
 ##digitsepcur .
+##winlangid 0x7c1a
+##grflangid 0x0d
 ##case nom big gen dat aku vok lok ins
 ##gender muški ženski srednji
 
@@ -1650,6 +1650,7 @@ STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Nemoguć
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Nemoguće je ukloniti signalizaciju odatle...
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orijentacija železničkog depoa
 STR_RAIL_MENU_RAILROAD_CONSTRUCTION                             :Izgradnja železničke pruge
+STR_RAIL_MENU_ELRAIL_CONSTRUCTION                               :Izgradnja elektrifikovane železničke pruge
 STR_RAIL_MENU_MONORAIL_CONSTRUCTION                             :Izgradnja jednošinske pruge (Monorail)
 STR_RAIL_MENU_MAGLEV_CONSTRUCTION                               :Izgradnja magnetne pruge (MagLev)
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Izgradnja železničke pruge
@@ -1664,11 +1665,36 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION                               :{BLACK}Izbor or
 STR_RAILROAD_TRACK                                              :Železnička pruga
 STR_RAILROAD_TRAIN_DEPOT                                        :Železnički depo
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...zemljište je u vlasništvu druge kompanije
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Pruga sa blok signalizacijom
+STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Pruga sa predsignalizacijom
+STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Pruga sa izlaznom signalizacijom
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Pruga sa ulzno-izlaznom signalizacijom
+STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Pruga sa putnom signalizacijom
+STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Pruga sa jednosmernom putnom signalizacijom
+STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Pruga sa predsignalizacijom i blok signalizacijom
+STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Pruga sa blok i izlaznom signalizacijom
+STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Pruga sa blok i ulazno-izlaznom signalizacijom
+STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Pruga sa blok i putnom signalizacijom
+STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Pruga sa blok i jednosmernom putnom signalizacijom
+STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Pruga sa predsignalizacijom i izlaznom signalizacijom
+STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Pruga sa predsignalizacijom i ulazno-izlaznom signalizacijom
+STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Pruga sa predsignalizacijom i putnom signalizacijom
+STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Pruga sa predsignalizacijom i jednosmernom putnom signalizacijom
+STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Pruga sa izlaznom i ulazno-izlaznom signalizacijom
+STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Pruga sa izlaznom i putnom signalizacijom
+STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Pruga sa izlaznom i jednosmernom putnom signalizacijom
+STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Pruga sa ulazno-izlaznom i putnom signalizacijom
+STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Pruga sa ulazno-izlaznom i jednosmernom putnom signalizacijom
+STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Pruga sa putnom i jednosmernom putnom signalizacijom
+STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Mora se prvo ukloniti železnička stanica
+STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Izgradi zasebnu stanicu
+STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Pridruži stanicu
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Neophodno je prvo ukloniti put
+STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Putni radovi u toku
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Izgradnja puta
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Tramvaj Konstrukcija
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Izbor drumskog mosta
@@ -2492,11 +2518,96 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOY_VAN                     :Vagon za Igrač
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BATTERY_TRUCK               :Vagon za Baterije
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FIZZY_DRINK_TRUCK           :Vagon za Bezalkoholna Pića
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PLASTIC_TRUCK               :Vagon za Plastiku
+STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}Poruka od proizvođača vozila
+STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Upravo smo završili projektovanje novog vozila {STRING} - da li ste zainteresovani za jednogodišnja eksluzivna prava upotrebe ovog vozila, kako bi smo proverili radne osobine pre puštanja u masovnu proizvodnju?
+STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :železničko vučno vozilo
+STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :drumsko vozilo
+STR_ENGINE_PREVIEW_AIRCRAFT                                     :letilica
+STR_ENGINE_PREVIEW_SHIP                                         :brod
+STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :jednopružno žel. vučno vozilo
+STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :megnetno žel. vučno vozilo
 
 ##id 0x8800
-
-
-
+STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Železnički Depo
+STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BLACK}{BIGFONT}Narod slavi . . .{}Prvi voz stiže na stanicu {STATION}!
+STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Opširnije)
+STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Voz se tu upravo nalazi
+STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
+STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
+STR_ORDER_NON_STOP                                              :{BLACK}Direktno
+STR_ORDER_GO_TO                                                 :Idi do
+STR_ORDER_GO_NON_STOP_TO                                        :Idi direktno do
+STR_ORDER_GO_VIA                                                :Idi preko
+STR_ORDER_GO_NON_STOP_VIA                                       :Idi direktno preko
+STR_ORDER_STOP_LOCATION_NEAR_END                                :[pri početku]
+STR_ORDER_STOP_LOCATION_MIDDLE                                  :[na sredini]
+STR_ORDER_STOP_LOCATION_FAR_END                                 :[pri kraju]
+STR_ORDER_TOGGLE_FULL_LOAD                                      :{BLACK}Pun utovar bilo kog
+STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Utovar ako ima
+STR_ORDER_DROP_FULL_LOAD_ALL                                    :Pun utovar svega
+STR_ORDER_DROP_FULL_LOAD_ANY                                    :Pun utovar bilo kog
+STR_ORDER_DROP_NO_LOADING                                       :Bez utovara
+STR_ORDER_TOGGLE_UNLOAD                                         :{BLACK}Iztovar svega
+STR_ORDER_DROP_UNLOAD_IF_ACCEPTED                               :Iztovar ako prihvata
+STR_ORDER_DROP_UNLOAD                                           :Iztovar svega
+STR_ORDER_DROP_TRANSFER                                         :Prevoz
+STR_ORDER_DROP_NO_UNLOADING                                     :Bez iztovara
+STR_ORDER_FULL_LOAD                                             :(Pun utovar)
+STR_ORDER_FULL_LOAD_ANY                                         :(Pun utovar bilo kog)
+STR_ORDER_NO_LOAD                                               :(Bez utovara)
+STR_ORDER_UNLOAD                                                :(Iztovar i utovar)
+STR_ORDER_UNLOAD_FULL_LOAD                                      :(Iztovar i pun utovar svega)
+STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Iztovar i pun utovar bilo kog)
+STR_ORDER_UNLOAD_NO_LOAD                                        :(Iztovar bez utovara)
+STR_ORDER_TRANSFER                                              :(Prevoz i utovar)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :(Prevoz i pun utovar svega)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Prevoz i pun utovar bilo kog)
+STR_ORDER_TRANSFER_NO_LOAD                                      :(Prevoz bez utovara)
+STR_ORDER_NO_UNLOAD                                             :(Bez iztovara i utovar)
+STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Bez iztovara i pun utovar svega)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Bez iztovara i pun utovar bilo kog)
+STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Promena načina zaustavljnja u označenoj naredbi
+STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Promena načina utovara u označenoj naredbi
+STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Promena načina iztovara u označenoj naredbi
+STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+
+STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Dodavanje složene naredbe
+STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Idi do najbližeg depoa
+STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Idi do najbližeg hangara
+STR_ORDER_NEAREST_DEPOT                                         :najbliži
+STR_ORDER_NEAREST_HANGAR                                        :najbliži Hangar
+STR_ORDER_SERVICE_AT                                            :Servisiranje u
+STR_ORDER_SERVICE_NON_STOP_AT                                   :Diektno na servisiranje u
+STR_ORDER_TRAIN_DEPOT                                           :Železnički Depo
+STR_ORDER_ROAD_DEPOT                                            :Drumski Depo
+STR_ORDER_SHIP_DEPOT                                            :Brodogradilište
+STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
+STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
+STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+
+STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Uvek
+STR_ORDER_DROP_SERVICE_DEPOT                                    :Servis po potrebi
+STR_ORDER_DROP_HALT_DEPOT                                       :Zaustavljanje
+
+STR_ORDER_CONDITIONAL                                           :Uslovna naredba skoka
+STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Skok na osnovu podatka o vozilu
+STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Kako se upoređuje podatak o vozilu sa unetom vrednošću
+STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Vrednost za poređenje sa podatkom o vozilu
+STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Unos vrednosti za poređenje
+STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Procenat natovarenog
+STR_ORDER_CONDITIONAL_RELIABILITY                               :Pouzdanost
+STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Najveća brzina
+STR_ORDER_CONDITIONAL_AGE                                       :Starost vozila (godine)
+STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Servis
+STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Uvek
+STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :jednako
+STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :različito od
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN                      :manje od
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS                    :manje ili jednako
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :veće od
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :veće ili jednako
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :potreban
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :nepotreban
 STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
 STR_CONDITIONAL_UNCONDITIONAL                                   :Pređi na naredbu {COMMA}
 STR_CONDITIONAL_NUM                                             :Pređi na naredbu {COMMA} kada je {STRING} {STRING} {COMMA}
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 64254b999..87eb8d163 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -1,12 +1,12 @@
 ##name Spanish
 ##ownname Español (ES)
 ##isocode es_ES
-##winlangid 0x0c0a
-##grflangid 0x04
 ##plural 0
 ##textdir ltr
 ##digitsep .
 ##digitsepcur .
+##winlangid 0x0c0a
+##grflangid 0x04
 ##gender masculino femenino
 
 #
@@ -964,6 +964,7 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}Permiti
 STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}Activar motor  de multiples NewGRF: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Este cambio no es posible cuando tiene vehículos
 
+STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :{LTBLUE}Aeropuertos nunca caducan: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_WARN_LOST_TRAIN                              :{LTBLUE}Avisar si el tren se pierde: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ORDER_REVIEW                                 :{LTBLUE}Revisar ordenes de los vehículos: {ORANGE}{STRING}