diff --git a/locales/ar-SA/opencadstudio.ftl b/locales/ar-SA/opencadstudio.ftl index 38692ca6c..9e7adf385 100644 --- a/locales/ar-SA/opencadstudio.ftl +++ b/locales/ar-SA/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/bg-BG/opencadstudio.ftl b/locales/bg-BG/opencadstudio.ftl index 4bca196d0..d4ca54bf4 100644 --- a/locales/bg-BG/opencadstudio.ftl +++ b/locales/bg-BG/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/cs-CZ/opencadstudio.ftl b/locales/cs-CZ/opencadstudio.ftl index 90580a13b..1d3710279 100644 --- a/locales/cs-CZ/opencadstudio.ftl +++ b/locales/cs-CZ/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/de-DE/opencadstudio.ftl b/locales/de-DE/opencadstudio.ftl index fb2d0db43..68af4c46f 100644 --- a/locales/de-DE/opencadstudio.ftl +++ b/locales/de-DE/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/el-GR/opencadstudio.ftl b/locales/el-GR/opencadstudio.ftl index 8ccf5d5e6..c3e4f2c83 100644 --- a/locales/el-GR/opencadstudio.ftl +++ b/locales/el-GR/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/en-US/opencadstudio.ftl b/locales/en-US/opencadstudio.ftl index 6f54fb7c3..39581bfde 100644 --- a/locales/en-US/opencadstudio.ftl +++ b/locales/en-US/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/es-ES/opencadstudio.ftl b/locales/es-ES/opencadstudio.ftl index 1f8a7230c..3e23e63e2 100644 --- a/locales/es-ES/opencadstudio.ftl +++ b/locales/es-ES/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/fi-FI/opencadstudio.ftl b/locales/fi-FI/opencadstudio.ftl index e3c39530c..f5332f224 100644 --- a/locales/fi-FI/opencadstudio.ftl +++ b/locales/fi-FI/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/fr-FR/opencadstudio.ftl b/locales/fr-FR/opencadstudio.ftl index 20bab6472..4b1c9c4f6 100644 --- a/locales/fr-FR/opencadstudio.ftl +++ b/locales/fr-FR/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/hi-IN/opencadstudio.ftl b/locales/hi-IN/opencadstudio.ftl index d5b5f0002..1374059b8 100644 --- a/locales/hi-IN/opencadstudio.ftl +++ b/locales/hi-IN/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/hu-HU/opencadstudio.ftl b/locales/hu-HU/opencadstudio.ftl index d54b72999..e61e6db3f 100644 --- a/locales/hu-HU/opencadstudio.ftl +++ b/locales/hu-HU/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/it-IT/opencadstudio.ftl b/locales/it-IT/opencadstudio.ftl index dbceb272e..db0ca1b45 100644 --- a/locales/it-IT/opencadstudio.ftl +++ b/locales/it-IT/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/ja-JP/opencadstudio.ftl b/locales/ja-JP/opencadstudio.ftl index 34d074732..b3da26db1 100644 --- a/locales/ja-JP/opencadstudio.ftl +++ b/locales/ja-JP/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/ko-KR/opencadstudio.ftl b/locales/ko-KR/opencadstudio.ftl index a352051ad..07b8733d4 100644 --- a/locales/ko-KR/opencadstudio.ftl +++ b/locales/ko-KR/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/lo-LA/opencadstudio.ftl b/locales/lo-LA/opencadstudio.ftl index 0ce22e328..0c633a84e 100644 --- a/locales/lo-LA/opencadstudio.ftl +++ b/locales/lo-LA/opencadstudio.ftl @@ -351,7 +351,7 @@ common = .blue = ສີຟ້າ .bulge = ຄວາມໂກ່ງ .boolean-failed-the-solids-may-not-overlap = ບູນີນຫຼົ້ມເຫຼວ — ຮູບຊົງຕັນອາດຈະບໍ່ໄດ້ທັບຊ້ອນກັນ. - .boolean-select-select-exactly-two-solids-created-this = Boolean: ເລືອກຮູບຊົງຕັນທີ່ສ້າງໃນເຊດຊັນນີ້ພຽງ 2 ອັນ. + .boolean-select-exactly-two-solids-created-this = Boolean: ເລືອກຮູບຊົງຕັນທີ່ສ້າງໃນເຊດຊັນນີ້ພຽງ 2 ອັນ. .bottom = ລຸ່ມ .bottom-center-title-case = ລຸ່ມກາງ .bottom-left-title-case = ລຸ່ມຊ້າຍ @@ -1439,6 +1439,7 @@ common = .user-preferences = ການຕັ້ງຄ່າສ່ວນຕົວຂອງຜູ້ໃຊ້ .zoom = ຊູມ .reverse-mouse-wheel-zoom-zoomwheel = ສະຫຼັບທິດທາງການໝຸນລໍ້ເມົາສ໌ຊູມ (ZOOMWHEEL) + .touchpad-scroll-pans-ctrl-scroll-or-pinch-zooms = ທັດແພດ: ເລື່ອນເພື່ອຍ້າຍມຸມມອງ, Ctrl+ເລື່ອນ ຫຼື ບີບເພື່ອຊູມ .zoom-factor = ຕົວຄູນການຊູມ .how-far-one-wheel-notch-zooms-zoomfactor = ໄລຍະຊູມຕໍ່ການໝຸນລໍ້ເມົາສ໌ໜຶ່ງຄລິກ (ZOOMFACTOR). .text-and-dimensions = ຂໍ້ຄວາມ ແລະ ຂະໜາດ @@ -2519,7 +2520,7 @@ inquiry = .measuregeom-specify-second-ray-point = MEASUREGEOM ກຳນົດຈຸດທີສອງຂອງລັງສີ: .measuregeom-specify-vertex-point = MEASUREGEOM ກຳນົດຈຸດຍອດມຸມ: .measure-geometry = ວັດແທກຮູບຊົງເລຂາຄະນິດ - .qselect-no-pat-entities = QSELECT: ບໍ່ມີອົງປະກອບທີ່ກົງກັນ. + .qselect-no-matching-entities = QSELECT: ບໍ່ມີອົງປະກອບທີ່ກົງກັນ. .qselect-entity-ies-selected = QSELECT: ເລືອກແລ້ວ __ocs_fmt_0__ ອົງປະກອບ. .refclose-block-saved-all-references-updated = REFCLOSE: ບັນທຶກບລັອກ "__ocs_fmt_0__" ແລ້ວ. ອັບເດດທຸກການອ້າງອີງແລ້ວ. .refclose-changes-discarded = REFCLOSE: ຍົກເລີກການປ່ຽນແປງແລ້ວ. diff --git a/locales/nl-NL/opencadstudio.ftl b/locales/nl-NL/opencadstudio.ftl index 9fe5ce079..b80c45c52 100644 --- a/locales/nl-NL/opencadstudio.ftl +++ b/locales/nl-NL/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/pl-PL/opencadstudio.ftl b/locales/pl-PL/opencadstudio.ftl index ac7b09cfd..4bda1bd8b 100644 --- a/locales/pl-PL/opencadstudio.ftl +++ b/locales/pl-PL/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/pt-BR/opencadstudio.ftl b/locales/pt-BR/opencadstudio.ftl index 045ed08a9..f16e194c4 100644 --- a/locales/pt-BR/opencadstudio.ftl +++ b/locales/pt-BR/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/ru-RU/opencadstudio.ftl b/locales/ru-RU/opencadstudio.ftl index 570551c2c..adb69ae0f 100644 --- a/locales/ru-RU/opencadstudio.ftl +++ b/locales/ru-RU/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/tr-TR/opencadstudio.ftl b/locales/tr-TR/opencadstudio.ftl index 2b8b575a3..fb9d7010f 100644 --- a/locales/tr-TR/opencadstudio.ftl +++ b/locales/tr-TR/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/zh-CN/opencadstudio.ftl b/locales/zh-CN/opencadstudio.ftl index 6d8f38afc..da267f304 100644 --- a/locales/zh-CN/opencadstudio.ftl +++ b/locales/zh-CN/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/locales/zh-TW/opencadstudio.ftl b/locales/zh-TW/opencadstudio.ftl index 3eaedeb4f..07312b40e 100644 --- a/locales/zh-TW/opencadstudio.ftl +++ b/locales/zh-TW/opencadstudio.ftl @@ -13,6 +13,7 @@ language = .arabic = العربية .japanese = 日本語 .korean = 한국어 + .lao = ລາວ .czech = Čeština .italian = Italiano .finnish = Suomi diff --git a/src/i18n.rs b/src/i18n.rs index 5eb46ea31..3242142ca 100644 --- a/src/i18n.rs +++ b/src/i18n.rs @@ -53,6 +53,8 @@ pub enum Language { JaJp, #[serde(rename = "ko-KR")] KoKr, + #[serde(rename = "lo-LA")] + LoLa, #[serde(rename = "cs-CZ")] CsCz, #[serde(rename = "it-IT")] @@ -70,7 +72,7 @@ pub enum Language { } impl Language { - pub const ALL: [Language; 22] = [ + pub const ALL: [Language; 23] = [ Language::System, Language::EnUs, Language::BgBg, @@ -85,6 +87,7 @@ impl Language { Language::ItIt, Language::JaJp, Language::KoKr, + Language::LoLa, Language::PlPl, Language::RuRu, Language::ZhCn, @@ -112,6 +115,7 @@ impl Language { Language::ArSa => vec!["ar-SA".parse().expect("valid locale")], Language::JaJp => vec!["ja-JP".parse().expect("valid locale")], Language::KoKr => vec!["ko-KR".parse().expect("valid locale")], + Language::LoLa => vec!["lo-LA".parse().expect("valid locale")], Language::CsCz => vec!["cs-CZ".parse().expect("valid locale")], Language::ItIt => vec!["it-IT".parse().expect("valid locale")], Language::FiFi => vec!["fi-FI".parse().expect("valid locale")], @@ -139,6 +143,7 @@ impl Language { Language::ArSa => crate::tr!("language", "arabic"), Language::JaJp => crate::tr!("language", "japanese"), Language::KoKr => crate::tr!("language", "korean"), + Language::LoLa => crate::tr!("language", "lao"), Language::CsCz => crate::tr!("language", "czech"), Language::ItIt => crate::tr!("language", "italian"), Language::FiFi => crate::tr!("language", "finnish"), diff --git a/src/scene/text/web_font.rs b/src/scene/text/web_font.rs index 66455bd05..35cbdbcab 100644 --- a/src/scene/text/web_font.rs +++ b/src/scene/text/web_font.rs @@ -31,6 +31,7 @@ pub enum Script { Arabic, Hebrew, Thai, + Lao, Devanagari, Chinese, TraditionalChinese, @@ -49,6 +50,7 @@ impl Script { Script::Arabic => "fonts/arabic.ttf", Script::Hebrew => "fonts/hebrew.ttf", Script::Thai => "fonts/thai.ttf", + Script::Lao => "fonts/lao.ttf", Script::Devanagari => "fonts/devanagari.ttf", Script::Chinese => "fonts/chinese.ttf", Script::TraditionalChinese => "fonts/traditional_chinese.ttf", @@ -69,6 +71,7 @@ impl Script { | Script::Arabic | Script::Hebrew | Script::Thai + | Script::Lao | Script::Devanagari => "Noto Sans", } } @@ -85,6 +88,7 @@ impl Script { 8 => Script::Japanese, 9 => Script::Korean, 10 => Script::TraditionalChinese, + 11 => Script::Lao, _ => Script::Latin, } } @@ -103,6 +107,7 @@ impl Script { Script::Japanese => 8, Script::Korean => 9, Script::TraditionalChinese => 10, + Script::Lao => 11, } } } @@ -143,6 +148,7 @@ pub fn scripts_for_language_tag(language: &str) -> Vec