Merge branch 'languagefixes' into dev

# Conflicts:
#	src-tauri/Cargo.lock
#	src-tauri/Cargo.toml
#	src-tauri/src/core/tray/mod.rs
This commit is contained in:
huzibaca
2025-01-11 15:07:30 +08:00
15 changed files with 1626 additions and 55 deletions

10
src-tauri/Cargo.lock generated
View File

@@ -1041,6 +1041,7 @@ dependencies = [
"serde",
"serde_json",
"serde_yaml",
"sys-locale",
"sysinfo",
"sysproxy",
"tauri",
@@ -6364,6 +6365,15 @@ dependencies = [
"syn 2.0.90",
]
[[package]]
name = "sys-locale"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
dependencies = [
"libc",
]
[[package]]
name = "sysinfo"
version = "0.33.0"