Skip to content

Chinese theme; Fallback theme; New signs #1523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Apr 26, 2022
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6b14183
Road signs theme for China; new Fallback theme; Moved RoadUI signs in…
kvakvs Apr 6, 2022
23b0aed
Fix bug with Fallback theme loading; Fallback theme loads white textu…
kvakvs Apr 6, 2022
684f372
Update translations
kvakvs Apr 6, 2022
e6f4ecb
Fix to yield sign of Chinese theme; was not square now it is
kvakvs Apr 6, 2022
c58e35c
New feature for basing themes on other themes; Generic Chinese theme …
kvakvs Apr 8, 2022
5f478a3
Merge branch 'master' into theme/chinese-signs; Fix for bad merge
kvakvs Apr 8, 2022
d21486c
Merge branch 'master' into theme/chinese-signs
kvakvs Apr 8, 2022
39ac080
Renamed RoadDefaults; Removed old vehicle restriction signs; README a…
kvakvs Apr 8, 2022
d9454f7
Restriction signs from junction restrictions now moved to Fallback th…
kvakvs Apr 9, 2022
9cd151c
Blue allow icons for other restrictions
kvakvs Apr 9, 2022
14303e6
Remove Junction restrictions old textures - Now in Fallback theme
kvakvs Apr 9, 2022
b811cfa
Merge remote-tracking branch 'tmpe/master' into theme/chinese-signs
kvakvs Apr 9, 2022
8a49eaa
Green allow signs for Fallback, China and China_Generic
kvakvs Apr 9, 2022
4a42594
Replaced some icons with Nounproject icons
kvakvs Apr 13, 2022
3b25737
Merge branch 'master' into theme/chinese-signs
kvakvs Apr 13, 2022
953bbeb
Changed cargo train icon back to hopper; Added proposed icons for air…
kvakvs Apr 17, 2022
7b0767a
Changed TAXI text for Simplified Chinese
kvakvs Apr 17, 2022
8d851ca
Generic China texture does not have speed limit signs and refers to p…
kvakvs Apr 23, 2022
9d424c7
Merge master + rearrange some code
kvakvs Apr 25, 2022
08adf15
Merge branch 'master' into theme/chinese-signs
kvakvs Apr 26, 2022
72bf652
Update strings
kvakvs Apr 26, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions TLM/TLM/Lifecycle/TMPELifecycle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,7 @@ internal void RegisterCustomManagers() {
RegisteredManagers.Add(ExtVehicleManager.Instance);

// Texture managers
RegisteredManagers.Add(UI.Textures.RoadSignThemes.Instance);
RegisteredManagers.Add(UI.Textures.JunctionRestrictions.Instance);
RegisteredManagers.Add(UI.Textures.RoadSignThemeManager.Instance);
RegisteredManagers.Add(UI.Textures.RoadUI.Instance);
RegisteredManagers.Add(UI.Textures.TrafficLightTextures.Instance);

Expand Down
1 change: 0 additions & 1 deletion TLM/TLM/Manager/Impl/OptionsManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@ internal static void RebuildMenu(bool languageChanged = false) {
}

if (languageChanged) {
RoadUI.Instance.ReloadTexturesWithTranslation();
TrafficLightTextures.Instance.ReloadTexturesWithTranslation();
TMPELifecycle.Instance.TranslationDatabase.ReloadTutorialTranslations();
TMPELifecycle.Instance.TranslationDatabase.ReloadGuideTranslations();
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed TLM/TLM/Resources/RoadUI/parking_allowed.png
Binary file not shown.
Binary file removed TLM/TLM/Resources/RoadUI/parking_disallowed.png
Binary file not shown.
Binary file removed TLM/TLM/Resources/RoadUI/sign_none.png
Binary file not shown.
Binary file removed TLM/TLM/Resources/RoadUI/sign_priority.png
Binary file not shown.
Binary file removed TLM/TLM/Resources/RoadUI/sign_stop.png
Binary file not shown.
Binary file removed TLM/TLM/Resources/RoadUI/sign_stop_zh.png
Binary file not shown.
Binary file removed TLM/TLM/Resources/RoadUI/sign_yield.png
Binary file not shown.
Binary file removed TLM/TLM/Resources/RoadUI/sign_yield_zh.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5,082 changes: 5,082 additions & 0 deletions TLM/TLM/Resources/SignThemes/Fallback/Fallback.svg

Large diffs are not rendered by default.

Binary file added TLM/TLM/Resources/SignThemes/Fallback/Parking.png
8 changes: 8 additions & 0 deletions TLM/TLM/Resources/SignThemes/Fallback/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Fallback Road Signs Theme
=========================

This is an implicitly loaded road signs theme which is used as last resort when
finding road signs.

NOTE: Speed limit road signs do not query Fallback theme, it is assumed that
any current theme would provide all necessary numbered road signs.
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/0.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/10.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/100.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/105.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/110.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/115.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/120.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/125.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/130.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/135.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/140.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/15.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/20.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/25.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/30.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/35.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/40.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/45.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/5.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/50.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/55.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/60.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/65.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/70.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/75.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/80.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/85.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/90.png
Binary file added TLM/TLM/Resources/SignThemes/Kmph_China/95.png
2,939 changes: 2,939 additions & 0 deletions TLM/TLM/Resources/SignThemes/Kmph_China/China.svg

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions TLM/TLM/Resources/SignThemes/Kmph_China_Generic/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Generic Chinese theme
=====================

Based on Mainland China theme and only replaces signs with text to have no text
in them. Keeping the Stop 停 sign as it is fine in all/most Chinese dialects.

Source file is located in Kmph_China/China.svg
16 changes: 8 additions & 8 deletions TLM/TLM/Resources/Translations/Options.csv
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,11 @@ Opsi ini hanya sekadar menambah realisme kepada game."
"VR.Option:No double crossings","Keine doppelten Übergänge","Remove widest crossing on transitions between two types of road","En una transición de segmento a segmento, solo los segmentos más pequeños muestran cruce peatonal","Dans une transition d'un segment à un autre, seul le plus petit segment aura un passage piéton","A szegmensek közötti átmenetnél csak a kisebb szegmens kap gyalogátkelőt.","Nessun doppio attraversamento","セグメント間の横断歩道が二重になるのを防止し、狭い道路側のみにする","구간이 바뀔 때 더 작은 구간에서만 교차로가 생성됩니다.","Geen dubbele kruisingen","Przejście dla pieszych tylko na węższym segmencie przy łączeniu segmentów różnej szerokości","Sem cruzamentos duplos","Без двойных пешеходных переходов","禁用雙重行人穿越道","禁用双方向人行横道","Remove widest crossing on transitions between two types of road","Çift kesişim olamaz","Заборонити подвійні пішохідні переходи","","Dvojité priechody pre chodcov nie sú možné","ไม่มีการข้ามสองครั้ง","","","ﺕﺎﻌﻃﺎﻘﺗ ﻰﻠﻋ ﻂﻘﻓ ﺮﻐﺻﻷﺍ ﺀﺰﺠﻟﺍ ﻞﺼﺤﻳ ، ﺀﺰﺟ ﻰﻟﺇ ﺀﺰﺟ ﻦﻣ ﻝﺎﻘﺘﻧﻻﺍ ﻲﻓ","Pada transisi ruas-ke-ruas, hanya ruas yang lebih kecil yang mendapatkan penyeberangan."
"VR.Option:Dedicated turning lanes","Dedizierte Abbiegespuren","Dedicated turning lanes","Carriles dedicados para girar","Voies dédiées pour tourner","Dedikált kanyarodósávok","Corsie di svolta dedicate","専用の右左折レーン","회전 전용 차선","Toegewijde lijn om terug te draaien","Dedykowane pasy do skrętu","","Выделенные полосы для поворота","專用轉向車道","专用转弯车道","Dedicated turning lanes","Dönüş şeritleri ayrılır","Виділені смуги для руху в різних напрямках","","Vyhradené odbočovacie pruhy","เลนเลี้ยวเฉพาะ","","","ةصصخملا ةراودلا تارمملا","Lajur belok khusus"
"General.Checkbox:Use UnifiedUI","UnifiedUI verwenden","Use UnifiedUI","Utilizar UnifiedUI","Utiliser 'UnifiedUI'","","Usa UnifiedUI","UnifiedUIを使用","UnifiedUI 사용","Gebruik UnifiedUI","Użyj UnifiedUI","","Использовать UnifiedUI","將主選單圖示加入 UnifiedUI 選單","使用 UnifiedUI","Use UnifiedUI","UnifiedUI kullan","Розмістити кнопку TM:PE в панелі UnifiedUI","","Použi UnifiedUI","ใช้ UnifiedUI","","","استخدام واجهة مستخدم موحدة","Gunakan UnifiedUI"
"Keybind.SpeedLimits:Decrease selected speed","Ausgewählte Geschwindigkeit verringern","Decrease selected speed","Reducir la velocidad seleccionada","Diminuer la vitesse sélectionnée","","Riduci la velocità selezionata","選択した速度を下げる","선택한 속도 제한 감소","Verlaag geselecteerde snelheid","Zmniejsz wybraną prędkość","","Уменьшить выбранную скорость","收緊速限","降低目标车速","Decrease selected speed","","Зменшити обрану швидкість","","Znížiť zvolenú rýchlosť","","","","ﺓﺩﺪﺤﻤﻟﺍ ﺔﻋﺮﺴﻟﺍ ﺾﻔﺧ ","Kurangkan kecepatan"
"Keybind.SpeedLimits:Increase selected speed","Ausgewählte Geschwindigkeit erhöhen","Increase selected speed","Aumentar la velocidad seleccionada","Augmenter la vitesse sélectionnée","","Aumenta la velocità selezionata","選択した速度を上げる","선택한 속도 제한 증가","Verhoog geselecteerde snelheid","Zwiększ wybraną prędkość","","Увеличить выбранную скорость","提高速限","提高目标车速","Increase selected speed","","Збільшити обрану швидкість","","Zvýšiť zvolenú rýchlosť","","","","ﺓﺩﺪﺤﻤﻟﺍ ﺔﻋﺮﺴﻟﺍ ﺓﺩﺎﻳﺯ","Tingkatkan kecepatan"
"KeybindCategory:SpeedLimits","Geschwindigkeitsbegrenzungen","Speed Limits","Límites de velocidad","Limites de Vitesse","","Limiti di velocità","制限速度","속도 제한","Snelheidslimieten","Limity prędkości","","Ограничения скорости","速限","限速","Speed Limits","","Обмеження швидкості","","Rýchlostné obmedzenia","จำกัดความเร็ว","","","",""
"General.Group:Localisation","Lokalisierung","Localization","Localización","Localisation","","General.Group:Localizzazione","言語設定","언어 설정","Lokalisatie","Lokalizacja","","Локализация","語言翻譯","本地化","Localisation","","","","Lokalizácia","ภาษาที่รองรับ","","","ﻊﻗﻮﻤﻟﺍ",""
"General.Group:Interface","Interface","Interface","Interfaz","Interface","","General.Group:Interfaccia","インターフェース","인터페이스","Bediening","Interfejs","","Интерфейс","介面","接口","Interface","","","","Rozhranie","อินเตอร์เฟซ","","","ﻡﺪﺨﺘﺴﻤﻟﺍ ﻪﻬﺟﺍﻭ",""
"General.Group:Compatibility","Kompatibilität","Compatibility","Compatibilidad","Compatibilités","","General.Group:Compatibilità","互換性","호환성","Compatibiliteit","Zgodność","","Совместимость","相容性","兼容性","Compatibility","","","","Kompatibilita","ความเข้ากันได้","","","ﻖﻓﺍﻮﺘﻟﺍ",""
"General.Button:Help us translate on Crowdin","Hilf uns bei der Übersetzung auf Crowdin","Help us translate on Crowdin","Ayúdanos a traducir en Crowdin","Aidez-nous à traduire sur Crowdin","","Aiutaci a tradurre su Crowdin","Crowdinで翻訳を手伝ってください","Crowdin에서 번역을 도와주세요","Help ons vertalen op Crowdin","Pomóż w tłumaczeniu na Crowdin","","Помогите нам с переводом на Crowdin","提供翻譯協助","在 Crowdin 上帮助我们翻译","Help us translate on Crowdin","","","","Pomôžte s prekladom na Crowdin","ช่วยเราแปลใน Crowdin","","","",""
"General.Button:View localisation guide","Übersetzungsleitfaden anzeigen","View localization guide","Ver guía de localización","Voir le guide des Localités","","Visualizza la guida alla localizzazione","ローカライズのガイドを表示","현지화 도움말 보기","Bekijk de lokalisatie handleiding","Zobacz przewodnik lokalizacji","","Руководство по локализации","關於多國語言翻譯","查看本地化指南","View localisation guide","","","","Zobraziť sprievodcu s lokalizáciou","ดูคู่มือการแปลเป็นภาษาท้องถิ่น","","","",""
"Keybind.SpeedLimits:Decrease selected speed","Ausgewählte Geschwindigkeit verringern","Decrease selected speed","Reducir la velocidad seleccionada","Diminuer la vitesse sélectionnée","","Riduci la velocità selezionata","選択した速度を下げる","선택한 속도 제한 감소","Verlaag geselecteerde snelheid","Zmniejsz wybraną prędkość","","Уменьшить выбранную скорость","收緊速限","降低目标车速","Decrease selected speed","","Зменшити обрану швидкість","","Znížiť zvolenú rýchlosť","ลดขีดจำกัดความเร็ว","","","ﺓﺩﺪﺤﻤﻟﺍ ﺔﻋﺮﺴﻟﺍ ﺾﻔﺧ ","Kurangkan kecepatan"
"Keybind.SpeedLimits:Increase selected speed","Ausgewählte Geschwindigkeit erhöhen","Increase selected speed","Aumentar la velocidad seleccionada","Augmenter la vitesse sélectionnée","","Aumenta la velocità selezionata","選択した速度を上げる","선택한 속도 제한 증가","Verhoog geselecteerde snelheid","Zwiększ wybraną prędkość","","Увеличить выбранную скорость","提高速限","提高目标车速","Increase selected speed","","Збільшити обрану швидкість","","Zvýšiť zvolenú rýchlosť","เพิ่มขีดจำกัดความเร็ว","","","ﺓﺩﺪﺤﻤﻟﺍ ﺔﻋﺮﺴﻟﺍ ﺓﺩﺎﻳﺯ","Tingkatkan kecepatan"
"KeybindCategory:SpeedLimits","Geschwindigkeitsbegrenzungen","Speed Limits","Límites de velocidad","Limites de Vitesse","","Limiti di velocità","制限速度","속도 제한","Snelheidslimieten","Limity prędkości","","Ограничения скорости","速限","限速","Speed Limits","","Обмеження швидкості","","Rýchlostné obmedzenia","จำกัดความเร็ว","","","","Batas Kecepatan"
"General.Group:Localisation","Lokalisierung","Localization","Localización","Localisation","","General.Group:Localizzazione","言語設定","언어 설정","Lokalisatie","Lokalizacja","","Локализация","語言翻譯","本地化","Localisation","","","","Lokalizácia","ภาษาที่รองรับ","","","ﻊﻗﻮﻤﻟﺍ","Bahasa dan Lokalisasi"
"General.Group:Interface","Interface","Interface","Interfaz","Interface","","General.Group:Interfaccia","インターフェース","인터페이스","Bediening","Interfejs","","Интерфейс","介面","接口","Interface","","","","Rozhranie","อินเตอร์เฟซ","","","ﻡﺪﺨﺘﺴﻤﻟﺍ ﻪﻬﺟﺍﻭ","Tampilan"
"General.Group:Compatibility","Kompatibilität","Compatibility","Compatibilidad","Compatibilités","","General.Group:Compatibilità","互換性","호환성","Compatibiliteit","Zgodność","","Совместимость","相容性","兼容性","Compatibility","","","","Kompatibilita","ความเข้ากันได้","","","ﻖﻓﺍﻮﺘﻟﺍ","Kompatibilitas"
"General.Button:Help us translate on Crowdin","Hilf uns bei der Übersetzung auf Crowdin","Help us translate on Crowdin","Ayúdanos a traducir en Crowdin","Aidez-nous à traduire sur Crowdin","","Aiutaci a tradurre su Crowdin","Crowdinで翻訳を手伝ってください","Crowdin에서 번역을 도와주세요","Help ons vertalen op Crowdin","Pomóż w tłumaczeniu na Crowdin","","Помогите нам с переводом на Crowdin","提供翻譯協助","在 Crowdin 上帮助我们翻译","Help us translate on Crowdin","","","","Pomôžte s prekladom na Crowdin","ช่วยเราแปลใน Crowdin","","","","Bantu kami menerjemah di Crowdin"
"General.Button:View localisation guide","Übersetzungsleitfaden anzeigen","View localization guide","Ver guía de localización","Voir le guide des Localités","","Visualizza la guida alla localizzazione","ローカライズのガイドを表示","현지화 도움말 보기","Bekijk de lokalisatie handleiding","Zobacz przewodnik lokalizacji","","Руководство по локализации","關於多國語言翻譯","查看本地化指南","View localisation guide","","","","Zobraziť sprievodcu s lokalizáciou","ดูคู่มือการแปลเป็นภาษาท้องถิ่น","","","","Lihat petunjuk lokalisasi"
Loading