Merge branch 'master' into jgrpp
# Conflicts: # src/bridge_map.h # src/crashlog.cpp # src/industry.h # src/linkgraph/linkgraph_type.h # src/order_type.h # src/saveload/afterload.cpp # src/settings.cpp # src/settings_type.h # src/smallmap_gui.cpp # src/spritecache.cpp # src/stdafx.h # src/table/settings.h.preamble # src/train.h # src/vehicle.cpp # src/viewport.cpp # src/viewport_func.h # src/widgets/station_widget.h # src/zoom_func.h # src/zoom_type.h
This commit is contained in:
Jonathan G Rennison
@@ -333,6 +333,8 @@ STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Odaberi
|
||||
STR_BUTTON_SORT_BY :{BLACK}Sortiraj prema
|
||||
STR_BUTTON_LOCATION :{BLACK}Lokacija
|
||||
STR_BUTTON_RENAME :{BLACK}Preimenuj
|
||||
STR_BUTTON_CATCHMENT :{BLACK}Područje pokrivanja
|
||||
STR_TOOLTIP_CATCHMENT :{BLACK}Uključi prikaz područja pokrivanja
|
||||
|
||||
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zatvori prozor
|
||||
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Naslov prozora - povuci ovo za micanje prozora
|
||||
@@ -361,6 +363,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Uključi
|
||||
STR_BUTTON_DEFAULT :{BLACK}Zadano
|
||||
STR_BUTTON_CANCEL :{BLACK}Odustani
|
||||
STR_BUTTON_OK :{BLACK}OK
|
||||
STR_WARNING_PASSWORD_SECURITY :{YELLOW}Upozorenje: Administratori servera mogu pročitati bilo koji tekst upisan ovdje.
|
||||
|
||||
# On screen keyboard window
|
||||
STR_OSK_KEYBOARD_LAYOUT :`1234567890-=\qwertyuiop[]asdfghjkl;' zxcvbnm,./ .
|
||||
|
||||
@@ -237,6 +237,8 @@ STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selectee
|
||||
STR_BUTTON_SORT_BY :{BLACK}Sorteren op
|
||||
STR_BUTTON_LOCATION :{BLACK}Locatie
|
||||
STR_BUTTON_RENAME :{BLACK}Hernoemen
|
||||
STR_BUTTON_CATCHMENT :{BLACK}Dekking
|
||||
STR_TOOLTIP_CATCHMENT :{BLACK}Schakelt weergave van dekkingsgebied om
|
||||
|
||||
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Venster sluiten
|
||||
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Vensternaam - sleep om venster te verplaatsen
|
||||
@@ -265,6 +267,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Wanneer
|
||||
STR_BUTTON_DEFAULT :{BLACK}Standaard
|
||||
STR_BUTTON_CANCEL :{BLACK}Annuleren
|
||||
STR_BUTTON_OK :{BLACK}OK
|
||||
STR_WARNING_PASSWORD_SECURITY :{YELLOW}Waarschuwing: het kan zijn dat serverbeheerders tekst niet kunnen lezen die hier wordt ingevoerd.
|
||||
|
||||
# On screen keyboard window
|
||||
STR_OSK_KEYBOARD_LAYOUT :`1234567890-=\qwertyuiop[]asdfghjkl;' zxcvbnm,./ .
|
||||
|
||||
@@ -237,6 +237,8 @@ STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select f
|
||||
STR_BUTTON_SORT_BY :{BLACK}Sort by
|
||||
STR_BUTTON_LOCATION :{BLACK}Location
|
||||
STR_BUTTON_RENAME :{BLACK}Rename
|
||||
STR_BUTTON_CATCHMENT :{BLACK}Coverage
|
||||
STR_TOOLTIP_CATCHMENT :{BLACK}Toggle coverage area display
|
||||
|
||||
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Close window
|
||||
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Window title - drag this to move window
|
||||
@@ -265,6 +267,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}By enabl
|
||||
STR_BUTTON_DEFAULT :{BLACK}Default
|
||||
STR_BUTTON_CANCEL :{BLACK}Cancel
|
||||
STR_BUTTON_OK :{BLACK}OK
|
||||
STR_WARNING_PASSWORD_SECURITY :{YELLOW}Warning: Server administrators may be able to read any text entered here.
|
||||
|
||||
# On screen keyboard window
|
||||
STR_OSK_KEYBOARD_LAYOUT :`1234567890-=\qwertyuiop[]asdfghjkl;' zxcvbnm,./ .
|
||||
|
||||
@@ -237,6 +237,8 @@ STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Valitse
|
||||
STR_BUTTON_SORT_BY :{BLACK}Lajittele
|
||||
STR_BUTTON_LOCATION :{BLACK}Sijainti
|
||||
STR_BUTTON_RENAME :{BLACK}Nimeä uudelleen
|
||||
STR_BUTTON_CATCHMENT :{BLACK}Vaikutusalue
|
||||
STR_TOOLTIP_CATCHMENT :{BLACK}Valitse, näytetäänkö vaikutusalue
|
||||
|
||||
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Sulje ikkuna
|
||||
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Ikkunan otsake – siirrä ikkunaa vetämällä tästä
|
||||
@@ -265,6 +267,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Kun otat
|
||||
STR_BUTTON_DEFAULT :{BLACK}Oletus
|
||||
STR_BUTTON_CANCEL :{BLACK}Peruuta
|
||||
STR_BUTTON_OK :{BLACK}OK
|
||||
STR_WARNING_PASSWORD_SECURITY :{YELLOW}Varoitus: Palvelimen ylläpitäjät saattavat nähdä kaiken tähän kirjoittamasi.
|
||||
|
||||
# On screen keyboard window
|
||||
STR_OSK_KEYBOARD_LAYOUT :§1234567890+´ qwertyuiopå¨asdfghjklöä' zxcvbnm,.- .
|
||||
|
||||
@@ -476,6 +476,7 @@ STR_ABOUT_MENU_SCREENSHOT :Ambil gambar
|
||||
STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Ambil gambar dengan diperbesar
|
||||
STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT :Ambil gambar dengan perbesaran normal
|
||||
STR_ABOUT_MENU_GIANT_SCREENSHOT :Ambil gambar keseluruhan peta
|
||||
STR_ABOUT_MENU_SHOW_FRAMERATE :Tampilkan laju bingkai
|
||||
STR_ABOUT_MENU_ABOUT_OPENTTD :Tentang 'OpenTTD'
|
||||
STR_ABOUT_MENU_SPRITE_ALIGNER :Penjajar Sprite
|
||||
STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Hidup/Matikan kotak batas
|
||||
@@ -1572,6 +1573,7 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT :Mengaktifkan se
|
||||
STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN :Dilarang
|
||||
STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :Diijinkan
|
||||
STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT :Diijinkan, layout kota sendiri
|
||||
STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT :Seberapa banyak kargo dihasilkan oleh rumah di kota , relatif terhadap keseluruhan populasi kota.{}Pertumbuhan kuadrat: Kota yang membesar dua kali menghasilkan penumpang empat kali lipat.{}Pertumbuhan linier: Kota yang membesar dua kali menghasilkan penumpang dua kali lipat.
|
||||
STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linier
|
||||
|
||||
STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Penempatan pohon dalam permainan: {STRING}
|
||||
@@ -3149,11 +3151,11 @@ STR_STATION_VIEW_ACCEPTS_TOOLTIP :{BLACK}Tampilka
|
||||
STR_STATION_VIEW_ACCEPTS_CARGO :{BLACK}Menerima: {WHITE}{CARGO_LIST}
|
||||
|
||||
STR_STATION_VIEW_EXCLUSIVE_RIGHTS_SELF :{BLACK}Stasiun memiliki hak transportasi eksklusif di kota ini
|
||||
STR_STATION_VIEW_EXCLUSIVE_RIGHTS_COMPANY :{YELLOW}{COMPANY}{BLACK} beli hak transportasi eksklusif di kota ini
|
||||
STR_STATION_VIEW_EXCLUSIVE_RIGHTS_COMPANY :{YELLOW}{COMPANY}{BLACK} memiliki hak transportasi eksklusif di kota ini
|
||||
|
||||
STR_STATION_VIEW_RATINGS_BUTTON :{BLACK}Peringkat
|
||||
STR_STATION_VIEW_RATINGS_TOOLTIP :{BLACK}Tampilkna peringkat dari stasiun
|
||||
STR_STATION_VIEW_SUPPLY_RATINGS_TITLE :{BLACK}Asupan bulanan dan penilaian tempatan:
|
||||
STR_STATION_VIEW_SUPPLY_RATINGS_TITLE :{BLACK}Asupan bulanan dan peringkat layanan:
|
||||
STR_STATION_VIEW_CARGO_SUPPLY_RATING :{WHITE}{STRING}: {YELLOW}{COMMA} / {STRING} ({COMMA}%)
|
||||
|
||||
STR_STATION_VIEW_GROUP :{BLACK}Pengelompokkan
|
||||
@@ -3376,6 +3378,7 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES :Kendaraan tanpa
|
||||
STR_GROUP_DEFAULT_SHIPS :Kapal tanpa kelompok
|
||||
STR_GROUP_DEFAULT_AIRCRAFTS :Pesawat tanpa kelompok
|
||||
|
||||
STR_GROUP_COUNT_WITH_SUBGROUP :{TINY_FONT}{COMMA} (+{COMMA})
|
||||
|
||||
STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}Kelompok - Klik salah satu untuk melihat daftar kendaraan pada kelompok tersebut
|
||||
STR_GROUP_CREATE_TOOLTIP :{BLACK}Klik untuk membuat kelompok
|
||||
|
||||
@@ -239,6 +239,8 @@ STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selezion
|
||||
STR_BUTTON_SORT_BY :{BLACK}Ordina per
|
||||
STR_BUTTON_LOCATION :{BLACK}Posizione
|
||||
STR_BUTTON_RENAME :{BLACK}Rinomina
|
||||
STR_BUTTON_CATCHMENT :{BLACK}Copertura
|
||||
STR_TOOLTIP_CATCHMENT :{BLACK}Attiva/disattiva la visualizzazione dell'area di copertura
|
||||
|
||||
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Chiude la finestra
|
||||
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Titolo della finestra - trascinarlo per muovere la finestra
|
||||
@@ -267,6 +269,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Mostra a
|
||||
STR_BUTTON_DEFAULT :{BLACK}Predefinito
|
||||
STR_BUTTON_CANCEL :{BLACK}Annulla
|
||||
STR_BUTTON_OK :{BLACK}OK
|
||||
STR_WARNING_PASSWORD_SECURITY :{YELLOW}Attenzione: gli amministratori del server potrebbero leggere il testo inserito qui.
|
||||
|
||||
# On screen keyboard window
|
||||
STR_OSK_KEYBOARD_LAYOUT :\1234567890'ì qwertyuiopè+asdfghjklòàù<zxcvbnm,.- .
|
||||
|
||||
@@ -237,6 +237,8 @@ STR_TOOLTIP_FILTER_CRITERIA :{BLACK}검색
|
||||
STR_BUTTON_SORT_BY :{BLACK}정렬
|
||||
STR_BUTTON_LOCATION :{BLACK}위치
|
||||
STR_BUTTON_RENAME :{BLACK}이름 바꾸기
|
||||
STR_BUTTON_CATCHMENT :{BLACK}역세권
|
||||
STR_TOOLTIP_CATCHMENT :{BLACK}이 역의 역세권을 표시하거나 끕니다.
|
||||
|
||||
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}창을 닫습니다.
|
||||
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}창 제목 - 창을 움직이려면 여기를 드래그하세요.
|
||||
@@ -265,6 +267,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}이 버
|
||||
STR_BUTTON_DEFAULT :{BLACK}기본값
|
||||
STR_BUTTON_CANCEL :{BLACK}취소
|
||||
STR_BUTTON_OK :{BLACK}확인
|
||||
STR_WARNING_PASSWORD_SECURITY :{YELLOW}경고: 서버 관리자가 여기에 입력되는 모든 텍스트를 읽을 수 있습니다.
|
||||
|
||||
# On screen keyboard window
|
||||
STR_OSK_KEYBOARD_LAYOUT :`1234567890-=\ㅂㅈㄷㄱㅅㅛㅕㅑㅐㅔ[]ㅁㄴㅇㄹㅎㅗㅓㅏㅣ;' ㅋㅌㅊㅍㅠㅜㅡ,./ .
|
||||
|
||||
@@ -363,6 +363,8 @@ STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Выбе
|
||||
STR_BUTTON_SORT_BY :{BLACK}Сортировка
|
||||
STR_BUTTON_LOCATION :{BLACK}Обзор
|
||||
STR_BUTTON_RENAME :{BLACK}Переименовать
|
||||
STR_BUTTON_CATCHMENT :{BLACK}Покрытие
|
||||
STR_TOOLTIP_CATCHMENT :{BLACK}Переключить видимость области покрытия
|
||||
|
||||
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Закрыть окно
|
||||
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Окна можно перетаскивать, схватив за заголовок
|
||||
@@ -391,6 +393,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Если
|
||||
STR_BUTTON_DEFAULT :{BLACK}По умолчанию
|
||||
STR_BUTTON_CANCEL :{BLACK}Отмена
|
||||
STR_BUTTON_OK :{BLACK}OK
|
||||
STR_WARNING_PASSWORD_SECURITY :{YELLOW}Внимание: администраторы сервера могут увидеть ваш пароль.
|
||||
|
||||
# On screen keyboard window
|
||||
STR_OSK_KEYBOARD_LAYOUT :`1234567890-=\qwertyuiop[]asdfghjkl;' zxcvbnm,./ .
|
||||
|
||||
@@ -238,6 +238,8 @@ STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Elegir c
|
||||
STR_BUTTON_SORT_BY :{BLACK}Ordenar por
|
||||
STR_BUTTON_LOCATION :{BLACK}Ubicación
|
||||
STR_BUTTON_RENAME :{BLACK}Cambiar nombre
|
||||
STR_BUTTON_CATCHMENT :{BLACK}Cobertura
|
||||
STR_TOOLTIP_CATCHMENT :{BLACK}Mostrar u ocultar área de cobertura
|
||||
|
||||
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Cerrar ventana
|
||||
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Título de la ventana (arrastrar para mover)
|
||||
@@ -266,6 +268,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Activar
|
||||
STR_BUTTON_DEFAULT :{BLACK}Predeterminado
|
||||
STR_BUTTON_CANCEL :{BLACK}Cancelar
|
||||
STR_BUTTON_OK :{BLACK}Aceptar
|
||||
STR_WARNING_PASSWORD_SECURITY :{YELLOW}Advertencia: los administradores del servidor tienen acceso al texto escrito aquí
|
||||
|
||||
# On screen keyboard window
|
||||
STR_OSK_KEYBOARD_LAYOUT :|1234567890'¿\qwertyuiop´+asdfghjklñ{}<zxcvbnm,.- .
|
||||
|
||||
Reference in New Issue
Block a user