The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.
Rust ffmpegfree-video-editormodel-context-protocolnon-linear-editoroffline-firstopen-source-video-editorself-hostedvideo-editingvideo-editing-automationvideo-editing-softwarevideo-editing-toolsvideo-editorvoice-cloningyoutube-automationyoutube-shorts
fix(net): downloads go through the system's proxy, say why they failed, and a model fetched in the browser can be chosen instead
Jareerc2847c16f9bf
diff --git a/src/Cargo.lock b/src/Cargo.lockindex a89ae64a..f61582fb 100644--- a/src/Cargo.lock+++ b/src/Cargo.lock@@ -7430,6 +7430,7 @@ dependencies = ["once_cell","rustls","rustls-pki-types",+ "socks","url","webpki-roots 0.26.11",]diff --git a/src/crates/concat-host/Cargo.toml b/src/crates/concat-host/Cargo.tomlindex b1d4ad3b..9048b4a8 100644--- a/src/crates/concat-host/Cargo.toml+++ b/src/crates/concat-host/Cargo.toml@@ -27,7 +27,10 @@ concat-vision = { workspace = true, features = ["infer"] }# An enhanced still is written as a PNG: lossless, since the point was# the detail.png = "0.17"-ureq = "2"+# `socks-proxy` for a SOCKS proxy named by the environment or the system+# (Clash, v2rayN and ssh -D all offer one); see route.rs. The `socks` crate+# it pulls is already in the tree for ureq 3.+ureq = { version = "2", features = ["socks-proxy"] }# The TLS ureq speaks, configured here to trust the system's roots beside# the shipped ones; see net.rs. The same rustls, ring and webpki-roots as# ureq's, so nothing is built twice.@@ -71,6 +74,8 @@ windows-sys = { version = "0.61", features = ["Win32_System_Registry",# jobs.rs: whether the process that left a mark is still running."Win32_System_Threading",+ # route.rs: the per-user proxy settings, and the proxy script they name.+ "Win32_Networking_WinHttp",] }[dev-dependencies]diff --git a/src/crates/concat-host/src/cutout.rs b/src/crates/concat-host/src/cutout.rsindex 1ca6409a..613f932c 100644--- a/src/crates/concat-host/src/cutout.rs+++ b/src/crates/concat-host/src/cutout.rs@@ -24,7 +24,7 @@//! on first use and stays loaded.use std::path::{Path, PathBuf};-use std::sync::atomic::{AtomicBool, Ordering};+use std::sync::atomic::AtomicBool;use std::sync::{Arc, Mutex, OnceLock};use concat_core::time::{FrameRate, Rational};@@ -407,51 +407,22 @@ pub(crate) fn fetch(total: spec.bytes,});- let mut last: String = String::new();- for url in crate::models::sources(spec.file, spec.upstream) {- match stream(&url, &partial, spec.bytes, cancel, progress) {- Ok(()) => {- if let Err(error) = crate::models::verify(&partial, spec.sha256) {- let _ = std::fs::remove_file(&partial);- // A mirror that serves the wrong bytes is not something- // upstream can fix, and trying it next would only hide- // which of the two is wrong.- return Err(error);- }- return std::fs::rename(&partial, file)- .map_err(|error| format!("could not finish {}: {error}", file.display()));- }- // The partial stays for the next source, or the next time:- // whichever answers takes up where this one stopped.- Err(error) => {- if cancel.load(Ordering::Relaxed) {- return Err(error);- }- last = error;- }- }- }- Err(format!("could not fetch the {} model: {last}", spec.file))-}--/// One attempt at one URL, through the shared downloader: into `partial`,-/// taking up from whatever of it is already there.-fn stream(- url: &str,- partial: &Path,- estimate: u64,- cancel: &AtomicBool,- progress: &mut dyn FnMut(Progress),-) -> Result<(), String> {- crate::models::download(- url,- partial,- estimate,+ // A mirror that serves the wrong bytes is refused there and not tried+ // past: upstream cannot fix it, and trying it next would only hide+ // which of the two is wrong. A partial left by a source that stopped+ // is where the next one, or the next time, takes up.+ crate::models::fetch(+ spec.file,+ spec.upstream,+ &partial,+ spec.bytes,+ spec.sha256,cancel,"cutout analysis cancelled",&mut |received, total| progress(Progress::Fetching { received, total }),- )- .map(|_| ())+ )?;+ std::fs::rename(&partial, file)+ .map_err(|error| format!("could not finish {}: {error}", file.display()))}/// Every instant the ranges need that the store lacks, ascending, once.diff --git a/src/crates/concat-host/src/lib.rs b/src/crates/concat-host/src/lib.rsindex b9de87ff..52b8dfcd 100644--- a/src/crates/concat-host/src/lib.rs+++ b/src/crates/concat-host/src/lib.rs@@ -41,6 +41,7 @@ pub mod projects;pub mod proxy;pub mod record;pub mod reverse;+mod route;pub mod session;pub mod sounds;pub mod stabilize;diff --git a/src/crates/concat-host/src/models.rs b/src/crates/concat-host/src/models.rsindex ca157adb..037701e7 100644--- a/src/crates/concat-host/src/models.rs+++ b/src/crates/concat-host/src/models.rs@@ -24,7 +24,11 @@//! than parsed from that file because a model's identity is something the//! engine should not be able to start without.-use std::path::Path;+use std::path::{Path, PathBuf};+use std::sync::Mutex;+use std::sync::atomic::{AtomicBool, Ordering};++use crate::net::Cause;/// The repository the mirror lives on.pub const REPO: &str = "jub0t/Concat";@@ -205,6 +209,255 @@ fn sources_for(ordered}+/// Why a model could not be had, for the window to say in the reader's+/// language and to offer what can be done instead.+#[derive(Clone, Debug, PartialEq, Eq)]+pub enum Failure {+ /// Every source was tried and none answered; `cause` is the one that+ /// best explains them all, and `proxy` the proxy they went through.+ Unreachable {+ /// Why, as [`crate::net::get`] classed it.+ cause: Cause,+ /// The proxy the requests went through, as a message names it.+ proxy: Option<String>,+ },+ /// The file the person chose is not the model: its digest is another.+ NotTheFile,+}++/// The last [`fetch`] of each file that failed, and how.+static FAILURES: Mutex<Vec<(String, Failure)>> = Mutex::new(Vec::new());++/// Files the person downloaded themselves, each standing in for the+/// download of the model file it is named for; see [`supply`].+static SUPPLIED: Mutex<Vec<(String, PathBuf)>> = Mutex::new(Vec::new());++/// How the last [`fetch`] of `file` failed, if it did and nothing since+/// has fetched it.+pub fn last_failure(file: &str) -> Option<Failure> {+ let held = FAILURES.lock().ok()?;+ held.iter()+ .find(|(name, _)| name == file)+ .map(|(_, failure)| failure.clone())+}++fn record_failure(file: &str, failure: Option<Failure>) {+ if let Ok(mut held) = FAILURES.lock() {+ held.retain(|(name, _)| name != file);+ if let Some(failure) = failure {+ held.push((file.to_owned(), failure));+ }+ }+}++/// Hands [`fetch`] a copy of `file` the person downloaded themselves - in+/// a browser the network lets through when it does not let Concat - for+/// the next fetch of that file to install instead of downloading.+///+/// It is held to the same digest as a download, so a wrong file is+/// refused rather than installed; and it is copied, not moved, so the+/// person's own copy stays where they put it.+pub fn supply(file: &str, path: PathBuf) {+ if let Ok(mut held) = SUPPLIED.lock() {+ held.retain(|(name, _)| name != file);+ held.push((file.to_owned(), path));+ }+}++fn take_supplied(file: &str) -> Option<PathBuf> {+ let mut held = SUPPLIED.lock().ok()?;+ let at = held.iter().position(|(name, _)| name == file)?;+ Some(held.remove(at).1)+}++/// Fetches the model file `file` into `partial` and checks it: from the+/// copy the person chose with [`supply`], when there is one, or else from+/// each of [`sources`] in turn, taking up from whatever of `partial` an+/// earlier attempt left. The bytes are checked against `sha256` whichever+/// way they came, and a file that hashes wrong is deleted and refused+/// rather than tried again elsewhere, which would only hide which source+/// served it.+///+/// When every source fails, the error names every host tried and the+/// likeliest reason in plain words - a firewall on this computer, no+/// network, a proxy that is not running - rather than whatever the last+/// host said, and [`last_failure`] has it for the window. Each source's+/// own error is in the log.+///+/// `progress` is called with (received, total); `cancelled` is the error+/// to return when `cancel` is set.+pub fn fetch(+ file: &str,+ upstream: &str,+ partial: &Path,+ estimate: u64,+ sha256: &str,+ cancel: &AtomicBool,+ cancelled: &str,+ progress: &mut dyn FnMut(u64, u64),+) -> Result<(u64, u64), String> {+ record_failure(file, None);+ if let Some(chosen) = take_supplied(file) {+ return adopt(&chosen, file, partial, sha256, cancel, cancelled, progress);+ }+ let mut missed: Vec<(String, Missed)> = Vec::new();+ for url in sources(file, upstream) {+ match attempt(&url, partial, estimate, cancel, cancelled, progress) {+ Ok(totals) => {+ verify(partial, sha256).inspect_err(|_| {+ let _ = std::fs::remove_file(partial);+ })?;+ return Ok(totals);+ }+ Err(miss) => {+ if cancel.load(Ordering::Relaxed) {+ return Err(cancelled.to_owned());+ }+ log::warn!("models: {}", miss.message);+ // Not the network's doing - a full disk, a folder that+ // cannot be written - and no other source would fix it.+ if miss.cause.is_none() {+ return Err(miss.message);+ }+ let host = url+ .split_once("://")+ .map_or(url.as_str(), |(_, rest)| rest)+ .split('/')+ .next()+ .unwrap_or_default()+ .to_owned();+ missed.push((host, miss));+ }+ }+ }+ let cause =+ Cause::telling(missed.iter().filter_map(|(_, miss)| miss.cause)).unwrap_or(Cause::Other);+ let proxy = missed.iter().find_map(|(_, miss)| miss.proxy.clone());+ record_failure(+ file,+ Some(Failure::Unreachable {+ cause,+ proxy: proxy.clone(),+ }),+ );+ let mut hosts: Vec<&str> = Vec::new();+ for (host, _) in &missed {+ if !hosts.contains(&host.as_str()) {+ hosts.push(host);+ }+ }+ let through = proxy+ .map(|proxy| format!(" through the proxy {proxy}"))+ .unwrap_or_default();+ let last = missed+ .last()+ .map_or("there was nowhere to download it from", |(_, miss)| {+ miss.message.as_str()+ });+ Err(format!(+ "could not download {file} from {}{through}: {}. The last one said: {last}",+ hosts.join(", "),+ cause.describe(),+ ))+}++/// Installs the person's own copy of `file` as if it had been downloaded:+/// copied into `partial` by way of a file of its own, hashed as it is+/// copied, and kept only if the hash is the table's. A download half done+/// in `partial` survives a wrong file.+fn adopt(+ chosen: &Path,+ file: &str,+ partial: &Path,+ sha256: &str,+ cancel: &AtomicBool,+ cancelled: &str,+ progress: &mut dyn FnMut(u64, u64),+) -> Result<(u64, u64), String> {+ use sha2::{Digest, Sha256};+ use std::io::{Read, Write};++ if sha256.is_empty() {+ return Err(format!(+ "{file} cannot be checked: the model table carries no digest for it"+ ));+ }+ let mut source = std::fs::File::open(chosen)+ .map_err(|error| format!("could not read {}: {error}", chosen.display()))?;+ let total = source.metadata().map(|meta| meta.len()).unwrap_or(0);+ let copy = partial.with_extension("chosen");+ let mut out = std::fs::File::create(©)+ .map_err(|error| format!("could not write {}: {error}", copy.display()))?;+ let mut hasher = Sha256::new();+ let mut buffer = vec![0u8; 1024 * 1024];+ let mut copied = 0u64;+ let mut reported = 0u64;+ progress(0, total);+ let result = loop {+ if cancel.load(Ordering::Relaxed) {+ break Err(cancelled.to_owned());+ }+ let read = match source.read(&mut buffer) {+ Ok(0) => break Ok(()),+ Ok(read) => read,+ Err(error) => break Err(format!("could not read {}: {error}", chosen.display())),+ };+ hasher.update(&buffer[..read]);+ if let Err(error) = out.write_all(&buffer[..read]) {+ break Err(format!("could not write {}: {error}", copy.display()));+ }+ copied += read as u64;+ if copied - reported >= 8 * 1024 * 1024 {+ reported = copied;+ progress(copied, total.max(copied));+ }+ }+ .and_then(|()| {+ out.flush()+ .map_err(|error| format!("could not write {}: {error}", copy.display()))+ });+ drop(out);+ if let Err(error) = result {+ let _ = std::fs::remove_file(©);+ return Err(error);+ }+ let actual = hex(&hasher.finalize());+ if actual != sha256 {+ let _ = std::fs::remove_file(©);+ record_failure(file, Some(Failure::NotTheFile));+ return Err(format!(+ "{} is not {file}: its sha256 is {actual}, where {file}'s is {sha256}",+ chosen.display()+ ));+ }+ std::fs::rename(©, partial)+ .map_err(|error| format!("could not write {}: {error}", partial.display()))?;+ progress(copied, copied);+ Ok((copied, copied))+}++/// One source that did not answer, or stopped answering.+struct Missed {+ message: String,+ /// The network's reason; `None` for a cancel or a local failure.+ cause: Option<Cause>,+ proxy: Option<String>,+}++/// One attempt at one URL, streamed into `partial`, taking up from+/// however much of `partial` is already there. [`attempt`] with its+/// reasons spelled out as text, for a caller that tries its own sources.+pub fn download(+ url: &str,+ partial: &Path,+ estimate: u64,+ cancel: &AtomicBool,+ cancelled: &str,+ progress: &mut dyn FnMut(u64, u64),+) -> Result<(u64, u64), String> {+ attempt(url, partial, estimate, cancel, cancelled, progress).map_err(|miss| miss.message)+}+/// One attempt at one URL, streamed into `partial`, taking up from/// however much of `partial` is already there.///@@ -221,17 +474,21 @@ fn sources_for(/// `progress` is called with (received, total) every couple of megabytes./// `cancelled` is the error to return when `cancel` is set: the caller's/// words, since it knows what was being fetched.-pub fn download(+fn attempt(url: &str,partial: &Path,estimate: u64,- cancel: &std::sync::atomic::AtomicBool,+ cancel: &AtomicBool,cancelled: &str,progress: &mut dyn FnMut(u64, u64),-) -> Result<(u64, u64), String> {+) -> Result<(u64, u64), Missed> {use std::io::{Read, Write};- use std::sync::atomic::Ordering;+ let local = |message: String| Missed {+ message,+ cause: None,+ proxy: None,+ };let already = std::fs::metadata(partial).map(|meta| meta.len()).unwrap_or(0);@@ -239,20 +496,32 @@ pub fn download(// A read timeout: a stalled connection blocks in `read` with the// cancel flag unreachable, and thirty seconds without a byte means// the download is dead.- let agent = crate::net::agent(+ let response = match crate::net::get(+ url,std::time::Duration::from_secs(20),std::time::Duration::from_secs(30),- );- let mut request = agent.get(url);- if already > 0 {- request = request.set("Range", &format!("bytes={already}-"));- }- let response = match request.call() {+ crate::net::Trust::System,+ &|request| {+ if already > 0 {+ request.set("Range", &format!("bytes={already}-"))+ } else {+ request+ }+ },+ ) {Ok(response) => response,// Range not satisfiable: everything is already here. Let the// caller's digest check say whether it is the file.- Err(ureq::Error::Status(416, _)) if already > 0 => return Ok((already, already)),- Err(error) => return Err(format!("{url} did not answer: {error}")),+ Err(failure) if already > 0 && matches!(failure.error, ureq::Error::Status(416, _)) => {+ return Ok((already, already));+ }+ Err(failure) => {+ return Err(Missed {+ message: format!("{url} did not answer: {failure}"),+ cause: Some(failure.cause),+ proxy: failure.proxy,+ });+ }};let resumed = response.status() == 206;@@ -272,7 +541,7 @@ pub fn download(} else {std::fs::File::create(partial)}- .map_err(|error| format!("could not write {}: {error}", partial.display()))?;+ .map_err(|error| local(format!("could not write {}: {error}", partial.display())))?;let mut reader = response.into_reader();let mut buffer = [0u8; 64 * 1024];@@ -281,16 +550,18 @@ pub fn download(loop {if cancel.load(Ordering::Relaxed) {// The partial stays: it is where the next attempt picks up.- return Err(cancelled.to_owned());+ return Err(local(cancelled.to_owned()));}- let read = reader- .read(&mut buffer)- .map_err(|error| format!("download interrupted: {error}"))?;+ let read = reader.read(&mut buffer).map_err(|error| Missed {+ message: format!("{url} stopped partway: {error}"),+ cause: Some(crate::net::classify_io(&error)),+ proxy: None,+ })?;if read == 0 {break;}file.write_all(&buffer[..read])- .map_err(|error| format!("could not write {}: {error}", partial.display()))?;+ .map_err(|error| local(format!("could not write {}: {error}", partial.display())))?;received += read as u64;// Every 2 MB, not every chunk: a progress bar cannot use more.if received - reported >= 2 * 1024 * 1024 {@@ -299,9 +570,13 @@ pub fn download(}}file.flush()- .map_err(|error| format!("could not write {}: {error}", partial.display()))?;+ .map_err(|error| local(format!("could not write {}: {error}", partial.display())))?;if received == 0 {- return Err(format!("{url} came back empty"));+ return Err(Missed {+ message: format!("{url} came back empty"),+ cause: Some(Cause::Other),+ proxy: None,+ });}Ok((received, received.max(total)))}@@ -350,14 +625,18 @@ fn sha256(file: &Path) -> Result<String, String> {}hasher.update(&buffer[..read]);}- Ok(hasher- .finalize()+ Ok(hex(&hasher.finalize()))+}++/// Bytes as lowercase hex.+fn hex(bytes: &[u8]) -> String {+ bytes.iter()- .fold(String::with_capacity(64), |mut out, byte| {+ .fold(String::with_capacity(bytes.len() * 2), |mut out, byte| {use std::fmt::Write;let _ = write!(out, "{byte:02x}");out- }))+ })}#[cfg(test)]@@ -491,6 +770,73 @@ mod tests {let _ = std::fs::remove_file(&partial);}+ #[test]+ fn a_file_the_person_chose_is_installed_only_if_it_is_the_model() {+ use sha2::{Digest, Sha256};++ let dir = std::env::temp_dir().join(format!("concat-models-chosen-{}", std::process::id()));+ std::fs::create_dir_all(&dir).expect("a temp dir");+ let chosen = dir.join("ggml-test.bin");+ let body = vec![7u8; 3 * 1024 * 1024 + 11];+ std::fs::write(&chosen, &body).expect("the chosen file");+ let digest = hex(&Sha256::digest(&body));+ let partial = dir.join("ggml-test.bin.part");+ // Half a download from before: a wrong file must not cost it.+ std::fs::write(&partial, b"half").expect("a partial");+ let cancel = AtomicBool::new(false);+ // The name is one no table has, and nothing is downloaded: the+ // chosen file stands in for every source.+ let file = "concat-test-chosen.bin";++ supply(file, chosen.clone());+ let wrong = "0".repeat(64);+ let refused = fetch(+ file,+ "",+ &partial,+ 0,+ &wrong,+ &cancel,+ "stopped",+ &mut |_, _| {},+ )+ .expect_err("not the model");+ assert!(refused.contains("is not"), "{refused}");+ assert_eq!(last_failure(file), Some(Failure::NotTheFile));+ assert_eq!(std::fs::read(&partial).expect("the partial"), b"half");+ assert!(+ std::fs::exists(&chosen).unwrap_or(false),+ "the person's copy stays"+ );++ supply(file, chosen.clone());+ let mut last = (0, 0);+ let totals = fetch(+ file,+ "",+ &partial,+ 0,+ &digest,+ &cancel,+ "stopped",+ &mut |got, of| last = (got, of),+ )+ .expect("the model");+ assert_eq!(totals, (body.len() as u64, body.len() as u64));+ assert_eq!(last, totals, "progress ends full");+ assert_eq!(std::fs::read(&partial).expect("installed"), body);+ assert_eq!(+ last_failure(file),+ None,+ "a fetch that worked clears the failure"+ );+ assert!(+ std::fs::exists(&chosen).unwrap_or(false),+ "copied, not moved"+ );+ let _ = std::fs::remove_dir_all(&dir);+ }+#[test]fn a_digest_is_checked_and_an_empty_one_is_refused() {let dir = std::env::temp_dir().join("concat-models-verify");diff --git a/src/crates/concat-host/src/net.rs b/src/crates/concat-host/src/net.rsindex fbedc770..cfeed250 100644--- a/src/crates/concat-host/src/net.rs+++ b/src/crates/concat-host/src/net.rs@@ -1,9 +1,10 @@// SPDX-License-Identifier: AGPL-3.0-or-later// SPDX-FileCopyrightText: 2026 Jareer Abdullah and Concat contributors-//! The one way the host reaches the network: models, sounds and update-//! checks all go through [`agent`], and the manifests that vouch for a-//! download through [`strict_agent`].+//! The one way the host reaches the network: models, sounds, update checks+//! and the manifests that vouch for a download all go through [`get`],+//! which also says why a request failed in terms a person can act on+//! ([`Cause`]).//!//! An HTTPS connection is trusted when its certificate chains to a root//! Concat ships (Mozilla's list, as webpki-roots carries it) or to a root@@ -19,34 +20,258 @@use std::sync::{Arc, OnceLock};use std::time::Duration;-/// An agent with these timeouts that trusts the shipped roots and the-/// system's: for a file whose digest Concat already knows - a model, whose-/// sums are compiled in, or an installer or sound checked against a-/// manifest fetched with [`strict_agent`].-pub fn agent(connect: Duration, read: Duration) -> ureq::Agent {- ureq::AgentBuilder::new()- .timeout_connect(connect)- .timeout_read(read)- .tls_config(Arc::clone(tls()))- .build()+use crate::route::Route;++/// Which roots a connection trusts.+#[derive(Clone, Copy, Debug, PartialEq, Eq)]+pub enum Trust {+ /// The shipped roots and the system's: for a file whose digest Concat+ /// already knows - a model, whose sums are compiled in, or an+ /// installer or sound checked against a manifest fetched with+ /// [`Trust::Shipped`].+ System,+ /// The shipped roots alone, for the manifests that say what a download+ /// must hash to: the update manifest and the sound list. A root the+ /// system was given by a proxy or an antivirus is enough to re-sign+ /// github.com, and a manifest fetched through it could name a swapped+ /// installer's digest beside the swapped installer. Behind such a+ /// network the update check and the sound list fail, as every download+ /// did before #517; the files they vouch for still come over+ /// [`Trust::System`].+ Shipped,+}++/// Why a request got no answer, in the terms a person can act on. What+/// the operating system said is kept beside it in [`Failure`]; this is the+/// class it falls in, which is the same on every platform.+#[derive(Clone, Copy, Debug, PartialEq, Eq)]+pub enum Cause {+ /// Something on this computer refused Concat a connection before it+ /// left the machine: a firewall, an antivirus's web shield, parental+ /// controls, a VPN's kill switch. Windows says WSAEACCES (10013), Unix+ /// EACCES or EPERM. The browser beside it is usually allowed.+ Blocked,+ /// No route to anywhere: no network, or the adapter is down.+ Offline,+ /// The name could not be looked up.+ Dns,+ /// The proxy the settings name could not be reached or would not+ /// carry the request: not running, a sign-in Concat cannot give, a+ /// policy that turns the host away.+ Proxy,+ /// The certificate was not one Concat trusts: something re-signs+ /// secure connections on the way.+ Certificate,+ /// The connection was cut, as a network that filters traffic cuts it.+ Reset,+ /// The server, or something in front of it, turned the connection away.+ Refused,+ /// Nothing came back in time.+ Timeout,+ /// The server answered, with an error status.+ Status(u16),+ /// Anything else, which the message says in full.+ Other,+}++impl Cause {+ /// The cause as a sentence of English, for the log and for the+ /// messages the engine hands back; the window says it in the reader's+ /// language from the cause itself.+ pub fn describe(self) -> String {+ match self {+ Cause::Blocked => "something on this computer blocked Concat from the network - \+ a firewall, an antivirus or a VPN; the browser may be allowed \+ where Concat is not"+ .to_owned(),+ Cause::Offline => "this computer is not connected to the internet".to_owned(),+ Cause::Dns => "the server's name could not be looked up".to_owned(),+ Cause::Proxy => "the proxy could not be used".to_owned(),+ Cause::Certificate => {+ "the connection's certificate is not trusted: something on the network \+ re-signs secure connections"+ .to_owned()+ }+ Cause::Reset => "the connection was cut off".to_owned(),+ Cause::Refused => "the connection was refused".to_owned(),+ Cause::Timeout => "the server took too long to answer".to_owned(),+ Cause::Status(code) => format!("the server answered HTTP {code}"),+ Cause::Other => "the request failed".to_owned(),+ }+ }++ /// How much a cause says about why everything failed, when sources+ /// failed in different ways: a block on this machine explains every+ /// other failure, and one server's 404 explains none.+ fn weight(self) -> u8 {+ match self {+ Cause::Blocked => 9,+ Cause::Proxy => 8,+ Cause::Certificate => 7,+ Cause::Offline => 6,+ Cause::Dns => 5,+ Cause::Reset => 4,+ Cause::Refused => 3,+ Cause::Timeout => 2,+ Cause::Status(_) => 1,+ Cause::Other => 0,+ }+ }++ /// Of several causes, the one that best explains them all.+ pub fn telling(causes: impl IntoIterator<Item = Cause>) -> Option<Cause> {+ causes.into_iter().max_by_key(|cause| cause.weight())+ }+}++/// A request that got no answer: ureq's error, the class it falls in, and+/// the proxy it went through, if one.+#[derive(Debug)]+pub struct Failure {+ /// What ureq said; a status is the server's response, whole.+ pub error: ureq::Error,+ /// What it means.+ pub cause: Cause,+ /// The proxy the request went through, as a message names it.+ pub proxy: Option<String>,+}++impl std::fmt::Display for Failure {+ fn fmt(&self, out: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {+ write!(out, "{}", self.error)?;+ if let Some(proxy) = &self.proxy {+ write!(out, " (through the proxy {proxy})")?;+ }+ Ok(())+ }}-/// An agent that trusts the shipped roots alone, for the manifests that-/// say what a download must hash to: the update manifest and the sound-/// list. A root the system was given by a proxy or an antivirus is enough-/// to re-sign github.com, and a manifest fetched through it could name a-/// swapped installer's digest beside the swapped installer. Behind such a-/// network the update check and the sound list fail, as every download did-/// before #517; the files they vouch for still come over [`agent`].-pub fn strict_agent(connect: Duration, read: Duration) -> ureq::Agent {- ureq::AgentBuilder::new()+/// A GET of `url`, made ready by `prepare` (headers, a range), and sent:+/// through the proxy the environment or the system names for it, and+/// directly when the proxy cannot carry it - a setting left behind by a+/// proxy that is no longer running should not cost a download that would+/// have worked without it. See [`crate::route`].+///+/// A status is an answer and is not retried; when both ways fail, the+/// failure kept is the one that says more about why.+pub fn get(+ url: &str,+ connect: Duration,+ read: Duration,+ trust: Trust,+ prepare: &dyn Fn(ureq::Request) -> ureq::Request,+) -> Result<ureq::Response, Box<Failure>> {+ let send = |route: Option<&Route>| {+ prepare(agent(route, connect, read, trust).get(url))+ .call()+ .map_err(|error| {+ let cause = classify(&error, route.is_some());+ Box::new(Failure {+ error,+ cause,+ proxy: route.map(|route| route.shown.clone()),+ })+ })+ };+ let Some(route) = crate::route::for_url(url) else {+ return send(None);+ };+ log::debug!("network: {url} through the proxy {}", route.shown);+ let proxied = match send(Some(&route)) {+ Ok(response) => return Ok(response),+ Err(failure) if matches!(failure.error, ureq::Error::Status(..)) => return Err(failure),+ Err(failure) => failure,+ };+ log::info!("network: {url} failed through the proxy, trying directly: {proxied}");+ match send(None) {+ Ok(response) => Ok(response),+ Err(direct) if direct.cause.weight() > proxied.cause.weight() => Err(direct),+ Err(_) => Err(proxied),+ }+}++/// An agent with these timeouts, through `route` when there is one.+fn agent(route: Option<&Route>, connect: Duration, read: Duration, trust: Trust) -> ureq::Agent {+ let tls = match trust {+ Trust::System => tls(),+ Trust::Shipped => shipped_tls(),+ };+ let mut builder = ureq::AgentBuilder::new().timeout_connect(connect).timeout_read(read)- .tls_config(Arc::clone(shipped_tls()))- .build()+ .tls_config(Arc::clone(tls));+ if let Some(route) = route {+ builder = builder.proxy(route.proxy.clone());+ }+ builder.build()+}++/// The class `error` falls in. `proxied` because a connection refused or a+/// name not found is the proxy's when there is one: it is the only host+/// the machine connects to.+pub fn classify(error: &ureq::Error, proxied: bool) -> Cause {+ use ureq::ErrorKind;++ let kind = match error {+ ureq::Error::Status(code, _) => return Cause::Status(*code),+ ureq::Error::Transport(transport) => transport.kind(),+ };+ match kind {+ ErrorKind::ProxyConnect | ErrorKind::ProxyUnauthorized | ErrorKind::InvalidProxyUrl => {+ return Cause::Proxy;+ }+ ErrorKind::Dns => return if proxied { Cause::Proxy } else { Cause::Dns },+ _ => {}+ }+ // What the operating system said, wherever ureq wrapped it.+ let mut source = std::error::Error::source(error);+ while let Some(inner) = source {+ if let Some(io) = inner.downcast_ref::<std::io::Error>() {+ return match classify_io(io) {+ Cause::Refused if proxied => Cause::Proxy,+ cause => cause,+ };+ }+ source = inner.source();+ }+ Cause::Other}-/// The TLS configuration [`strict_agent`] shares: the shipped roots only.+/// The class an I/O error falls in: from a connection, or from a body+/// being read.+pub fn classify_io(error: &std::io::Error) -> Cause {+ use std::io::ErrorKind;++ // TLS speaks through I/O errors with rustls's own inside.+ if let Some(tls) = error+ .get_ref()+ .and_then(|inner| inner.downcast_ref::<rustls::Error>())+ {+ return match tls {+ rustls::Error::InvalidCertificate(_) | rustls::Error::NoCertificatesPresented => {+ Cause::Certificate+ }+ _ => Cause::Reset,+ };+ }+ match error.kind() {+ // WSAEACCES (10013) on Windows; EACCES and EPERM elsewhere.+ ErrorKind::PermissionDenied => Cause::Blocked,+ ErrorKind::NetworkUnreachable | ErrorKind::HostUnreachable | ErrorKind::NetworkDown => {+ Cause::Offline+ }+ ErrorKind::ConnectionRefused => Cause::Refused,+ ErrorKind::ConnectionReset | ErrorKind::ConnectionAborted | ErrorKind::UnexpectedEof => {+ Cause::Reset+ }+ ErrorKind::TimedOut | ErrorKind::WouldBlock => Cause::Timeout,+ // A name ureq could not resolve for a SOCKS proxy.+ ErrorKind::NotFound => Cause::Dns,+ _ => Cause::Other,+ }+}++/// The TLS configuration [`Trust::Shipped`] shares: the shipped roots only.fn shipped_tls() -> &'static Arc<rustls::ClientConfig> {static CONFIG: OnceLock<Arc<rustls::ClientConfig>> = OnceLock::new();CONFIG.get_or_init(|| {@@ -103,6 +328,88 @@ fn roots() -> rustls::RootCertStore {mod tests {use super::*;+ /// An I/O error as ureq hands it back from a connection.+ fn transport(error: std::io::Error) -> ureq::Error {+ ureq::Error::from(error)+ }++ #[test]+ fn a_failure_is_classed_by_what_the_system_said() {+ use std::io::{Error, ErrorKind};++ // The report: WSAEACCES (10013) on Windows, which is EACCES (13)+ // or EPERM (1) on a Mac or Linux - a firewall or an antivirus.+ #[cfg(windows)]+ let refused_by_this_machine = Error::from_raw_os_error(10013);+ #[cfg(not(windows))]+ let refused_by_this_machine = Error::from_raw_os_error(13);+ assert_eq!(+ classify(&transport(refused_by_this_machine), false),+ Cause::Blocked+ );+ #[cfg(unix)]+ assert_eq!(+ classify(&transport(Error::from_raw_os_error(1)), false),+ Cause::Blocked+ );++ let class = |kind| classify(&transport(Error::from(kind)), false);+ assert_eq!(class(ErrorKind::NetworkUnreachable), Cause::Offline);+ assert_eq!(class(ErrorKind::TimedOut), Cause::Timeout);+ assert_eq!(class(ErrorKind::ConnectionReset), Cause::Reset);+ assert_eq!(class(ErrorKind::ConnectionRefused), Cause::Refused);+ // Refused through a proxy is the proxy: it is the only host the+ // machine connected to, and one left set after it stopped is the+ // usual reason.+ let refused = transport(Error::from(ErrorKind::ConnectionRefused));+ assert_eq!(classify(&refused, true), Cause::Proxy);+ assert_eq!(class(ErrorKind::Other), Cause::Other);++ // A certificate nobody here trusts, as rustls says it through ureq.+ let untrusted = Error::new(+ ErrorKind::InvalidData,+ rustls::Error::InvalidCertificate(rustls::CertificateError::UnknownIssuer),+ );+ assert_eq!(classify(&transport(untrusted), false), Cause::Certificate);++ let missing = ureq::Error::Status(+ 404,+ ureq::Response::new(404, "Not Found", "").expect("a response"),+ );+ assert_eq!(classify(&missing, false), Cause::Status(404));+ }++ #[test]+ fn a_real_refused_connection_is_classed_as_refused() {+ // A port that was just free: nothing listens on it.+ let port = std::net::TcpListener::bind("127.0.0.1:0")+ .and_then(|listener| listener.local_addr())+ .expect("a port")+ .port();+ let failure = get(+ &format!("http://127.0.0.1:{port}/model.bin"),+ Duration::from_secs(2),+ Duration::from_secs(2),+ Trust::System,+ &|request| request,+ )+ .expect_err("nothing answers");+ assert_eq!(failure.cause, Cause::Refused);+ assert_eq!(failure.proxy, None, "loopback never goes through a proxy");+ }++ #[test]+ fn the_cause_that_explains_most_is_the_one_told() {+ let told = Cause::telling([Cause::Status(404), Cause::Blocked, Cause::Timeout]);+ assert_eq!(told, Some(Cause::Blocked));+ assert_eq!(+ Cause::telling([Cause::Status(404), Cause::Timeout]),+ Some(Cause::Timeout)+ );+ assert_eq!(Cause::telling([]), None);+ assert!(Cause::Blocked.describe().contains("firewall"));+ }+/// The shipped roots are always there, whatever the system's store/// gave: a machine whose store is empty or unreadable is no worse off/// than before.diff --git a/src/crates/concat-host/src/route.rs b/src/crates/concat-host/src/route.rsnew file mode 100644index 00000000..1bb5282e--- /dev/null+++ b/src/crates/concat-host/src/route.rs@@ -0,0 +1,679 @@+// SPDX-License-Identifier: AGPL-3.0-or-later+// SPDX-FileCopyrightText: 2026 Jareer Abdullah and Concat contributors++//! Which network proxy a request goes through, if any: the one the+//! environment names, or else the one the system's network settings name -+//! the proxy a browser on the same machine is already using. (The smaller+//! copies of media that playback reads are `proxy.rs`, and unrelated.)+//!+//! Concat went straight to the network whatever the machine was set up to+//! do, so a person whose traffic goes through a proxy - a company's+//! gateway, or a tool like Clash or v2rayN set as the system proxy, which is+//! how much of mainland China reaches GitHub and Hugging Face at all - saw+//! every download fail or crawl while the browser beside it worked (#517).+//!+//! The order is curl's and Chrome's together. A proxy named in the+//! environment (`HTTPS_PROXY`, `ALL_PROXY`, with `NO_PROXY`) wins, since+//! someone set it on purpose. Without one, the system's settings: on+//! Windows the per-user settings every browser reads (Settings > Network >+//! Proxy, or Internet Options), a proxy script (PAC) included, which+//! WinHTTP runs for us; on macOS the active network service's proxies, as+//! `scutil --proxy` prints them. Automatic discovery (WPAD) is left alone:+//! it is on by default on Windows, nearly never answers, and costs seconds+//! a request when it does not. A Mac's proxy script is not run either; a+//! machine set up that way is told so in the log. Linux and the phones go+//! by the environment alone.+//!+//! Loopback addresses never go through a proxy, whatever the settings say.++/// A proxy for one request: what ureq connects through, and how to name it+/// in a message without the password it may carry.+#[derive(Clone, Debug)]+pub(crate) struct Route {+ pub(crate) proxy: ureq::Proxy,+ /// "127.0.0.1:7890", or "socks5 127.0.0.1:1080".+ pub(crate) shown: String,+}++/// The proxy a request for `url` should go through: `None` to go directly.+pub(crate) fn for_url(url: &str) -> Option<Route> {+ let (scheme, host) = target(url)?;+ if is_loopback(&host) {+ return None;+ }+ let chosen = match from_env(&scheme, &host, &|name| std::env::var(name).ok()) {+ Some(said) => said,+ None => system(url, &scheme, &host),+ }?;+ match ureq::Proxy::new(&chosen) {+ Ok(proxy) => Some(Route {+ proxy,+ shown: shown(&chosen),+ }),+ Err(error) => {+ log::warn!("network: ignoring the proxy {}: {error}", shown(&chosen));+ None+ }+ }+}++/// The scheme and host of `url`, lowercased, without a port, a user or+/// IPv6's brackets.+fn target(url: &str) -> Option<(String, String)> {+ let (scheme, rest) = url.split_once("://")?;+ let authority = rest.split(['/', '?', '#']).next()?;+ let authority = authority+ .rsplit_once('@')+ .map_or(authority, |(_, host)| host);+ let host = if let Some(bracketed) = authority.strip_prefix('[') {+ bracketed.split(']').next()?+ } else {+ authority.split(':').next()?+ };+ (!host.is_empty()).then(|| (scheme.to_ascii_lowercase(), host.to_ascii_lowercase()))+}++fn is_loopback(host: &str) -> bool {+ host == "localhost"+ || host.ends_with(".localhost")+ || host+ .parse::<std::net::IpAddr>()+ .is_ok_and(|address| address.is_loopback())+}++/// What the environment says for `host`: `None` when it names no proxy at+/// all, so the system's settings are asked; `Some(None)` when it names one+/// and `NO_PROXY` exempts this host.+///+/// Lowercase `http_proxy` only, as curl reads it: an uppercase+/// `HTTP_PROXY` can be set by a web server's request header (httpoxy).+fn from_env(+ scheme: &str,+ host: &str,+ var: &dyn Fn(&str) -> Option<String>,+) -> Option<Option<String>> {+ let names: &[&str] = if scheme == "https" {+ &["HTTPS_PROXY", "https_proxy", "ALL_PROXY", "all_proxy"]+ } else {+ &["http_proxy", "ALL_PROXY", "all_proxy"]+ };+ let named = names+ .iter()+ .filter_map(|name| var(name))+ .find(|value| !value.trim().is_empty())?;+ let exempt = ["NO_PROXY", "no_proxy"]+ .iter()+ .filter_map(|name| var(name))+ .any(|list| no_proxy_matches(&list, host));+ if exempt {+ return Some(None);+ }+ Some(normalise(&named, "http"))+}++/// Whether `NO_PROXY` exempts `host`: a comma-separated list where `*` is+/// everything, `example.com` and `.example.com` are that domain and every+/// name under it, and an address or a CIDR block is itself.+fn no_proxy_matches(list: &str, host: &str) -> bool {+ list.split([',', ' ', ';'])+ .map(str::trim)+ .filter(|entry| !entry.is_empty())+ .any(|entry| {+ let entry = entry.to_ascii_lowercase();+ if entry == "*" {+ return true;+ }+ if entry.contains('/') {+ return in_block(&entry, host);+ }+ // A port on an entry narrows it to that port; every request+ // here is to the scheme's own, so the host is what matters.+ let entry = entry.split(':').next().unwrap_or_default();+ let domain = entry.trim_start_matches("*.").trim_start_matches('.');+ host == domain || host.ends_with(&format!(".{domain}"))+ })+}++/// `entry` ("host:port", "socks5://host:port", "user:pass@host") as a URL+/// ureq takes, with `default` as its scheme when it names none. A proxy+/// written `https://` is taken as a plain HTTP one, which is nearly always+/// what was meant and the only kind ureq speaks; `socks5h` is SOCKS5, which+/// ureq already asks to resolve the name.+fn normalise(entry: &str, default: &str) -> Option<String> {+ let entry = entry.trim().trim_end_matches('/');+ if entry.is_empty() {+ return None;+ }+ let (scheme, rest) = match entry.split_once("://") {+ Some((scheme, rest)) => (scheme.to_ascii_lowercase(), rest),+ None => (default.to_owned(), entry),+ };+ let scheme = match scheme.as_str() {+ "http" | "https" => "http",+ "socks" | "socks5" | "socks5h" => "socks5",+ "socks4" => "socks4",+ "socks4a" => "socks4a",+ _ => return None,+ };+ (!rest.is_empty()).then(|| format!("{scheme}://{rest}"))+}++/// A proxy URL as a message names it: no password, and the scheme only+/// when it is not plain HTTP.+fn shown(proxy: &str) -> String {+ let (scheme, rest) = proxy.split_once("://").unwrap_or(("http", proxy));+ let place = rest.rsplit_once('@').map_or(rest, |(_, place)| place);+ if scheme == "http" {+ place.to_owned()+ } else {+ format!("{scheme} {place}")+ }+}++/// The proxy a Windows proxy list names for `scheme`.+///+/// The list is what Internet Options writes and WinHTTP hands back: either+/// one "host:port" for everything, or per-protocol entries,+/// "http=host:port;https=host:port;socks=host:port", where a scheme with no+/// entry of its own goes through the SOCKS one, as Chrome reads it. A+/// script's answer is the same shape: a list to try in order, of which the+/// first is taken.+#[cfg_attr(not(any(test, windows)), allow(dead_code))]+fn windows_pick(list: &str, scheme: &str) -> Option<String> {+ let entries: Vec<&str> = list+ .split([';', ' '])+ .map(str::trim)+ .filter(|entry| !entry.is_empty())+ .collect();+ if let Some(all) = entries.iter().find(|entry| !entry.contains('=')) {+ return normalise(all, "http");+ }+ let named = |name: &str| {+ entries.iter().find_map(|entry| {+ let (key, value) = entry.split_once('=')?;+ key.trim()+ .eq_ignore_ascii_case(name)+ .then_some(value.trim())+ })+ };+ // SOCKS as IE spoke it is version 4; 4a hands the server the name, so+ // a poisoned local DNS is not what decides where a request goes.+ named(scheme)+ .and_then(|value| normalise(value, "http"))+ .or_else(|| named("socks").and_then(|value| normalise(value, "socks4a")))+}++/// Whether a bypass list exempts `host`: Windows' ProxyOverride+/// ("*.corp.example;10.*;<local>") or a Mac's exceptions ("*.local",+/// "169.254/16"). `<local>`, like a Mac's "exclude simple hostnames", is+/// any name without a dot.+fn bypassed<'a>(patterns: impl IntoIterator<Item = &'a str>, host: &str) -> bool {+ patterns+ .into_iter()+ .map(str::trim)+ .filter(|pattern| !pattern.is_empty())+ .any(|pattern| {+ let pattern = pattern.to_ascii_lowercase();+ if pattern == "<local>" {+ return !host.contains('.') && !host.contains(':');+ }+ if pattern.contains('/') {+ return in_block(&pattern, host);+ }+ glob(&pattern, host)+ })+}++/// `text` against a pattern where `*` is any run of characters.+fn glob(pattern: &str, text: &str) -> bool {+ let mut parts = pattern.split('*');+ let first = parts.next().unwrap_or_default();+ let Some(mut rest) = text.strip_prefix(first) else {+ return false;+ };+ let tail: Vec<&str> = parts.collect();+ let Some((last, middle)) = tail.split_last() else {+ return rest.is_empty();+ };+ for part in middle {+ match rest.find(part) {+ Some(at) => rest = &rest[at + part.len()..],+ None => return false,+ }+ }+ rest.ends_with(last)+}++/// Whether `host` is an IPv4 address inside `block`: "10.0.0.0/8", or the+/// shortened "169.254/16" a Mac writes.+fn in_block(block: &str, host: &str) -> bool {+ let Ok(address) = host.parse::<std::net::Ipv4Addr>() else {+ return false;+ };+ let Some((base, bits)) = block.split_once('/') else {+ return false;+ };+ let Ok(bits) = bits.trim().parse::<u32>() else {+ return false;+ };+ let mut octets = [0u8; 4];+ for (slot, part) in octets.iter_mut().zip(base.split('.')) {+ match part.parse() {+ Ok(value) => *slot = value,+ Err(_) => return false,+ }+ }+ if bits > 32 {+ return false;+ }+ let mask = if bits == 0 {+ 0+ } else {+ u32::MAX << (32 - bits)+ };+ u32::from(address) & mask == u32::from_be_bytes(octets) & mask+}++/// What the system's settings say: the outer `None` for no proxy.+#[cfg(windows)]+fn system(url: &str, scheme: &str, host: &str) -> Option<String> {+ windows::system(url, scheme, host)+}++#[cfg(target_os = "macos")]+fn system(_url: &str, scheme: &str, host: &str) -> Option<String> {+ let output = std::process::Command::new("/usr/sbin/scutil")+ .arg("--proxy")+ .stdin(std::process::Stdio::null())+ .stderr(std::process::Stdio::null())+ .output()+ .ok()?;+ let settings = Scutil::parse(&String::from_utf8_lossy(&output.stdout));+ if settings.on("ProxyAutoConfigEnable") {+ log::debug!(+ "network: this Mac is set to a proxy script ({}), which Concat does not run",+ settings+ .value("ProxyAutoConfigURLString")+ .unwrap_or_default()+ );+ }+ settings.pick(scheme, host)+}++#[cfg(not(any(windows, target_os = "macos")))]+fn system(_url: &str, _scheme: &str, _host: &str) -> Option<String> {+ None+}++/// `scutil --proxy`'s dictionary: its plain keys, and the exceptions list.+#[cfg_attr(not(any(test, target_os = "macos")), allow(dead_code))]+#[derive(Default, Debug)]+struct Scutil {+ values: Vec<(String, String)>,+ exceptions: Vec<String>,+}++#[cfg_attr(not(any(test, target_os = "macos")), allow(dead_code))]+impl Scutil {+ /// Reads the dictionary `scutil --proxy` prints:+ ///+ /// ```text+ /// <dictionary> {+ /// ExceptionsList : <array> {+ /// 0 : *.local+ /// }+ /// HTTPSEnable : 1+ /// HTTPSPort : 7890+ /// HTTPSProxy : 127.0.0.1+ /// }+ /// ```+ fn parse(text: &str) -> Self {+ let mut out = Scutil::default();+ let mut in_exceptions = false;+ for line in text.lines().map(str::trim) {+ if in_exceptions {+ if line.starts_with('}') {+ in_exceptions = false;+ } else if let Some((_, value)) = line.split_once(" : ") {+ out.exceptions.push(value.trim().to_owned());+ }+ continue;+ }+ let Some((key, value)) = line.split_once(" : ") else {+ continue;+ };+ if key == "ExceptionsList" {+ in_exceptions = value.trim().ends_with('{');+ continue;+ }+ out.values+ .push((key.trim().to_owned(), value.trim().to_owned()));+ }+ out+ }++ fn value(&self, key: &str) -> Option<&str> {+ self.values+ .iter()+ .find(|(name, _)| name == key)+ .map(|(_, value)| value.as_str())+ }++ fn on(&self, key: &str) -> bool {+ self.value(key) == Some("1")+ }++ /// The proxy for `scheme` and `host`: the scheme's own, or else the+ /// SOCKS one, unless the exceptions or the simple-hostname rule exempt+ /// the host.+ fn pick(&self, scheme: &str, host: &str) -> Option<String> {+ if bypassed(self.exceptions.iter().map(String::as_str), host)+ || (self.on("ExcludeSimpleHostnames") && !host.contains('.'))+ {+ return None;+ }+ let entry = |prefix: &str, kind: &str| {+ if !self.on(&format!("{prefix}Enable")) {+ return None;+ }+ let server = self.value(&format!("{prefix}Proxy"))?;+ let port = self.value(&format!("{prefix}Port"));+ let place = match port {+ Some(port) => format!("{server}:{port}"),+ None => server.to_owned(),+ };+ normalise(&place, kind)+ };+ let own = if scheme == "https" { "HTTPS" } else { "HTTP" };+ entry(own, "http").or_else(|| entry("SOCKS", "socks5"))+ }+}++#[cfg(windows)]+mod windows {+ //! The per-user proxy settings, as WinHTTP reads them for every+ //! program that asks, and the proxy script they may point at, which+ //! WinHTTP fetches and runs.++ use windows_sys::Win32::Foundation::GlobalFree;+ use windows_sys::Win32::Networking::WinHttp::{+ WINHTTP_ACCESS_TYPE_NO_PROXY, WINHTTP_AUTOPROXY_CONFIG_URL, WINHTTP_AUTOPROXY_OPTIONS,+ WINHTTP_CURRENT_USER_IE_PROXY_CONFIG, WINHTTP_PROXY_INFO, WinHttpCloseHandle,+ WinHttpGetIEProxyConfigForCurrentUser, WinHttpGetProxyForUrl, WinHttpOpen,+ WinHttpSetTimeouts,+ };+ use windows_sys::core::PWSTR;++ /// A string WinHTTP allocated, read and freed.+ fn take(text: PWSTR) -> Option<String> {+ if text.is_null() {+ return None;+ }+ // SAFETY: WinHTTP hands back a NUL-terminated wide string it+ // allocated with GlobalAlloc, ours to free once read.+ let read = unsafe {+ let mut length = 0;+ while *text.add(length) != 0 {+ length += 1;+ }+ let read = String::from_utf16_lossy(std::slice::from_raw_parts(text, length));+ GlobalFree(text.cast());+ read+ };+ let read = read.trim().to_owned();+ (!read.is_empty()).then_some(read)+ }++ fn wide(text: &str) -> Vec<u16> {+ text.encode_utf16().chain(std::iter::once(0)).collect()+ }++ pub(super) fn system(url: &str, scheme: &str, host: &str) -> Option<String> {+ let mut config = WINHTTP_CURRENT_USER_IE_PROXY_CONFIG::default();+ // SAFETY: the struct is ours; on success its strings are WinHTTP's+ // for us to free, which `take` does.+ if unsafe { WinHttpGetIEProxyConfigForCurrentUser(&mut config) } == 0 {+ return None;+ }+ let script = take(config.lpszAutoConfigUrl);+ let server = take(config.lpszProxy);+ let bypass = take(config.lpszProxyBypass);+ if let Some(script) = script {+ match run_script(url, &script) {+ Some(answer) => return answer.and_then(|list| super::windows_pick(&list, scheme)),+ None => log::debug!(+ "network: the proxy script {script} gave no answer; using the fixed settings"+ ),+ }+ }+ let server = server?;+ if bypass.is_some_and(|list| super::bypassed(list.split([';', ' ', ',']), host)) {+ return None;+ }+ super::windows_pick(&server, scheme)+ }++ /// What the proxy script at `script` says for `url`: `Some(None)` for+ /// directly, `None` when it could not be fetched or run.+ fn run_script(url: &str, script: &str) -> Option<Option<String>> {+ let agent = wide("Concat");+ // SAFETY: plain WinHTTP calls on a session opened and closed here;+ // every pointer passed outlives the call it is passed to.+ unsafe {+ let session = WinHttpOpen(+ agent.as_ptr(),+ WINHTTP_ACCESS_TYPE_NO_PROXY,+ std::ptr::null(),+ std::ptr::null(),+ 0,+ );+ if session.is_null() {+ return None;+ }+ // A script on a host that does not answer should cost seconds,+ // not WinHTTP's minute.+ WinHttpSetTimeouts(session, 5_000, 5_000, 5_000, 5_000);+ let script = wide(script);+ let target = wide(url);+ let mut options = WINHTTP_AUTOPROXY_OPTIONS {+ dwFlags: WINHTTP_AUTOPROXY_CONFIG_URL,+ lpszAutoConfigUrl: script.as_ptr(),+ fAutoLogonIfChallenged: 1,+ ..Default::default()+ };+ let mut info = WINHTTP_PROXY_INFO::default();+ let ok = WinHttpGetProxyForUrl(session, target.as_ptr(), &mut options, &mut info) != 0;+ WinHttpCloseHandle(session);+ if !ok {+ return None;+ }+ let list = take(info.lpszProxy);+ let _ = take(info.lpszProxyBypass);+ // The script said DIRECT, or named a proxy.+ if info.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY {+ Some(None)+ } else {+ Some(list)+ }+ }+ }+}++#[cfg(test)]+mod tests {+ use super::*;++ fn env<'a>(pairs: &'a [(&'a str, &'a str)]) -> impl Fn(&str) -> Option<String> + 'a {+ move |name| {+ pairs+ .iter()+ .find(|(key, _)| *key == name)+ .map(|(_, value)| (*value).to_owned())+ }+ }++ #[test]+ fn a_url_is_read_down_to_its_host() {+ let read = |url| target(url).map(|(scheme, host)| format!("{scheme} {host}"));+ assert_eq!(+ read("https://github.com/jub0t/Concat/releases"),+ Some("https github.com".into())+ );+ assert_eq!(+ read("http://User:[email protected]:8080/x?y"),+ Some("http example.com".into())+ );+ assert_eq!(read("http://[::1]:7420/"), Some("http ::1".into()));+ assert_eq!(read("not a url"), None);+ assert!(is_loopback("127.0.0.1") && is_loopback("::1") && is_loopback("localhost"));+ assert!(!is_loopback("github.com"));+ }++ #[test]+ fn the_environment_names_a_proxy_and_no_proxy_exempts_hosts() {+ let vars = [("HTTPS_PROXY", "127.0.0.1:7890")];+ assert_eq!(+ from_env("https", "github.com", &env(&vars)),+ Some(Some("http://127.0.0.1:7890".into()))+ );+ // Nothing set: the system is asked instead.+ assert_eq!(from_env("https", "github.com", &env(&[])), None);+ // ALL_PROXY covers both, and a SOCKS one keeps its scheme.+ let vars = [("all_proxy", "socks5h://127.0.0.1:1080")];+ assert_eq!(+ from_env("https", "github.com", &env(&vars)),+ Some(Some("socks5://127.0.0.1:1080".into()))+ );+ // An uppercase HTTP_PROXY is not trusted for plain HTTP (httpoxy).+ let vars = [("HTTP_PROXY", "evil:80")];+ assert_eq!(from_env("http", "example.com", &env(&vars)), None);+ // NO_PROXY, curl's way.+ let vars = [+ ("HTTPS_PROXY", "http://proxy.corp:8080/"),+ (+ "NO_PROXY",+ "localhost, .corp.example,huggingface.co,10.0.0.0/8",+ ),+ ];+ let lookup = env(&vars);+ assert_eq!(from_env("https", "huggingface.co", &lookup), Some(None));+ assert_eq!(from_env("https", "cdn.huggingface.co", &lookup), Some(None));+ assert_eq!(from_env("https", "files.corp.example", &lookup), Some(None));+ assert_eq!(from_env("https", "10.2.3.4", &lookup), Some(None));+ assert_eq!(+ from_env("https", "github.com", &lookup),+ Some(Some("http://proxy.corp:8080".into()))+ );+ assert!(no_proxy_matches("*", "anything.example"));+ assert!(!no_proxy_matches("ub.com", "github.com"));+ }++ #[test]+ fn a_windows_proxy_list_is_read_as_browsers_read_it() {+ // One for everything: what Clash and v2rayN set.+ assert_eq!(+ windows_pick("127.0.0.1:7890", "https"),+ Some("http://127.0.0.1:7890".into())+ );+ // Per protocol, with and without schemes on the entries.+ let list = "http=proxy:80;https=secure.proxy:8443;ftp=ftp.proxy:21";+ assert_eq!(+ windows_pick(list, "https"),+ Some("http://secure.proxy:8443".into())+ );+ assert_eq!(windows_pick(list, "http"), Some("http://proxy:80".into()));+ assert_eq!(+ windows_pick("https=http://p:3128", "https"),+ Some("http://p:3128".into())+ );+ // No entry of its own: the SOCKS one.+ assert_eq!(+ windows_pick("http=proxy:80;socks=127.0.0.1:1080", "https"),+ Some("socks4a://127.0.0.1:1080".into())+ );+ assert_eq!(windows_pick("ftp=ftp.proxy:21", "https"), None);+ // A script's answer: a list, of which the first is taken.+ assert_eq!(+ windows_pick("10.0.0.1:8080; 10.0.0.2:8080", "https"),+ Some("http://10.0.0.1:8080".into())+ );+ assert_eq!(windows_pick("", "https"), None);+ }++ #[test]+ fn a_bypass_list_exempts_what_it_names() {+ let list = "*.corp.example;10.*;<local>;192.168.0.0/16";+ let exempt = |host| bypassed(list.split(';'), host);+ assert!(exempt("files.corp.example"));+ assert!(exempt("10.1.2.3"));+ assert!(exempt("intranet"), "<local> is a name without a dot");+ assert!(exempt("192.168.4.20"));+ assert!(!exempt("github.com"));+ assert!(!exempt("corp.example.evil.com"));+ assert!(bypassed(["169.254/16"], "169.254.1.1"));+ assert!(!bypassed(["169.254/16"], "169.255.1.1"));+ assert!(glob("a*b*c", "aXXbYYc") && !glob("a*b*c", "aXXbYY") && glob("*", ""));+ }++ #[test]+ fn a_macs_proxy_settings_are_read_from_scutil() {+ let printed = "<dictionary> {+ ExceptionsList : <array> {+ 0 : *.local+ 1 : 169.254/16+ }+ ExcludeSimpleHostnames : 1+ FTPPassive : 1+ HTTPEnable : 1+ HTTPPort : 7890+ HTTPProxy : 127.0.0.1+ HTTPSEnable : 1+ HTTPSPort : 7891+ HTTPSProxy : 127.0.0.1+ ProxyAutoConfigEnable : 0+ SOCKSEnable : 1+ SOCKSPort : 7892+ SOCKSProxy : 127.0.0.1+}+";+ let settings = Scutil::parse(printed);+ assert_eq!(settings.exceptions, ["*.local", "169.254/16"]);+ assert_eq!(+ settings.pick("https", "github.com"),+ Some("http://127.0.0.1:7891".into())+ );+ assert_eq!(+ settings.pick("http", "example.com"),+ Some("http://127.0.0.1:7890".into())+ );+ assert_eq!(settings.pick("https", "printer.local"), None);+ assert_eq!(settings.pick("https", "nas"), None, "a simple hostname");+ // HTTPS off and SOCKS on: SOCKS.+ let socks_only = Scutil::parse(+ "<dictionary> {\n SOCKSEnable : 1\n SOCKSPort : 1080\n SOCKSProxy : 10.0.0.9\n}\n",+ );+ assert_eq!(+ socks_only.pick("https", "github.com"),+ Some("socks5://10.0.0.9:1080".into())+ );+ // Nothing on: directly.+ let none = Scutil::parse("<dictionary> {\n HTTPEnable : 0\n HTTPSEnable : 0\n}\n");+ assert_eq!(none.pick("https", "github.com"), None);+ }++ #[test]+ fn a_proxy_is_named_without_its_password() {+ assert_eq!(+ shown("http://user:[email protected]:8080"),+ "proxy.corp:8080"+ );+ assert_eq!(shown("socks5://127.0.0.1:1080"), "socks5 127.0.0.1:1080");+ assert_eq!(normalise("ftp://x:1", "http"), None);+ assert_eq!(+ normalise("https://p:3128", "http"),+ Some("http://p:3128".into())+ );+ // What a request is routed by: loopback never through a proxy.+ assert!(for_url("http://127.0.0.1:9/model.bin").is_none());+ }+}diff --git a/src/crates/concat-host/src/sounds.rs b/src/crates/concat-host/src/sounds.rsindex 5c8dce5a..0f548a59 100644--- a/src/crates/concat-host/src/sounds.rs+++ b/src/crates/concat-host/src/sounds.rs@@ -382,14 +382,21 @@ pub fn cached_catalogue(dirs: &AppDirs) -> Option<Catalogue> {/// error.pub fn fetch_catalogue(dirs: &AppDirs) -> Result<Option<Catalogue>, String> {use std::io::Read;- let agent = crate::net::strict_agent(+ let response = match crate::net::get(+ crate::models::SOUNDS_MANIFEST,std::time::Duration::from_secs(15),std::time::Duration::from_secs(30),- );- let response = match agent.get(crate::models::SOUNDS_MANIFEST).call() {+ crate::net::Trust::Shipped,+ &|request| request,+ ) {Ok(response) => response,- Err(ureq::Error::Status(404, _)) => return Ok(None),- Err(error) => return Err(format!("the sound list did not answer: {error}")),+ Err(failure) if matches!(failure.error, ureq::Error::Status(404, _)) => return Ok(None),+ Err(failure) => {+ return Err(format!(+ "the sound list did not answer: {}: {failure}",+ failure.cause.describe()+ ));+ }};let mut bytes = Vec::new();responsediff --git a/src/crates/concat-host/src/updates.rs b/src/crates/concat-host/src/updates.rsindex 63ea139e..4e7cb592 100644--- a/src/crates/concat-host/src/updates.rs+++ b/src/crates/concat-host/src/updates.rs@@ -669,16 +669,25 @@ fn detach(command: &mut Command) -> Result<(), String> {/// One GET, read whole as text. GitHub wants a user agent and says so with/// a 403 otherwise.fn get_text(url: &str) -> Result<String, String> {- let agent = crate::net::strict_agent(+ let agent = format!("Concat/{}", Version::current());+ let response = crate::net::get(+ url,std::time::Duration::from_secs(20),std::time::Duration::from_secs(30),- );- let response = agent- .get(url)- .set("User-Agent", &format!("Concat/{}", Version::current()))- .set("Accept", "application/vnd.github+json")- .call()- .map_err(|error| match error {+ crate::net::Trust::Shipped,+ &|request| {+ request+ .set("User-Agent", &agent)+ .set("Accept", "application/vnd.github+json")+ },+ )+ .map_err(|failure| {+ let crate::net::Failure {+ error,+ cause,+ proxy,+ } = *failure;+ match error {ureq::Error::Status(code, response) => {let body = response.into_string().unwrap_or_default();let said = serde_json::from_str::<serde_json::Value>(&body)@@ -686,8 +695,17 @@ fn get_text(url: &str) -> Result<String, String> {.unwrap_or_else(|_| body.chars().take(200).collect());format!("{url} answered {code}: {said}")}- other => format!("{url} did not answer: {other}"),- })?;+ other => {+ let through = proxy+ .map(|proxy| format!(" (through the proxy {proxy})"))+ .unwrap_or_default();+ format!(+ "{url} did not answer: {}{through}: {other}",+ cause.describe()+ )+ }+ }+ })?;response.into_string().map_err(|error| format!("{url} was cut short: {error}"))diff --git a/src/crates/concat-speech/src/lib.rs b/src/crates/concat-speech/src/lib.rsindex 5e3b7cbd..e3b6f063 100644--- a/src/crates/concat-speech/src/lib.rs+++ b/src/crates/concat-speech/src/lib.rs@@ -78,16 +78,14 @@ pub struct DownloadProgress {pub done: bool,}-/// Streams a model into `partial`: Concat's own mirror first, the upstream-/// it was filled from second, and the finished file checked against the-/// digest its table carries before the caller is told it arrived.+/// Streams a model into `partial` through the host's downloader:+/// Concat's own mirror first, the upstream it was filled from after it,+/// or the copy the person chose themselves, and the finished file checked+/// against the digest its table carries before the caller is told it+/// arrived. See [`concat_host::models::fetch`], which also says - when+/// every source fails - which hosts were tried and why they likely failed.///-/// `file` is what the model is called on the mirror. Two tries and not one-/// because a mirror that cannot be reached - a proxy that blocks our host,-/// a release still being published - should cost a retry rather than a-/// feature; see [`concat_host::models`]. A file that arrives and hashes-/// wrong is refused outright rather than retried, since the second try-/// would only hide which source served it.+/// `file` is what the model is called on the mirror.#[allow(clippy::too_many_arguments)]pub(crate) fn fetch_model(file: &str,@@ -99,45 +97,12 @@ pub(crate) fn fetch_model(cancel: &std::sync::atomic::AtomicBool,progress: &mut dyn FnMut(DownloadProgress),) -> Result<(u64, u64), String> {- use std::sync::atomic::Ordering;-- let mut last = String::new();- for url in concat_host::models::sources(file, upstream) {- match download_to(&url, partial, id, estimate, cancel, progress) {- Ok(totals) => {- concat_host::models::verify(partial, sha256).inspect_err(|_| {- let _ = std::fs::remove_file(partial);- })?;- return Ok(totals);- }- // The partial stays for the next source, or the next time:- // whichever answers takes up where this one stopped.- Err(error) => {- if cancel.load(Ordering::Relaxed) {- return Err(error);- }- last = error;- }- }- }- Err(last)-}--/// Streams `url` into `partial` through the shared downloader - taking-/// up from whatever of `partial` is already there - reporting every-/// couple of megabytes and stopping when `cancel` is set.-fn download_to(- url: &str,- partial: &std::path::Path,- id: &str,- estimate: u64,- cancel: &std::sync::atomic::AtomicBool,- progress: &mut dyn FnMut(DownloadProgress),-) -> Result<(u64, u64), String> {- concat_host::models::download(- url,+ concat_host::models::fetch(+ file,+ upstream,partial,estimate,+ sha256,cancel,"download cancelled",&mut |received, total| {diff --git a/src/crates/concat-speech/src/transcribe.rs b/src/crates/concat-speech/src/transcribe.rsindex 05da8990..2759b023 100644--- a/src/crates/concat-speech/src/transcribe.rs+++ b/src/crates/concat-speech/src/transcribe.rs@@ -449,6 +449,18 @@ impl Transcriber {Ok(())}+ /// What model `id` is called as a file, and every address a download+ /// of it tries, in order: for a person whose network lets their+ /// browser through and not Concat, who can fetch the first in the+ /// browser and hand the file to [`concat_host::models::supply`] under+ /// that name. `None` for a model Concat does not know.+ pub fn model_sources(id: &str) -> Option<(String, Vec<String>)> {+ known(id)?;+ let file = model_archive(id);+ let sources = concat_host::models::sources(&file, &model_upstream(id));+ Some((file, sources))+ }+/// Asks the running download to stop. Idle is a harmless no-op.pub fn cancel_download(&self) {self.downloads.cancel();diff --git a/src/crates/concat-speech/src/tts.rs b/src/crates/concat-speech/src/tts.rsindex 208bb7c4..e60bc5d0 100644--- a/src/crates/concat-speech/src/tts.rs+++ b/src/crates/concat-speech/src/tts.rs@@ -692,6 +692,20 @@ impl Speech {result}+ /// What bundle `id` is called as a file, and every address a download+ /// of it tries, in order; see [`crate::Transcriber::model_sources`].+ /// `None` for one Concat does not know, and for Chatterbox, which is+ /// several files rather than one.+ pub fn model_sources(id: &str) -> Option<(String, Vec<String>)> {+ known(id)?;+ if family_of(id) == Family::Chatterbox {+ return None;+ }+ let file = model_archive(id);+ let sources = concat_host::models::sources(&file, &model_upstream(id));+ Some((file, sources))+ }+/// Asks the running download to stop. Idle is a harmless no-op.pub fn cancel_download(&self) {self.downloads.cancel();diff --git a/src/crates/concat/locales/ar.json b/src/crates/concat/locales/ar.jsonindex 96807835..c78d3216 100644--- a/src/crates/concat/locales/ar.json+++ b/src/crates/concat/locales/ar.json@@ -430,6 +430,8 @@"settings.automation": "الأتمتة","settings.checkForUpdates": "التحقق من التحديثات","settings.checkingForUpdates": "جارٍ التحقق…",+ "settings.chooseFile": "اختيار ملف",+ "settings.chooseModelFile": "اختر ملف النموذج الذي نزّلته","settings.concat": "Concat {0}","settings.concatsMirror": "مرآة Concat","settings.copySystemInformation": "نسخ معلومات النظام",@@ -442,6 +444,16 @@"settings.default": "افتراضي","settings.deletingClipPullsWhat": "عند التفعيل، يسحب حذف مقطع ما يليه على المسار نفسه إلى الفجوة، ويحرّك قصّ حافة بقية المسار معه. عند الإيقاف، يترك الحذف فجوة ولا يحرّك القصّ إلا الحافة. يُغلق Shift-Delete الفجوة في الحالتين.","settings.download": "تنزيل",+ "settings.downloadBlocked": "منع شيء ما على هذا الحاسوب Concat من الوصول إلى الإنترنت: جدار حماية أو برنامج مكافحة فيروسات أو VPN. اسمح لـ Concat هناك، أو نزّل الملف في متصفحك.",+ "settings.downloadCertificate": "لم يُوثق بالاتصال الآمن: شيء ما على هذه الشبكة يعيد توقيعه.",+ "settings.downloadDns": "تعذّر العثور على خوادم التنزيل. ربما انقطع الاتصال، أو تحجبها الشبكة.",+ "settings.downloadFailed": "فشل التنزيل.",+ "settings.downloadInBrowser": "التنزيل في المتصفح",+ "settings.downloadNoAnswer": "لم تستجب خوادم التنزيل.",+ "settings.downloadOffline": "هذا الحاسوب غير متصل بالإنترنت.",+ "settings.downloadProxy": "تعذّر على Concat الاتصال عبر الوكيل {0}. تحقّق من أنه يعمل.",+ "settings.downloadReset": "انقطع الاتصال. ربما تحجب الشبكة خوادم التنزيل.",+ "settings.downloadStatus": "ردّت خوادم التنزيل بخطأ (HTTP {0}).","settings.downloadingVersion": "جارٍ تنزيل Concat {0}…","settings.downloads": "التنزيلات","settings.exposedAddressWarning": "يمكن الوصول إلى هذا العنوان من الشبكة. أي شيء يصل إليه ومعه الرمز المميّز يمكنه قراءة الملفات وكتابتها كما تفعل أنت، والاتصال غير مشفّر.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "لم يصدر بعد أي إصدار من 0.2.5 فما بعد.","settings.notAnAddress": "{0} ليس عنوانًا مثل 127.0.0.1:7420","settings.notFromPackage": "لم يُثبَّت هذا الإصدار من حزمة، لذا لا يوجد ما يوضع مكانه.",+ "settings.notTheModelFile": "هذا الملف ليس هذا النموذج. نزّله مجددًا من الرابط.","settings.off": "إيقاف","settings.offClickRulerPast": "عند الإيقاف، تضع النقرة على المسطرة بعد آخر مقطع مؤشر التشغيل هناك، ويذهب معه المقطع الموضوع عند مؤشر التشغيل. عند التفعيل، لا يغادر مؤشر التشغيل المحتوى أبدًا.","settings.originalSource": "المصدر الأصلي",diff --git a/src/crates/concat/locales/az.json b/src/crates/concat/locales/az.jsonindex 403d418d..d9357d30 100644--- a/src/crates/concat/locales/az.json+++ b/src/crates/concat/locales/az.json@@ -430,6 +430,8 @@"settings.automation": "Avtomatlaşdırma","settings.checkForUpdates": "Yeniləmələri yoxla","settings.checkingForUpdates": "Yoxlanılır…",+ "settings.chooseFile": "Fayl seç",+ "settings.chooseModelFile": "Endirilmiş model faylını seçin","settings.concat": "Concat {0}","settings.concatsMirror": "Concat-ın güzgü serveri","settings.copySystemInformation": "Sistem məlumatını kopyala",@@ -442,6 +444,16 @@"settings.default": "Standart","settings.deletingClipPullsWhat": "Açıq olanda klipi silsəniz, eyni trekdə ondan sonra gələnlər boşluğa sürüşür, kənarı qısaltsanız isə trekin qalanı da onunla birgə tərpənir. Söndürüləndə silmə boşluq qoyur, qısaltma isə yalnız kənarı tərpədir. Shift-Delete hər iki halda boşluğu bağlayır.","settings.download": "Yüklə",+ "settings.downloadBlocked": "Bu kompüterdə nəsə Concat-ın internetə çıxışını əngəllədi: firewall, antivirus və ya VPN. Orada Concat-a icazə verin və ya faylı brauzerdə endirin.",+ "settings.downloadCertificate": "Təhlükəsiz bağlantıya etibar edilmədi: bu şəbəkədə nəsə onu yenidən imzalayır.",+ "settings.downloadDns": "Endirmə serverləri tapılmadı. Bağlantı kəsilmiş ola bilər, ya da şəbəkə onları əngəlləyir.",+ "settings.downloadFailed": "Endirmə alınmadı.",+ "settings.downloadInBrowser": "Brauzerdə endir",+ "settings.downloadNoAnswer": "Endirmə serverləri cavab vermədi.",+ "settings.downloadOffline": "Bu kompüter internetə qoşulmayıb.",+ "settings.downloadProxy": "Concat {0} proksisi ilə qoşula bilmədi. İşlədiyini yoxlayın.",+ "settings.downloadReset": "Bağlantı kəsildi. Şəbəkə endirmə serverlərini əngəlləyə bilər.",+ "settings.downloadStatus": "Endirmə serverləri xəta ilə cavab verdi (HTTP {0}).","settings.downloadingVersion": "Concat {0} yüklənir…","settings.downloads": "Yükləmələr","settings.exposedAddressWarning": "Bu ünvana şəbəkədən çatmaq olar. Tokenlə ona çatan hər kəs sizin kimi faylları oxuya və yaza bilər, bağlantı isə şifrələnmir.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "0.2.5-dən sonrakı heç bir buraxılış hələ çıxmayıb.","settings.notAnAddress": "{0} 127.0.0.1:7420 kimi bir ünvan deyil","settings.notFromPackage": "Bu versiya paketdən quraşdırılmayıb, ona görə əvəzinə qoyulacaq heç nə yoxdur.",+ "settings.notTheModelFile": "Bu fayl bu model deyil. Keçidlə yenidən endirin.","settings.off": "Söndürülüb","settings.offClickRulerPast": "Söndürüləndə xətkeşdə son klipdən sonrakı yerə klikləsəniz, oynatma göstəricisi ora gedir və oynatma göstəricisinin yerinə qoyulan klip də ora düşür. Açıq olanda oynatma göstəricisi heç vaxt məzmundan kənara çıxmır.","settings.originalSource": "Orijinal mənbə",diff --git a/src/crates/concat/locales/bn.json b/src/crates/concat/locales/bn.jsonindex 86de8537..f7a3ef50 100644--- a/src/crates/concat/locales/bn.json+++ b/src/crates/concat/locales/bn.json@@ -430,6 +430,8 @@"settings.automation": "অটোমেশন","settings.checkForUpdates": "আপডেট পরীক্ষা করুন","settings.checkingForUpdates": "পরীক্ষা করা হচ্ছে…",+ "settings.chooseFile": "ফাইল বাছুন",+ "settings.chooseModelFile": "ডাউনলোড করা মডেল ফাইল বাছুন","settings.concat": "Concat {0}","settings.concatsMirror": "Concat-এর মিরর","settings.copySystemInformation": "সিস্টেম তথ্য কপি করুন",@@ -442,6 +444,16 @@"settings.default": "ডিফল্ট","settings.deletingClipPullsWhat": "চালু থাকলে, একটি ক্লিপ মুছলে একই ট্র্যাকে তার পরের অংশ ফাঁকা জায়গায় টেনে আনা হয়, আর প্রান্ত ছাঁটলে ট্র্যাকের বাকি অংশও সরে যায়। বন্ধ থাকলে, মুছলে ফাঁকা জায়গা থাকে এবং ছাঁটলে শুধু প্রান্ত সরে। Shift-Delete যেকোনো অবস্থায় ফাঁকা জায়গা বন্ধ করে।","settings.download": "ডাউনলোড",+ "settings.downloadBlocked": "এই কম্পিউটারের কিছু একটা Concat-কে ইন্টারনেটে যেতে বাধা দিয়েছে: ফায়ারওয়াল, অ্যান্টিভাইরাস বা VPN। সেখানে Concat-কে অনুমতি দিন, অথবা ব্রাউজারে ফাইলটি ডাউনলোড করুন।",+ "settings.downloadCertificate": "নিরাপদ সংযোগটি বিশ্বাসযোগ্য ছিল না: এই নেটওয়ার্কের কিছু একটা এটি আবার সই করে।",+ "settings.downloadDns": "ডাউনলোড সার্ভার পাওয়া যায়নি। সংযোগ বিচ্ছিন্ন হতে পারে, বা নেটওয়ার্ক সেগুলো আটকে রেখেছে।",+ "settings.downloadFailed": "ডাউনলোড ব্যর্থ হয়েছে।",+ "settings.downloadInBrowser": "ব্রাউজারে ডাউনলোড করুন",+ "settings.downloadNoAnswer": "ডাউনলোড সার্ভার সাড়া দেয়নি।",+ "settings.downloadOffline": "এই কম্পিউটার ইন্টারনেটে যুক্ত নয়।",+ "settings.downloadProxy": "Concat প্রক্সি {0} দিয়ে সংযোগ করতে পারেনি। এটি চলছে কিনা দেখুন।",+ "settings.downloadReset": "সংযোগ কেটে গেছে। নেটওয়ার্ক হয়তো ডাউনলোড সার্ভার আটকে রেখেছে।",+ "settings.downloadStatus": "ডাউনলোড সার্ভার একটি ত্রুটি দিয়ে সাড়া দিয়েছে (HTTP {0})।","settings.downloadingVersion": "Concat {0} ডাউনলোড হচ্ছে…","settings.downloads": "ডাউনলোডস","settings.exposedAddressWarning": "এই ঠিকানা নেটওয়ার্ক থেকে পৌঁছানো যায়। টোকেনসহ যা কিছু এখানে পৌঁছায় তা আপনার মতোই ফাইল পড়তে ও লিখতে পারে, এবং সংযোগটি এনক্রিপ্ট করা নয়।",@@ -479,6 +491,7 @@"settings.noReleasesYet": "0.2.5 থেকে এখনও কোনো রিলিজ বের হয়নি।","settings.notAnAddress": "{0} 127.0.0.1:7420-এর মতো ঠিকানা নয়","settings.notFromPackage": "এই বিল্ড কোনো প্যাকেজ থেকে ইনস্টল করা হয়নি, তাই এর জায়গায় বসানোর কিছু নেই।",+ "settings.notTheModelFile": "ওই ফাইলটি এই মডেল নয়। লিংক থেকে আবার ডাউনলোড করুন।","settings.off": "বন্ধ","settings.offClickRulerPast": "বন্ধ থাকলে, শেষ ক্লিপের পরে রুলারে ক্লিক করলে প্লেহেড সেখানে যায়, আর প্লেহেডে রাখা ক্লিপ তার সাথে যায়। চালু থাকলে, প্লেহেড কখনো কনটেন্ট ছাড়ে না।","settings.originalSource": "মূল উৎস",diff --git a/src/crates/concat/locales/de.json b/src/crates/concat/locales/de.jsonindex 9e3619d7..dc1452cf 100644--- a/src/crates/concat/locales/de.json+++ b/src/crates/concat/locales/de.json@@ -430,6 +430,8 @@"settings.automation": "Automatisierung","settings.checkForUpdates": "Nach Updates suchen","settings.checkingForUpdates": "Wird geprüft…",+ "settings.chooseFile": "Datei wählen",+ "settings.chooseModelFile": "Heruntergeladene Modelldatei wählen","settings.concat": "Concat {0}","settings.concatsMirror": "Concats Spiegel","settings.copySystemInformation": "Systeminformationen kopieren",@@ -442,6 +444,16 @@"settings.default": "Standard","settings.deletingClipPullsWhat": "Ein, Löschen eines Clips zieht alles, was auf derselben Spur folgt, in die Lücke, und Kürzen einer Kante nimmt den Rest der Spur mit. Aus, Löschen lässt eine Lücke und Kürzen bewegt nur die Kante. Umschalt-Löschen schließt die Lücke in beiden Fällen.","settings.download": "Herunterladen",+ "settings.downloadBlocked": "Etwas auf diesem Computer hat Concat den Internetzugang gesperrt: eine Firewall, ein Virenschutz oder ein VPN. Erlaube Concat dort oder lade die Datei im Browser herunter.",+ "settings.downloadCertificate": "Der sicheren Verbindung wurde nicht vertraut: Etwas in diesem Netzwerk signiert sie neu.",+ "settings.downloadDns": "Die Download-Server wurden nicht gefunden. Die Verbindung ist vielleicht unterbrochen, oder das Netzwerk sperrt sie.",+ "settings.downloadFailed": "Der Download ist fehlgeschlagen.",+ "settings.downloadInBrowser": "Im Browser herunterladen",+ "settings.downloadNoAnswer": "Die Download-Server haben nicht geantwortet.",+ "settings.downloadOffline": "Dieser Computer ist nicht mit dem Internet verbunden.",+ "settings.downloadProxy": "Concat konnte keine Verbindung über den Proxy {0} herstellen. Prüfe, ob er läuft.",+ "settings.downloadReset": "Die Verbindung wurde getrennt. Das Netzwerk sperrt vielleicht die Download-Server.",+ "settings.downloadStatus": "Die Download-Server haben mit einem Fehler geantwortet (HTTP {0}).","settings.downloadingVersion": "Concat {0} wird heruntergeladen…","settings.downloads": "Downloads","settings.exposedAddressWarning": "Diese Adresse ist aus dem Netzwerk erreichbar. Alles, was sie mit dem Token erreicht, kann Dateien lesen und schreiben wie du, und die Verbindung ist nicht verschlüsselt.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "Noch keine Version ab 0.2.5 erschienen.","settings.notAnAddress": "{0} ist keine Adresse wie 127.0.0.1:7420","settings.notFromPackage": "Dieser Build wurde nicht aus einem Paket installiert, es gibt also nichts, was an seine Stelle treten könnte.",+ "settings.notTheModelFile": "Diese Datei ist nicht dieses Modell. Lade sie über den Link erneut herunter.","settings.off": "Aus","settings.offClickRulerPast": "Off, a click on the ruler past the last clip lands the playhead there, and a clip placed at the playhead goes with it. On, the playhead never leaves the content.","settings.originalSource": "Ursprüngliche Quelle",diff --git a/src/crates/concat/locales/en.json b/src/crates/concat/locales/en.jsonindex 9d6753ff..cd6d6ee7 100644--- a/src/crates/concat/locales/en.json+++ b/src/crates/concat/locales/en.json@@ -430,6 +430,8 @@"settings.automation": "Automation","settings.checkForUpdates": "Check for updates","settings.checkingForUpdates": "Checking…",+ "settings.chooseFile": "Choose file",+ "settings.chooseModelFile": "Choose the downloaded model file","settings.concat": "Concat {0}","settings.concatsMirror": "Concat's mirror","settings.copySystemInformation": "Copy system information",@@ -442,6 +444,16 @@"settings.default": "Default","settings.deletingClipPullsWhat": "On, deleting a clip pulls what follows it on the same track into the gap, and trimming an edge moves the rest of the track with it. Off, a delete leaves a gap and a trim moves only the edge. Shift-Delete closes the gap either way.","settings.download": "Download",+ "settings.downloadBlocked": "Something on this computer blocked Concat from the internet: a firewall, antivirus or VPN. Allow Concat there, or download the file in your browser.",+ "settings.downloadCertificate": "The secure connection was not trusted: something on this network re-signs it.",+ "settings.downloadDns": "The download servers could not be found. The connection may be down, or the network blocks them.",+ "settings.downloadFailed": "The download failed.",+ "settings.downloadInBrowser": "Download in browser",+ "settings.downloadNoAnswer": "The download servers did not answer.",+ "settings.downloadOffline": "This computer is not connected to the internet.",+ "settings.downloadProxy": "Concat could not connect through the proxy {0}. Check that it is running.",+ "settings.downloadReset": "The connection was cut off. The network may be blocking the download servers.",+ "settings.downloadStatus": "The download servers answered with an error (HTTP {0}).","settings.downloadingVersion": "Downloading Concat {0}…","settings.downloads": "Downloads","settings.exposedAddressWarning": "This address can be reached from the network. Anything that reaches it with the token can read and write files as you can, and the connection is not encrypted.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "No release from 0.2.5 on is out yet.","settings.notAnAddress": "{0} is not an address like 127.0.0.1:7420","settings.notFromPackage": "This build was not installed from a package, so there is nothing to put in its place.",+ "settings.notTheModelFile": "That file is not this model. Download it again with the link.","settings.off": "Off","settings.offClickRulerPast": "Off, a click on the ruler past the last clip lands the playhead there, and a clip placed at the playhead goes with it. On, the playhead never leaves the content.","settings.originalSource": "Original source",diff --git a/src/crates/concat/locales/es.json b/src/crates/concat/locales/es.jsonindex 778c58d7..4bef171f 100644--- a/src/crates/concat/locales/es.json+++ b/src/crates/concat/locales/es.json@@ -430,6 +430,8 @@"settings.automation": "Automatización","settings.checkForUpdates": "Buscar actualizaciones","settings.checkingForUpdates": "Comprobando…",+ "settings.chooseFile": "Elegir archivo",+ "settings.chooseModelFile": "Elige el archivo de modelo descargado","settings.concat": "Concat {0}","settings.concatsMirror": "Espejo de Concat","settings.copySystemInformation": "Copiar información del sistema",@@ -442,6 +444,16 @@"settings.default": "Predeterminado","settings.deletingClipPullsWhat": "Activado, eliminar un clip arrastra lo que le sigue en la misma pista hacia el hueco, y recortar un borde mueve el resto de la pista con él. Desactivado, eliminar deja un hueco y recortar mueve solo el borde. Mayús-Supr cierra el hueco en ambos casos.","settings.download": "Descargar",+ "settings.downloadBlocked": "Algo en este equipo impidió que Concat accediera a internet: un cortafuegos, un antivirus o una VPN. Permite Concat ahí o descarga el archivo en tu navegador.",+ "settings.downloadCertificate": "No se confió en la conexión segura: algo en esta red la vuelve a firmar.",+ "settings.downloadDns": "No se encontraron los servidores de descarga. Puede que la conexión no funcione o que la red los bloquee.",+ "settings.downloadFailed": "La descarga falló.",+ "settings.downloadInBrowser": "Descargar en el navegador",+ "settings.downloadNoAnswer": "Los servidores de descarga no respondieron.",+ "settings.downloadOffline": "Este equipo no está conectado a internet.",+ "settings.downloadProxy": "Concat no pudo conectarse a través del proxy {0}. Comprueba que está en marcha.",+ "settings.downloadReset": "La conexión se cortó. Puede que la red esté bloqueando los servidores de descarga.",+ "settings.downloadStatus": "Los servidores de descarga respondieron con un error (HTTP {0}).","settings.downloadingVersion": "Descargando Concat {0}…","settings.downloads": "Descargas","settings.exposedAddressWarning": "Esta dirección es accesible desde la red. Cualquier cosa que llegue a ella con el token puede leer y escribir archivos como tú, y la conexión no va cifrada.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "Aún no hay ninguna versión a partir de la 0.2.5.","settings.notAnAddress": "{0} no es una dirección como 127.0.0.1:7420","settings.notFromPackage": "Esta compilación no se instaló desde un paquete, así que no hay nada que poner en su lugar.",+ "settings.notTheModelFile": "Ese archivo no es este modelo. Descárgalo de nuevo con el enlace.","settings.off": "Apagado","settings.offClickRulerPast": "Off, a click on the ruler past the last clip lands the playhead there, and a clip placed at the playhead goes with it. On, the playhead never leaves the content.","settings.originalSource": "Fuente original",diff --git a/src/crates/concat/locales/fa.json b/src/crates/concat/locales/fa.jsonindex 533af159..de60e443 100644--- a/src/crates/concat/locales/fa.json+++ b/src/crates/concat/locales/fa.json@@ -430,6 +430,8 @@"settings.automation": "خودکارسازی","settings.checkForUpdates": "بررسی بهروزرسانیها","settings.checkingForUpdates": "در حال بررسی…",+ "settings.chooseFile": "انتخاب فایل",+ "settings.chooseModelFile": "فایل مدل بارگیریشده را انتخاب کنید","settings.concat": "Concat {0}","settings.concatsMirror": "Mirror مربوط به Concat","settings.copySystemInformation": "کپی اطلاعات سیستم",@@ -442,6 +444,16 @@"settings.default": "پیشفرض","settings.deletingClipPullsWhat": "در حالت On، حذف یک کلیپ هر چیزی را که بعد از آن روی همان ترک است به داخل فاصله میکشد و برش یک لبه بقیه ترک را همراه خود جابهجا میکند. در حالت خاموش، حذف یک فاصله باقی میگذارد و برش فقط لبه را جابهجا میکند. Shift-Delete در هر دو حالت فاصله را میبندد.","settings.download": "دانلود",+ "settings.downloadBlocked": "چیزی روی این رایانه دسترسی Concat به اینترنت را مسدود کرد: دیوار آتش، آنتیویروس یا VPN. در آن به Concat اجازه دهید، یا فایل را در مرورگر بارگیری کنید.",+ "settings.downloadCertificate": "به اتصال امن اعتماد نشد: چیزی در این شبکه آن را دوباره امضا میکند.",+ "settings.downloadDns": "سرورهای بارگیری پیدا نشدند. شاید اتصال قطع است یا شبکه آنها را مسدود میکند.",+ "settings.downloadFailed": "بارگیری ناموفق بود.",+ "settings.downloadInBrowser": "بارگیری در مرورگر",+ "settings.downloadNoAnswer": "سرورهای بارگیری پاسخ ندادند.",+ "settings.downloadOffline": "این رایانه به اینترنت وصل نیست.",+ "settings.downloadProxy": "Concat نتوانست از طریق پراکسی {0} وصل شود. بررسی کنید که در حال اجرا باشد.",+ "settings.downloadReset": "اتصال قطع شد. شاید شبکه سرورهای بارگیری را مسدود میکند.",+ "settings.downloadStatus": "سرورهای بارگیری با خطا پاسخ دادند (HTTP {0}).","settings.downloadingVersion": "در حال بارگیری Concat {0}…","settings.downloads": "دانلودها","settings.exposedAddressWarning": "این آدرس از طریق شبکه قابل دسترسی است. هر چیزی که با Token به آن برسد میتواند مثل شما فایلها را بخواند و بنویسد، و اتصال رمزگذاریشده نیست.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "هنوز نسخهای از 0.2.5 به بعد منتشر نشده است.","settings.notAnAddress": "{0} یک آدرس معتبر مثل 127.0.0.1:7420 نیست","settings.notFromPackage": "این ساخت از یک بسته نصب نشده است، پس چیزی برای جایگزینی آن وجود ندارد.",+ "settings.notTheModelFile": "این فایل این مدل نیست. آن را دوباره از پیوند بارگیری کنید.","settings.off": "خاموش","settings.offClickRulerPast": "در حالت خاموش، با کلیک روی خطکش بعد از آخرین کلیپ، نشانگر پخش همانجا قرار میگیرد و کلیپ قرارگرفته در نشانگر پخش نیز به همان نقطه میرود. در حالت On، نشانگر پخش هیچوقت از محدوده محتوا خارج نمیشود.","settings.originalSource": "منبع اصلی",diff --git a/src/crates/concat/locales/fr.json b/src/crates/concat/locales/fr.jsonindex d8d09734..2ce90c42 100644--- a/src/crates/concat/locales/fr.json+++ b/src/crates/concat/locales/fr.json@@ -430,6 +430,8 @@"settings.automation": "Automatisation","settings.checkForUpdates": "Rechercher des mises à jour","settings.checkingForUpdates": "Vérification…",+ "settings.chooseFile": "Choisir un fichier",+ "settings.chooseModelFile": "Choisir le fichier de modèle téléchargé","settings.concat": "Concat {0}","settings.concatsMirror": "Miroir de Concat","settings.copySystemInformation": "Copier les informations système",@@ -442,6 +444,16 @@"settings.default": "Par défaut","settings.deletingClipPullsWhat": "Activé, supprimer un clip tire ce qui le suit sur la même piste dans l'espace laissé, et rogner un bord déplace le reste de la piste avec lui. Désactivé, une suppression laisse un espace et un rognage ne déplace que le bord. Maj-Suppr referme l'espace dans les deux cas.","settings.download": "Télécharger",+ "settings.downloadBlocked": "Quelque chose sur cet ordinateur a empêché Concat d'accéder à Internet : un pare-feu, un antivirus ou un VPN. Autorisez Concat, ou téléchargez le fichier dans votre navigateur.",+ "settings.downloadCertificate": "La connexion sécurisée n'était pas fiable : quelque chose sur ce réseau la signe à nouveau.",+ "settings.downloadDns": "Les serveurs de téléchargement sont introuvables. La connexion est peut-être coupée, ou le réseau les bloque.",+ "settings.downloadFailed": "Le téléchargement a échoué.",+ "settings.downloadInBrowser": "Télécharger dans le navigateur",+ "settings.downloadNoAnswer": "Les serveurs de téléchargement n'ont pas répondu.",+ "settings.downloadOffline": "Cet ordinateur n'est pas connecté à Internet.",+ "settings.downloadProxy": "Concat n'a pas pu se connecter via le proxy {0}. Vérifiez qu'il est lancé.",+ "settings.downloadReset": "La connexion a été coupée. Le réseau bloque peut-être les serveurs de téléchargement.",+ "settings.downloadStatus": "Les serveurs de téléchargement ont répondu par une erreur (HTTP {0}).","settings.downloadingVersion": "Téléchargement de Concat {0}…","settings.downloads": "Téléchargements","settings.exposedAddressWarning": "Cette adresse est joignable depuis le réseau. Tout ce qui l'atteint avec le jeton peut lire et écrire des fichiers comme vous, et la connexion n'est pas chiffrée.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "Aucune version à partir de la 0.2.5 n'est encore sortie.","settings.notAnAddress": "{0} n'est pas une adresse comme 127.0.0.1:7420","settings.notFromPackage": "Cette compilation n'a pas été installée depuis un paquet, il n'y a donc rien à mettre à sa place.",+ "settings.notTheModelFile": "Ce fichier n'est pas ce modèle. Téléchargez-le à nouveau avec le lien.","settings.off": "Désactivé","settings.offClickRulerPast": "Off, a click on the ruler past the last clip lands the playhead there, and a clip placed at the playhead goes with it. On, the playhead never leaves the content.","settings.originalSource": "Source d'origine",diff --git a/src/crates/concat/locales/he.json b/src/crates/concat/locales/he.jsonindex bd915f17..b8eab6a6 100644--- a/src/crates/concat/locales/he.json+++ b/src/crates/concat/locales/he.json@@ -430,6 +430,8 @@"settings.automation": "אוטומציה","settings.checkForUpdates": "בדיקת עדכונים","settings.checkingForUpdates": "בודק…",+ "settings.chooseFile": "בחירת קובץ",+ "settings.chooseModelFile": "בחרו את קובץ המודל שהורד","settings.concat": "Concat {0}","settings.concatsMirror": "המראה של Concat","settings.copySystemInformation": "העתקת פרטי המערכת",@@ -442,6 +444,16 @@"settings.default": "ברירת מחדל","settings.deletingClipPullsWhat": "כשמופעל, מחיקת קליפ מושכת את מה שאחריו באותו ערוץ אל הרווח, וקיצוץ קצה מזיז איתו את שאר הערוץ. כשכבוי, מחיקה משאירה רווח וקיצוץ מזיז רק את הקצה. Shift-Delete סוגר את הרווח בכל מקרה.","settings.download": "הורדה",+ "settings.downloadBlocked": "משהו במחשב הזה חסם את Concat מהאינטרנט: חומת אש, אנטי-וירוס או VPN. אפשרו שם את Concat, או הורידו את הקובץ בדפדפן.",+ "settings.downloadCertificate": "החיבור המאובטח לא היה אמין: משהו ברשת הזו חותם עליו מחדש.",+ "settings.downloadDns": "שרתי ההורדה לא נמצאו. ייתכן שהחיבור מנותק, או שהרשת חוסמת אותם.",+ "settings.downloadFailed": "ההורדה נכשלה.",+ "settings.downloadInBrowser": "הורדה בדפדפן",+ "settings.downloadNoAnswer": "שרתי ההורדה לא ענו.",+ "settings.downloadOffline": "המחשב הזה אינו מחובר לאינטרנט.",+ "settings.downloadProxy": "Concat לא הצליח להתחבר דרך ה-proxy {0}. בדקו שהוא פועל.",+ "settings.downloadReset": "החיבור נותק. ייתכן שהרשת חוסמת את שרתי ההורדה.",+ "settings.downloadStatus": "שרתי ההורדה ענו בשגיאה (HTTP {0}).","settings.downloadingVersion": "מוריד את Concat {0}…","settings.downloads": "הורדות","settings.exposedAddressWarning": "הכתובת הזו נגישה מהרשת. כל מה שמגיע אליה עם האסימון יכול לקרוא ולכתוב קבצים כמוך, והחיבור אינו מוצפן.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "עדיין לא יצאה גרסה מ-0.2.5 ואילך.","settings.notAnAddress": "{0} אינו כתובת כמו 127.0.0.1:7420","settings.notFromPackage": "גרסת הבנייה הזו לא הותקנה מחבילה, ולכן אין מה לשים במקומה.",+ "settings.notTheModelFile": "הקובץ הזה אינו המודל הזה. הורידו אותו שוב מהקישור.","settings.off": "כבוי","settings.offClickRulerPast": "כשכבוי, לחיצה על הסרגל אחרי הקליפ האחרון מעבירה לשם את סמן ההפעלה, וקליפ שמונח בסמן ההפעלה הולך איתו. כשמופעל, סמן ההפעלה לעולם לא יוצא מהתוכן.","settings.originalSource": "המקור המקורי",diff --git a/src/crates/concat/locales/hi.json b/src/crates/concat/locales/hi.jsonindex 33f51d1e..26fe9d20 100644--- a/src/crates/concat/locales/hi.json+++ b/src/crates/concat/locales/hi.json@@ -430,6 +430,8 @@"settings.automation": "स्वचालन","settings.checkForUpdates": "अपडेट देखें","settings.checkingForUpdates": "जांच हो रही है…",+ "settings.chooseFile": "फ़ाइल चुनें",+ "settings.chooseModelFile": "डाउनलोड की गई मॉडल फ़ाइल चुनें","settings.concat": "Concat {0}","settings.concatsMirror": "Concat का मिरर","settings.copySystemInformation": "सिस्टम जानकारी कॉपी करें",@@ -442,6 +444,16 @@"settings.default": "डिफ़ॉल्ट","settings.deletingClipPullsWhat": "चालू होने पर, क्लिप मिटाने से उसी ट्रैक पर उसके बाद की चीज़ें खाली जगह में खिंच आती हैं, और किनारा ट्रिम करने पर ट्रैक का बाकी हिस्सा भी साथ खिसकता है। बंद होने पर, मिटाने से खाली जगह रह जाती है और ट्रिम सिर्फ़ किनारे को खिसकाता है। Shift-Delete दोनों ही स्थितियों में खाली जगह भर देता है।","settings.download": "डाउनलोड करें",+ "settings.downloadBlocked": "इस कंप्यूटर पर किसी चीज़ ने Concat को इंटरनेट से रोक दिया: फ़ायरवॉल, एंटीवायरस या VPN। वहाँ Concat को अनुमति दें, या फ़ाइल अपने ब्राउज़र में डाउनलोड करें।",+ "settings.downloadCertificate": "सुरक्षित कनेक्शन पर भरोसा नहीं किया गया: इस नेटवर्क पर कोई चीज़ उसे दोबारा साइन करती है।",+ "settings.downloadDns": "डाउनलोड सर्वर नहीं मिले। कनेक्शन टूटा हो सकता है, या नेटवर्क उन्हें रोक रहा है।",+ "settings.downloadFailed": "डाउनलोड विफल रहा।",+ "settings.downloadInBrowser": "ब्राउज़र में डाउनलोड करें",+ "settings.downloadNoAnswer": "डाउनलोड सर्वरों ने जवाब नहीं दिया।",+ "settings.downloadOffline": "यह कंप्यूटर इंटरनेट से जुड़ा नहीं है।",+ "settings.downloadProxy": "Concat प्रॉक्सी {0} से होकर कनेक्ट नहीं कर सका। देखें कि वह चल रहा है।",+ "settings.downloadReset": "कनेक्शन कट गया। नेटवर्क शायद डाउनलोड सर्वरों को रोक रहा है।",+ "settings.downloadStatus": "डाउनलोड सर्वरों ने त्रुटि के साथ जवाब दिया (HTTP {0})।","settings.downloadingVersion": "Concat {0} डाउनलोड हो रहा है…","settings.downloads": "डाउनलोड","settings.exposedAddressWarning": "यह पता नेटवर्क से पहुंचा जा सकता है। टोकन के साथ यहां पहुंचने वाला कुछ भी आपकी तरह फ़ाइलें पढ़ और लिख सकता है, और कनेक्शन एन्क्रिप्टेड नहीं है।",@@ -479,6 +491,7 @@"settings.noReleasesYet": "0.2.5 या उसके बाद की कोई रिलीज़ अभी नहीं आई है।","settings.notAnAddress": "{0} 127.0.0.1:7420 जैसा पता नहीं है","settings.notFromPackage": "यह बिल्ड किसी पैकेज से इंस्टॉल नहीं हुआ था, इसलिए इसकी जगह रखने के लिए कुछ नहीं है।",+ "settings.notTheModelFile": "वह फ़ाइल यह मॉडल नहीं है। लिंक से उसे फिर से डाउनलोड करें।","settings.off": "बंद","settings.offClickRulerPast": "बंद होने पर, आख़िरी क्लिप के बाद रूलर पर क्लिक करने से प्लेहेड वहीं पहुंच जाता है, और प्लेहेड पर रखी गई क्लिप भी वहीं जाती है। चालू होने पर, प्लेहेड कभी सामग्री से बाहर नहीं जाता।","settings.originalSource": "मूल स्रोत",diff --git a/src/crates/concat/locales/hr.json b/src/crates/concat/locales/hr.jsonindex 43b9f1ce..f405ab41 100644--- a/src/crates/concat/locales/hr.json+++ b/src/crates/concat/locales/hr.json@@ -430,6 +430,8 @@"settings.automation": "Automatizacija","settings.checkForUpdates": "Provjeri ažuriranja","settings.checkingForUpdates": "Provjera…",+ "settings.chooseFile": "Odaberi datoteku",+ "settings.chooseModelFile": "Odaberite preuzetu datoteku modela","settings.concat": "Concat {0}","settings.concatsMirror": "Concatov zrcalni poslužitelj","settings.copySystemInformation": "Kopiraj podatke o sustavu",@@ -442,6 +444,16 @@"settings.default": "Zadano","settings.deletingClipPullsWhat": "Uključeno, brisanje klipa povlači ono što slijedi na istoj traci u prazninu, a skraćivanje ruba pomiče ostatak trake s njim. Isključeno, brisanje ostavlja prazninu, a skraćivanje pomiče samo rub. Shift-Delete zatvara prazninu u oba slučaja.","settings.download": "Preuzmi",+ "settings.downloadBlocked": "Nešto na ovom računalu spriječilo je Concat da pristupi internetu: vatrozid, antivirus ili VPN. Dopustite tamo Concat ili preuzmite datoteku u pregledniku.",+ "settings.downloadCertificate": "Sigurnoj vezi nije se moglo vjerovati: nešto na ovoj mreži ponovno je potpisuje.",+ "settings.downloadDns": "Poslužitelji za preuzimanje nisu pronađeni. Veza možda ne radi ili ih mreža blokira.",+ "settings.downloadFailed": "Preuzimanje nije uspjelo.",+ "settings.downloadInBrowser": "Preuzmi u pregledniku",+ "settings.downloadNoAnswer": "Poslužitelji za preuzimanje nisu odgovorili.",+ "settings.downloadOffline": "Ovo računalo nije spojeno na internet.",+ "settings.downloadProxy": "Concat se nije mogao povezati preko proxyja {0}. Provjerite radi li.",+ "settings.downloadReset": "Veza je prekinuta. Mreža možda blokira poslužitelje za preuzimanje.",+ "settings.downloadStatus": "Poslužitelji za preuzimanje odgovorili su pogreškom (HTTP {0}).","settings.downloadingVersion": "Preuzimanje Concata {0}…","settings.downloads": "Preuzimanja","settings.exposedAddressWarning": "Ova adresa dostupna je s mreže. Sve što do nje dođe s tokenom može čitati i pisati datoteke kao vi, a veza nije šifrirana.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "Još nema izdanja od 0.2.5 nadalje.","settings.notAnAddress": "{0} nije adresa poput 127.0.0.1:7420","settings.notFromPackage": "Ova gradnja nije instalirana iz paketa, pa je nema čime zamijeniti.",+ "settings.notTheModelFile": "Ta datoteka nije ovaj model. Preuzmite je ponovno putem poveznice.","settings.off": "Isključeno","settings.offClickRulerPast": "Isključeno: klik na ravnalo iza zadnjeg klipa spušta playhead tamo, a klip postavljen na playhead ide s njim. Uključeno: playhead nikad ne napušta sadržaj.","settings.originalSource": "Izvorni izvor",diff --git a/src/crates/concat/locales/id.json b/src/crates/concat/locales/id.jsonindex 20541953..66ebef35 100644--- a/src/crates/concat/locales/id.json+++ b/src/crates/concat/locales/id.json@@ -430,6 +430,8 @@"settings.automation": "Otomatisasi","settings.checkForUpdates": "Periksa pembaruan","settings.checkingForUpdates": "Memeriksa…",+ "settings.chooseFile": "Pilih berkas",+ "settings.chooseModelFile": "Pilih berkas model yang diunduh","settings.concat": "Concat {0}","settings.concatsMirror": "Mirror Concat","settings.copySystemInformation": "Salin informasi sistem",@@ -442,6 +444,16 @@"settings.default": "Bawaan","settings.deletingClipPullsWhat": "Jika aktif, menghapus klip akan menarik isi berikutnya di trek yang sama ke celahnya, dan memotong tepi akan menggeser sisa trek bersamanya. Jika nonaktif, penghapusan meninggalkan celah dan pemotongan hanya menggeser tepinya. Shift-Delete menutup celah dalam kedua kondisi.","settings.download": "Unduh",+ "settings.downloadBlocked": "Sesuatu di komputer ini memblokir Concat dari internet: firewall, antivirus, atau VPN. Izinkan Concat di sana, atau unduh berkasnya di browser.",+ "settings.downloadCertificate": "Koneksi aman tidak dipercaya: sesuatu di jaringan ini menandatanganinya ulang.",+ "settings.downloadDns": "Server unduhan tidak ditemukan. Koneksi mungkin terputus, atau jaringan memblokirnya.",+ "settings.downloadFailed": "Unduhan gagal.",+ "settings.downloadInBrowser": "Unduh di browser",+ "settings.downloadNoAnswer": "Server unduhan tidak menjawab.",+ "settings.downloadOffline": "Komputer ini tidak terhubung ke internet.",+ "settings.downloadProxy": "Concat tidak dapat terhubung lewat proxy {0}. Periksa apakah proxy itu berjalan.",+ "settings.downloadReset": "Koneksi terputus. Jaringan mungkin memblokir server unduhan.",+ "settings.downloadStatus": "Server unduhan menjawab dengan galat (HTTP {0}).","settings.downloadingVersion": "Mengunduh Concat {0}…","settings.downloads": "Unduhan","settings.exposedAddressWarning": "Alamat ini dapat dijangkau dari jaringan. Apa pun yang menjangkaunya dengan token dapat membaca dan menulis file seperti Anda, dan koneksinya tidak terenkripsi.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "Belum ada rilis dari 0.2.5 ke atas.","settings.notAnAddress": "{0} bukan alamat seperti 127.0.0.1:7420","settings.notFromPackage": "Build ini tidak diinstal dari paket, jadi tidak ada yang bisa dipasang sebagai penggantinya.",+ "settings.notTheModelFile": "Berkas itu bukan model ini. Unduh lagi lewat tautan.","settings.off": "Nonaktif","settings.offClickRulerPast": "Jika nonaktif, klik pada penggaris setelah klip terakhir akan memindahkan penanda putar ke sana, dan klip yang ditaruh di penanda putar ikut ke sana. Jika aktif, penanda putar tidak pernah keluar dari konten.","settings.originalSource": "Sumber asli",diff --git a/src/crates/concat/locales/it.json b/src/crates/concat/locales/it.jsonindex 0b299f1f..5d627e60 100644--- a/src/crates/concat/locales/it.json+++ b/src/crates/concat/locales/it.json@@ -430,6 +430,8 @@"settings.automation": "Automazione","settings.checkForUpdates": "Cerca aggiornamenti","settings.checkingForUpdates": "Controllo in corso…",+ "settings.chooseFile": "Scegli file",+ "settings.chooseModelFile": "Scegli il file del modello scaricato","settings.concat": "Concat {0}","settings.concatsMirror": "Mirror di Concat","settings.copySystemInformation": "Copia informazioni di sistema",@@ -442,6 +444,16 @@"settings.default": "Predefinito","settings.deletingClipPullsWhat": "Attivo, eliminare una clip tira ciò che la segue sulla stessa traccia dentro lo spazio, e accorciare un bordo sposta con sé il resto della traccia. Disattivato, un'eliminazione lascia uno spazio e un accorciamento sposta solo il bordo. Maiusc-Elimina chiude lo spazio in ogni caso.","settings.download": "Scarica",+ "settings.downloadBlocked": "Qualcosa su questo computer ha impedito a Concat di accedere a internet: un firewall, un antivirus o una VPN. Consenti Concat lì, oppure scarica il file nel browser.",+ "settings.downloadCertificate": "La connessione sicura non era attendibile: qualcosa su questa rete la firma di nuovo.",+ "settings.downloadDns": "I server di download non sono stati trovati. La connessione potrebbe non funzionare, o la rete li blocca.",+ "settings.downloadFailed": "Il download non è riuscito.",+ "settings.downloadInBrowser": "Scarica nel browser",+ "settings.downloadNoAnswer": "I server di download non hanno risposto.",+ "settings.downloadOffline": "Questo computer non è connesso a internet.",+ "settings.downloadProxy": "Concat non è riuscito a connettersi tramite il proxy {0}. Controlla che sia in esecuzione.",+ "settings.downloadReset": "La connessione si è interrotta. La rete potrebbe bloccare i server di download.",+ "settings.downloadStatus": "I server di download hanno risposto con un errore (HTTP {0}).","settings.downloadingVersion": "Download di Concat {0}…","settings.downloads": "Download","settings.exposedAddressWarning": "Questo indirizzo è raggiungibile dalla rete. Qualunque cosa lo raggiunga con il token può leggere e scrivere file come te, e la connessione non è cifrata.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "Nessuna versione dalla 0.2.5 in poi è ancora uscita.","settings.notAnAddress": "{0} non è un indirizzo come 127.0.0.1:7420","settings.notFromPackage": "Questa build non è stata installata da un pacchetto, quindi non c'è nulla da mettere al suo posto.",+ "settings.notTheModelFile": "Quel file non è questo modello. Scaricalo di nuovo con il link.","settings.off": "Spento","settings.offClickRulerPast": "Off, a click on the ruler past the last clip lands the playhead there, and a clip placed at the playhead goes with it. On, the playhead never leaves the content.","settings.originalSource": "Fonte originale",diff --git a/src/crates/concat/locales/ja.json b/src/crates/concat/locales/ja.jsonindex a0371520..80fdb3e6 100644--- a/src/crates/concat/locales/ja.json+++ b/src/crates/concat/locales/ja.json@@ -430,6 +430,8 @@"settings.automation": "自動化","settings.checkForUpdates": "アップデートを確認","settings.checkingForUpdates": "確認中…",+ "settings.chooseFile": "ファイルを選択",+ "settings.chooseModelFile": "ダウンロードしたモデルファイルを選択","settings.concat": "Concat {0}","settings.concatsMirror": "Concat のミラー","settings.copySystemInformation": "システム情報をコピー",@@ -442,6 +444,16 @@"settings.default": "デフォルト","settings.deletingClipPullsWhat": "オンのとき、クリップを削除すると同じトラックの後続が隙間に引き寄せられ、端をトリミングするとトラックの残りも一緒に動きます。オフのとき、削除は隙間を残し、トリミングは端だけを動かします。Shift-Delete はどちらでも隙間を詰めます。","settings.download": "ダウンロード",+ "settings.downloadBlocked": "このコンピューター上の何か(ファイアウォール、ウイルス対策ソフト、VPN)が Concat のインターネット接続をブロックしました。そこで Concat を許可するか、ブラウザーでファイルをダウンロードしてください。",+ "settings.downloadCertificate": "安全な接続を信頼できませんでした。このネットワーク上の何かが再署名しています。",+ "settings.downloadDns": "ダウンロードサーバーが見つかりません。接続が切れているか、ネットワークがブロックしている可能性があります。",+ "settings.downloadFailed": "ダウンロードに失敗しました。",+ "settings.downloadInBrowser": "ブラウザーでダウンロード",+ "settings.downloadNoAnswer": "ダウンロードサーバーが応答しませんでした。",+ "settings.downloadOffline": "このコンピューターはインターネットに接続されていません。",+ "settings.downloadProxy": "プロキシ {0} 経由で接続できませんでした。プロキシが動作しているか確認してください。",+ "settings.downloadReset": "接続が切断されました。ネットワークがダウンロードサーバーをブロックしている可能性があります。",+ "settings.downloadStatus": "ダウンロードサーバーがエラーを返しました(HTTP {0})。","settings.downloadingVersion": "Concat {0} をダウンロード中…","settings.downloads": "ダウンロード","settings.exposedAddressWarning": "このアドレスにはネットワークから到達できます。トークンを持ってここに届くものは、あなたと同じようにファイルを読み書きでき、接続は暗号化されません。",@@ -479,6 +491,7 @@"settings.noReleasesYet": "0.2.5 以降のリリースはまだありません。","settings.notAnAddress": "{0} は 127.0.0.1:7420 のようなアドレスではありません","settings.notFromPackage": "このビルドはパッケージからインストールされていないため、入れ替えるものがありません。",+ "settings.notTheModelFile": "このファイルはこのモデルではありません。リンクからもう一度ダウンロードしてください。","settings.off": "オフ","settings.offClickRulerPast": "オフの場合、最後のクリップより先のルーラーをクリックすると再生ヘッドがそこへ移動し、再生ヘッドに置かれたクリップもそれに従います。オンの場合、再生ヘッドはコンテンツから離れません。","settings.originalSource": "元の配布元",diff --git a/src/crates/concat/locales/ko.json b/src/crates/concat/locales/ko.jsonindex 58ecf379..b2b888c5 100644--- a/src/crates/concat/locales/ko.json+++ b/src/crates/concat/locales/ko.json@@ -430,6 +430,8 @@"settings.automation": "자동화","settings.checkForUpdates": "업데이트 확인","settings.checkingForUpdates": "확인 중…",+ "settings.chooseFile": "파일 선택",+ "settings.chooseModelFile": "다운로드한 모델 파일 선택","settings.concat": "Concat {0}","settings.concatsMirror": "Concat 미러","settings.copySystemInformation": "시스템 정보 복사",@@ -442,6 +444,16 @@"settings.default": "기본","settings.deletingClipPullsWhat": "켜면 클립을 삭제할 때 같은 트랙의 뒤따르는 클립이 빈틈으로 당겨지고, 가장자리를 다듬으면 트랙의 나머지가 함께 움직입니다. 끄면 삭제는 빈틈을 남기고 다듬기는 가장자리만 움직입니다. Shift-Delete는 어느 쪽이든 빈틈을 닫습니다.","settings.download": "다운로드",+ "settings.downloadBlocked": "이 컴퓨터의 무언가(방화벽, 백신, VPN)가 Concat의 인터넷 연결을 막았습니다. 그곳에서 Concat을 허용하거나 브라우저에서 파일을 다운로드하세요.",+ "settings.downloadCertificate": "보안 연결을 신뢰할 수 없습니다. 이 네트워크의 무언가가 다시 서명하고 있습니다.",+ "settings.downloadDns": "다운로드 서버를 찾을 수 없습니다. 연결이 끊겼거나 네트워크가 차단하고 있을 수 있습니다.",+ "settings.downloadFailed": "다운로드에 실패했습니다.",+ "settings.downloadInBrowser": "브라우저에서 다운로드",+ "settings.downloadNoAnswer": "다운로드 서버가 응답하지 않았습니다.",+ "settings.downloadOffline": "이 컴퓨터가 인터넷에 연결되어 있지 않습니다.",+ "settings.downloadProxy": "프록시 {0}를 통해 연결할 수 없습니다. 프록시가 실행 중인지 확인하세요.",+ "settings.downloadReset": "연결이 끊겼습니다. 네트워크가 다운로드 서버를 차단하고 있을 수 있습니다.",+ "settings.downloadStatus": "다운로드 서버가 오류로 응답했습니다 (HTTP {0}).","settings.downloadingVersion": "Concat {0} 다운로드 중…","settings.downloads": "다운로드","settings.exposedAddressWarning": "이 주소는 네트워크에서 접근할 수 있습니다. 토큰을 가지고 접근하는 것은 무엇이든 사용자처럼 파일을 읽고 쓸 수 있으며, 연결은 암호화되지 않습니다.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "0.2.5 이후 릴리스가 아직 없습니다.","settings.notAnAddress": "{0}은(는) 127.0.0.1:7420 같은 주소가 아닙니다","settings.notFromPackage": "이 빌드는 패키지로 설치되지 않았으므로 대체할 것이 없습니다.",+ "settings.notTheModelFile": "이 파일은 이 모델이 아닙니다. 링크로 다시 다운로드하세요.","settings.off": "끔","settings.offClickRulerPast": "Off, a click on the ruler past the last clip lands the playhead there, and a clip placed at the playhead goes with it. On, the playhead never leaves the content.","settings.originalSource": "원본 출처",diff --git a/src/crates/concat/locales/nl.json b/src/crates/concat/locales/nl.jsonindex ee01f0f0..d27a5a96 100644--- a/src/crates/concat/locales/nl.json+++ b/src/crates/concat/locales/nl.json@@ -430,6 +430,8 @@"settings.automation": "Automatisering","settings.checkForUpdates": "Controleren op updates","settings.checkingForUpdates": "Controleren…",+ "settings.chooseFile": "Bestand kiezen",+ "settings.chooseModelFile": "Kies het gedownloade modelbestand","settings.concat": "Concat {0}","settings.concatsMirror": "Spiegelserver van Concat","settings.copySystemInformation": "Systeeminformatie kopiëren",@@ -442,6 +444,16 @@"settings.default": "Standaard","settings.deletingClipPullsWhat": "Aan: een clip verwijderen trekt wat erna komt op hetzelfde spoor de opening in, en een rand inkorten verschuift de rest van het spoor mee. Uit: verwijderen laat een opening achter en inkorten verplaatst alleen de rand. Shift-Delete sluit de opening hoe dan ook.","settings.download": "Downloaden",+ "settings.downloadBlocked": "Iets op deze computer hield Concat van internet: een firewall, antivirus of VPN. Sta Concat daar toe, of download het bestand in je browser.",+ "settings.downloadCertificate": "De beveiligde verbinding werd niet vertrouwd: iets op dit netwerk ondertekent haar opnieuw.",+ "settings.downloadDns": "De downloadservers zijn niet gevonden. De verbinding is misschien weg, of het netwerk blokkeert ze.",+ "settings.downloadFailed": "Het downloaden is mislukt.",+ "settings.downloadInBrowser": "Downloaden in browser",+ "settings.downloadNoAnswer": "De downloadservers gaven geen antwoord.",+ "settings.downloadOffline": "Deze computer is niet met internet verbonden.",+ "settings.downloadProxy": "Concat kon geen verbinding maken via de proxy {0}. Controleer of die draait.",+ "settings.downloadReset": "De verbinding werd verbroken. Het netwerk blokkeert misschien de downloadservers.",+ "settings.downloadStatus": "De downloadservers antwoordden met een fout (HTTP {0}).","settings.downloadingVersion": "Concat {0} downloaden…","settings.downloads": "Downloads","settings.exposedAddressWarning": "Dit adres is bereikbaar vanaf het netwerk. Alles wat het met het token bereikt, kan bestanden lezen en schrijven zoals jij, en de verbinding is niet versleuteld.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "Er is nog geen release vanaf 0.2.5 uit.","settings.notAnAddress": "{0} is geen adres zoals 127.0.0.1:7420","settings.notFromPackage": "Deze build is niet uit een pakket geïnstalleerd, dus er is niets om ervoor in de plaats te zetten.",+ "settings.notTheModelFile": "Dat bestand is niet dit model. Download het opnieuw via de link.","settings.off": "Uit","settings.offClickRulerPast": "Uit: een klik op de liniaal voorbij de laatste clip zet de afspeelkop daar neer, en een clip die bij de afspeelkop wordt geplaatst gaat mee. Aan: de afspeelkop verlaat nooit de inhoud.","settings.originalSource": "Oorspronkelijke bron",diff --git a/src/crates/concat/locales/pl.json b/src/crates/concat/locales/pl.jsonindex b1daa26b..b9d2d328 100644--- a/src/crates/concat/locales/pl.json+++ b/src/crates/concat/locales/pl.json@@ -430,6 +430,8 @@"settings.automation": "Automatyzacja","settings.checkForUpdates": "Sprawdź aktualizacje","settings.checkingForUpdates": "Sprawdzanie…",+ "settings.chooseFile": "Wybierz plik",+ "settings.chooseModelFile": "Wybierz pobrany plik modelu","settings.concat": "Concat {0}","settings.concatsMirror": "Serwer lustrzany Concat","settings.copySystemInformation": "Kopiuj informacje o systemie",@@ -442,6 +444,16 @@"settings.default": "Domyślny","settings.deletingClipPullsWhat": "Włączone: usunięcie klipu przyciąga do luki to, co następuje po nim na tej samej ścieżce, a przycięcie krawędzi przesuwa razem z nią resztę ścieżki. Wyłączone: usunięcie zostawia lukę, a przycięcie przesuwa tylko krawędź. Shift-Delete zamyka lukę w obu przypadkach.","settings.download": "Pobierz",+ "settings.downloadBlocked": "Coś na tym komputerze zablokowało Concat dostęp do internetu: zapora, antywirus lub VPN. Zezwól tam na Concat albo pobierz plik w przeglądarce.",+ "settings.downloadCertificate": "Bezpieczne połączenie nie było zaufane: coś w tej sieci podpisuje je ponownie.",+ "settings.downloadDns": "Nie znaleziono serwerów pobierania. Połączenie może nie działać albo sieć je blokuje.",+ "settings.downloadFailed": "Pobieranie nie powiodło się.",+ "settings.downloadInBrowser": "Pobierz w przeglądarce",+ "settings.downloadNoAnswer": "Serwery pobierania nie odpowiedziały.",+ "settings.downloadOffline": "Ten komputer nie jest połączony z internetem.",+ "settings.downloadProxy": "Concat nie mógł połączyć się przez serwer proxy {0}. Sprawdź, czy działa.",+ "settings.downloadReset": "Połączenie zostało przerwane. Sieć może blokować serwery pobierania.",+ "settings.downloadStatus": "Serwery pobierania odpowiedziały błędem (HTTP {0}).","settings.downloadingVersion": "Pobieranie Concat {0}…","settings.downloads": "Pobrane","settings.exposedAddressWarning": "Ten adres jest osiągalny z sieci. Wszystko, co dotrze do niego z tokenem, może czytać i zapisywać pliki tak jak Ty, a połączenie nie jest szyfrowane.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "Nie ma jeszcze żadnego wydania od 0.2.5.","settings.notAnAddress": "{0} nie jest adresem w rodzaju 127.0.0.1:7420","settings.notFromPackage": "Ta kompilacja nie została zainstalowana z pakietu, więc nie ma czym jej zastąpić.",+ "settings.notTheModelFile": "Ten plik nie jest tym modelem. Pobierz go ponownie z linku.","settings.off": "Wył.","settings.offClickRulerPast": "Wyłączone: kliknięcie linijki za ostatnim klipem ustawia tam głowicę odtwarzania, a klip umieszczony na głowicy trafia tam razem z nią. Włączone: głowica nigdy nie wychodzi poza zawartość.","settings.originalSource": "Oryginalne źródło",diff --git a/src/crates/concat/locales/pt-BR.json b/src/crates/concat/locales/pt-BR.jsonindex f5997eed..ed8a23e4 100644--- a/src/crates/concat/locales/pt-BR.json+++ b/src/crates/concat/locales/pt-BR.json@@ -430,6 +430,8 @@"settings.automation": "Automação","settings.checkForUpdates": "Verificar atualizações","settings.checkingForUpdates": "Verificando…",+ "settings.chooseFile": "Escolher arquivo",+ "settings.chooseModelFile": "Escolha o arquivo de modelo baixado","settings.concat": "Concat {0}","settings.concatsMirror": "Espelho do Concat","settings.copySystemInformation": "Copiar informações do sistema",@@ -442,6 +444,16 @@"settings.default": "Padrão","settings.deletingClipPullsWhat": "Ligado, excluir um clipe puxa o que vem depois dele na mesma faixa para a lacuna, e aparar uma borda move o resto da faixa junto. Desligado, uma exclusão deixa uma lacuna e um aparo move só a borda. Shift-Delete fecha a lacuna de qualquer jeito.","settings.download": "Baixar",+ "settings.downloadBlocked": "Algo neste computador impediu o Concat de acessar a internet: um firewall, antivírus ou VPN. Permita o Concat ali ou baixe o arquivo no navegador.",+ "settings.downloadCertificate": "A conexão segura não era confiável: algo nesta rede a assina de novo.",+ "settings.downloadDns": "Os servidores de download não foram encontrados. A conexão pode estar fora do ar, ou a rede os bloqueia.",+ "settings.downloadFailed": "O download falhou.",+ "settings.downloadInBrowser": "Baixar no navegador",+ "settings.downloadNoAnswer": "Os servidores de download não responderam.",+ "settings.downloadOffline": "Este computador não está conectado à internet.",+ "settings.downloadProxy": "O Concat não conseguiu se conectar pelo proxy {0}. Verifique se ele está em execução.",+ "settings.downloadReset": "A conexão foi interrompida. A rede pode estar bloqueando os servidores de download.",+ "settings.downloadStatus": "Os servidores de download responderam com um erro (HTTP {0}).","settings.downloadingVersion": "Baixando o Concat {0}…","settings.downloads": "Downloads","settings.exposedAddressWarning": "Este endereço fica acessível pela rede. Qualquer coisa que chegue a ele com o token pode ler e gravar arquivos como você, e a conexão não é criptografada.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "Ainda não há nenhuma versão a partir da 0.2.5.","settings.notAnAddress": "{0} não é um endereço como 127.0.0.1:7420","settings.notFromPackage": "Esta compilação não foi instalada a partir de um pacote, então não há o que colocar no lugar dela.",+ "settings.notTheModelFile": "Esse arquivo não é este modelo. Baixe-o de novo pelo link.","settings.off": "Desligado","settings.offClickRulerPast": "Desligado, um clique na régua depois do último clipe leva o cursor até lá, e um clipe colocado no cursor vai junto. Ligado, o cursor nunca sai do conteúdo.","settings.originalSource": "Fonte original",diff --git a/src/crates/concat/locales/ru.json b/src/crates/concat/locales/ru.jsonindex 1a763d44..1e8321d2 100644--- a/src/crates/concat/locales/ru.json+++ b/src/crates/concat/locales/ru.json@@ -430,6 +430,8 @@"settings.automation": "Автоматизация","settings.checkForUpdates": "Проверить обновления","settings.checkingForUpdates": "Проверка…",+ "settings.chooseFile": "Выбрать файл",+ "settings.chooseModelFile": "Выберите скачанный файл модели","settings.concat": "Concat {0}","settings.concatsMirror": "Зеркало Concat","settings.copySystemInformation": "Копировать сведения о системе",@@ -442,6 +444,16 @@"settings.default": "По умолчанию","settings.deletingClipPullsWhat": "Вкл: удаление клипа подтягивает всё, что идёт за ним на той же дорожке, в пробел, а подрезка края двигает остаток дорожки вместе с ним. Выкл: удаление оставляет пробел, подрезка двигает только край. Shift-Delete закрывает пробел в любом случае.","settings.download": "Скачать",+ "settings.downloadBlocked": "Что-то на этом компьютере закрыло Concat доступ в интернет: брандмауэр, антивирус или VPN. Разрешите там Concat или скачайте файл в браузере.",+ "settings.downloadCertificate": "Защищённому соединению нельзя доверять: что-то в этой сети подписывает его заново.",+ "settings.downloadDns": "Серверы загрузки не найдены. Возможно, нет соединения или сеть их блокирует.",+ "settings.downloadFailed": "Загрузка не удалась.",+ "settings.downloadInBrowser": "Скачать в браузере",+ "settings.downloadNoAnswer": "Серверы загрузки не ответили.",+ "settings.downloadOffline": "Этот компьютер не подключён к интернету.",+ "settings.downloadProxy": "Concat не смог подключиться через прокси {0}. Проверьте, что он запущен.",+ "settings.downloadReset": "Соединение оборвалось. Возможно, сеть блокирует серверы загрузки.",+ "settings.downloadStatus": "Серверы загрузки ответили ошибкой (HTTP {0}).","settings.downloadingVersion": "Загрузка Concat {0}…","settings.downloads": "Загрузки","settings.exposedAddressWarning": "Этот адрес доступен из сети. Всё, что доберётся до него с токеном, может читать и записывать файлы так же, как вы, а соединение не шифруется.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "Выпусков начиная с 0.2.5 пока нет.","settings.notAnAddress": "{0} — не адрес вида 127.0.0.1:7420","settings.notFromPackage": "Эта сборка установлена не из пакета, поэтому заменить её нечем.",+ "settings.notTheModelFile": "Этот файл — не эта модель. Скачайте его заново по ссылке.","settings.off": "Выкл","settings.offClickRulerPast": "Выкл: щелчок по линейке за последним клипом ставит курсор туда, и клип, поставленный по курсору, ляжет там же. Вкл: курсор никогда не выходит за содержимое.","settings.originalSource": "Исходный источник",diff --git a/src/crates/concat/locales/th.json b/src/crates/concat/locales/th.jsonindex 23226027..fbfcdb99 100644--- a/src/crates/concat/locales/th.json+++ b/src/crates/concat/locales/th.json@@ -430,6 +430,8 @@"settings.automation": "ระบบอัตโนมัติ","settings.checkForUpdates": "ตรวจหาอัปเดต","settings.checkingForUpdates": "กำลังตรวจสอบ…",+ "settings.chooseFile": "เลือกไฟล์",+ "settings.chooseModelFile": "เลือกไฟล์โมเดลที่ดาวน์โหลดแล้ว","settings.concat": "Concat {0}","settings.concatsMirror": "มิเรอร์ของ Concat","settings.copySystemInformation": "คัดลอกข้อมูลระบบ",@@ -442,6 +444,16 @@"settings.default": "ค่าเริ่มต้น","settings.deletingClipPullsWhat": "เมื่อเปิด การลบคลิปจะดึงสิ่งที่ตามมาในแทร็กเดียวกันเข้ามาปิดช่องว่าง และการทริมขอบจะเลื่อนส่วนที่เหลือของแทร็กไปด้วย เมื่อปิด การลบจะเหลือช่องว่างไว้และการทริมจะขยับเฉพาะขอบ Shift-Delete ปิดช่องว่างได้ทั้งสองแบบ","settings.download": "ดาวน์โหลด",+ "settings.downloadBlocked": "มีบางอย่างในคอมพิวเตอร์เครื่องนี้บล็อก Concat ไม่ให้เข้าอินเทอร์เน็ต เช่น ไฟร์วอลล์ แอนติไวรัส หรือ VPN อนุญาต Concat ในนั้น หรือดาวน์โหลดไฟล์ในเบราว์เซอร์",+ "settings.downloadCertificate": "การเชื่อมต่อที่ปลอดภัยไม่น่าเชื่อถือ มีบางอย่างในเครือข่ายนี้ลงนามใหม่",+ "settings.downloadDns": "ไม่พบเซิร์ฟเวอร์ดาวน์โหลด การเชื่อมต่ออาจขาด หรือเครือข่ายบล็อกไว้",+ "settings.downloadFailed": "ดาวน์โหลดไม่สำเร็จ",+ "settings.downloadInBrowser": "ดาวน์โหลดในเบราว์เซอร์",+ "settings.downloadNoAnswer": "เซิร์ฟเวอร์ดาวน์โหลดไม่ตอบสนอง",+ "settings.downloadOffline": "คอมพิวเตอร์เครื่องนี้ไม่ได้เชื่อมต่ออินเทอร์เน็ต",+ "settings.downloadProxy": "Concat เชื่อมต่อผ่านพร็อกซี {0} ไม่ได้ ตรวจสอบว่าพร็อกซีทำงานอยู่",+ "settings.downloadReset": "การเชื่อมต่อถูกตัด เครือข่ายอาจบล็อกเซิร์ฟเวอร์ดาวน์โหลด",+ "settings.downloadStatus": "เซิร์ฟเวอร์ดาวน์โหลดตอบกลับด้วยข้อผิดพลาด (HTTP {0})","settings.downloadingVersion": "กำลังดาวน์โหลด Concat {0}…","settings.downloads": "การดาวน์โหลด","settings.exposedAddressWarning": "ที่อยู่นี้เข้าถึงได้จากเครือข่าย สิ่งใดก็ตามที่เข้าถึงได้พร้อมโทเค็นจะอ่านและเขียนไฟล์ได้เหมือนคุณ และการเชื่อมต่อไม่ได้เข้ารหัส",@@ -479,6 +491,7 @@"settings.noReleasesYet": "ยังไม่มีรุ่นตั้งแต่ 0.2.5 ขึ้นไป","settings.notAnAddress": "{0} ไม่ใช่ที่อยู่แบบ 127.0.0.1:7420","settings.notFromPackage": "บิลด์นี้ไม่ได้ติดตั้งจากแพ็กเกจ จึงไม่มีอะไรให้ใส่แทน",+ "settings.notTheModelFile": "ไฟล์นั้นไม่ใช่โมเดลนี้ ดาวน์โหลดอีกครั้งจากลิงก์","settings.off": "ปิด","settings.offClickRulerPast": "เมื่อปิด การคลิกบนไม้บรรทัดเลยคลิปสุดท้ายจะย้ายหัวเล่นไปตรงนั้น และคลิปที่วางที่หัวเล่นก็จะไปตรงนั้นด้วย เมื่อเปิด หัวเล่นจะไม่ออกนอกเนื้อหา","settings.originalSource": "แหล่งต้นฉบับ",diff --git a/src/crates/concat/locales/tr.json b/src/crates/concat/locales/tr.jsonindex 8f0f9c23..fa5c19e2 100644--- a/src/crates/concat/locales/tr.json+++ b/src/crates/concat/locales/tr.json@@ -430,6 +430,8 @@"settings.automation": "Otomasyon","settings.checkForUpdates": "Güncellemeleri denetle","settings.checkingForUpdates": "Denetleniyor…",+ "settings.chooseFile": "Dosya seç",+ "settings.chooseModelFile": "İndirilen model dosyasını seçin","settings.concat": "Concat {0}","settings.concatsMirror": "Concat yansısı","settings.copySystemInformation": "Sistem bilgilerini kopyala",@@ -442,6 +444,16 @@"settings.default": "Varsayılan","settings.deletingClipPullsWhat": "Açıkken bir klibi silmek aynı parçada onu izleyenleri boşluğa çeker ve bir kenarı kırpmak parçanın geri kalanını da onunla taşır. Kapalıyken silme bir boşluk bırakır ve kırpma yalnızca kenarı taşır. Shift-Delete her iki durumda da boşluğu kapatır.","settings.download": "İndir",+ "settings.downloadBlocked": "Bu bilgisayardaki bir şey Concat'in internete erişimini engelledi: bir güvenlik duvarı, virüsten koruma ya da VPN. Orada Concat'e izin verin veya dosyayı tarayıcınızda indirin.",+ "settings.downloadCertificate": "Güvenli bağlantıya güvenilmedi: bu ağdaki bir şey onu yeniden imzalıyor.",+ "settings.downloadDns": "İndirme sunucuları bulunamadı. Bağlantı kopmuş olabilir ya da ağ onları engelliyor.",+ "settings.downloadFailed": "İndirme başarısız oldu.",+ "settings.downloadInBrowser": "Tarayıcıda indir",+ "settings.downloadNoAnswer": "İndirme sunucuları yanıt vermedi.",+ "settings.downloadOffline": "Bu bilgisayar internete bağlı değil.",+ "settings.downloadProxy": "Concat {0} proxy'si üzerinden bağlanamadı. Çalıştığını denetleyin.",+ "settings.downloadReset": "Bağlantı kesildi. Ağ indirme sunucularını engelliyor olabilir.",+ "settings.downloadStatus": "İndirme sunucuları bir hatayla yanıt verdi (HTTP {0}).","settings.downloadingVersion": "Concat {0} indiriliyor…","settings.downloads": "İndirmeler","settings.exposedAddressWarning": "Bu adrese ağdan erişilebilir. Belirteçle ona ulaşan her şey dosyaları sizin gibi okuyup yazabilir ve bağlantı şifrelenmez.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "0.2.5 ve sonrası için henüz bir sürüm yok.","settings.notAnAddress": "{0}, 127.0.0.1:7420 gibi bir adres değil","settings.notFromPackage": "Bu yapı bir paketten yüklenmedi, dolayısıyla yerine konacak bir şey yok.",+ "settings.notTheModelFile": "Bu dosya bu model değil. Bağlantıyla yeniden indirin.","settings.off": "Kapalı","settings.offClickRulerPast": "Off, a click on the ruler past the last clip lands the playhead there, and a clip placed at the playhead goes with it. On, the playhead never leaves the content.","settings.originalSource": "Özgün kaynak",diff --git a/src/crates/concat/locales/uk.json b/src/crates/concat/locales/uk.jsonindex 5eb91ddf..22aee221 100644--- a/src/crates/concat/locales/uk.json+++ b/src/crates/concat/locales/uk.json@@ -430,6 +430,8 @@"settings.automation": "Автоматизація","settings.checkForUpdates": "Перевірити оновлення","settings.checkingForUpdates": "Перевірка…",+ "settings.chooseFile": "Вибрати файл",+ "settings.chooseModelFile": "Виберіть завантажений файл моделі","settings.concat": "Concat {0}","settings.concatsMirror": "Дзеркало Concat","settings.copySystemInformation": "Копіювати відомості про систему",@@ -442,6 +444,16 @@"settings.default": "Стандартний","settings.deletingClipPullsWhat": "Увімкнено: видалення кліпу підтягує в проміжок усе, що йде за ним на тій самій доріжці, а обрізання краю зсуває разом із ним решту доріжки. Вимкнено: видалення залишає проміжок, а обрізання зсуває лише край. Shift-Delete закриває проміжок у будь-якому разі.","settings.download": "Завантажити",+ "settings.downloadBlocked": "Щось на цьому комп'ютері закрило Concat доступ до інтернету: брандмауер, антивірус або VPN. Дозвольте там Concat або завантажте файл у браузері.",+ "settings.downloadCertificate": "Захищеному з'єднанню не можна довіряти: щось у цій мережі підписує його заново.",+ "settings.downloadDns": "Сервери завантаження не знайдено. Можливо, немає з'єднання або мережа їх блокує.",+ "settings.downloadFailed": "Завантаження не вдалося.",+ "settings.downloadInBrowser": "Завантажити в браузері",+ "settings.downloadNoAnswer": "Сервери завантаження не відповіли.",+ "settings.downloadOffline": "Цей комп'ютер не під'єднано до інтернету.",+ "settings.downloadProxy": "Concat не зміг під'єднатися через проксі {0}. Перевірте, чи він запущений.",+ "settings.downloadReset": "З'єднання обірвалося. Можливо, мережа блокує сервери завантаження.",+ "settings.downloadStatus": "Сервери завантаження відповіли помилкою (HTTP {0}).","settings.downloadingVersion": "Завантаження Concat {0}…","settings.downloads": "Завантаження","settings.exposedAddressWarning": "Ця адреса доступна з мережі. Усе, що дістанеться до неї з токеном, може читати й записувати файли так само, як ви, а з’єднання не шифрується.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "Жодного випуску від 0.2.5 ще немає.","settings.notAnAddress": "{0} — не адреса на кшталт 127.0.0.1:7420","settings.notFromPackage": "Цю збірку встановлено не з пакета, тож нічим її замінити.",+ "settings.notTheModelFile": "Цей файл — не ця модель. Завантажте його знову за посиланням.","settings.off": "Вимк.","settings.offClickRulerPast": "Вимкнено: клацання по лінійці за останнім кліпом ставить туди курсор відтворення, і кліп, доданий на курсорі, потрапляє туди ж. Увімкнено: курсор ніколи не виходить за межі вмісту.","settings.originalSource": "Оригінальне джерело",diff --git a/src/crates/concat/locales/ur.json b/src/crates/concat/locales/ur.jsonindex 36bcb5ba..fa768817 100644--- a/src/crates/concat/locales/ur.json+++ b/src/crates/concat/locales/ur.json@@ -430,6 +430,8 @@"settings.automation": "آٹومیشن","settings.checkForUpdates": "اپ ڈیٹس چیک کریں","settings.checkingForUpdates": "چیک ہو رہا ہے…",+ "settings.chooseFile": "فائل منتخب کریں",+ "settings.chooseModelFile": "ڈاؤن لوڈ کی گئی ماڈل فائل منتخب کریں","settings.concat": "Concat {0}","settings.concatsMirror": "Concat کا مرر","settings.copySystemInformation": "سسٹم کی معلومات کاپی کریں",@@ -442,6 +444,16 @@"settings.default": "طے شدہ","settings.deletingClipPullsWhat": "آن ہونے پر، کلپ حذف کرنے سے اسی ٹریک پر اس کے بعد والا حصہ خالی جگہ میں کھنچ آتا ہے، اور کنارہ ٹرم کرنے سے باقی ٹریک بھی ساتھ سرکتا ہے۔ آف ہونے پر، حذف خالی جگہ چھوڑ دیتا ہے اور ٹرم صرف کنارہ ہلاتا ہے۔ Shift-Delete دونوں صورتوں میں خالی جگہ بند کر دیتا ہے۔","settings.download": "ڈاؤن لوڈ کریں",+ "settings.downloadBlocked": "اس کمپیوٹر پر کسی چیز نے Concat کو انٹرنیٹ سے روک دیا: فائر وال، اینٹی وائرس یا VPN۔ وہاں Concat کو اجازت دیں، یا فائل اپنے براؤزر میں ڈاؤن لوڈ کریں۔",+ "settings.downloadCertificate": "محفوظ کنکشن پر بھروسا نہیں کیا گیا: اس نیٹ ورک پر کوئی چیز اسے دوبارہ دستخط کرتی ہے۔",+ "settings.downloadDns": "ڈاؤن لوڈ سرور نہیں ملے۔ ہو سکتا ہے کنکشن منقطع ہو، یا نیٹ ورک انہیں روک رہا ہو۔",+ "settings.downloadFailed": "ڈاؤن لوڈ ناکام ہو گیا۔",+ "settings.downloadInBrowser": "براؤزر میں ڈاؤن لوڈ کریں",+ "settings.downloadNoAnswer": "ڈاؤن لوڈ سرورز نے جواب نہیں دیا۔",+ "settings.downloadOffline": "یہ کمپیوٹر انٹرنیٹ سے منسلک نہیں ہے۔",+ "settings.downloadProxy": "Concat پراکسی {0} کے ذریعے منسلک نہیں ہو سکا۔ دیکھیں کہ وہ چل رہی ہے۔",+ "settings.downloadReset": "کنکشن کٹ گیا۔ ہو سکتا ہے نیٹ ورک ڈاؤن لوڈ سرورز کو روک رہا ہو۔",+ "settings.downloadStatus": "ڈاؤن لوڈ سرورز نے خرابی کے ساتھ جواب دیا (HTTP {0})۔","settings.downloadingVersion": "Concat {0} ڈاؤن لوڈ ہو رہا ہے…","settings.downloads": "ڈاؤن لوڈز","settings.exposedAddressWarning": "یہ پتہ نیٹ ورک سے قابلِ رسائی ہے۔ ٹوکن کے ساتھ یہاں پہنچنے والی کوئی بھی چیز آپ کی طرح فائلیں پڑھ اور لکھ سکتی ہے، اور کنکشن خفیہ کاری شدہ نہیں۔",@@ -479,6 +491,7 @@"settings.noReleasesYet": "0.2.5 یا اس کے بعد کا کوئی ورژن ابھی جاری نہیں ہوا۔","settings.notAnAddress": "{0} پتہ نہیں ہے؛ پتہ 127.0.0.1:7420 جیسا ہوتا ہے","settings.notFromPackage": "یہ بلڈ کسی پیکج سے انسٹال نہیں ہوا، اس لیے اس کی جگہ رکھنے کو کچھ نہیں۔",+ "settings.notTheModelFile": "یہ فائل یہ ماڈل نہیں ہے۔ لنک سے اسے دوبارہ ڈاؤن لوڈ کریں۔","settings.off": "بند","settings.offClickRulerPast": "آف ہونے پر، آخری کلپ سے آگے رولر پر کلک پلے ہیڈ کو وہیں لے جاتا ہے، اور پلے ہیڈ پر رکھا کلپ بھی وہیں جاتا ہے۔ آن ہونے پر، پلے ہیڈ کبھی مواد سے باہر نہیں جاتا۔","settings.originalSource": "اصل ماخذ",diff --git a/src/crates/concat/locales/vi.json b/src/crates/concat/locales/vi.jsonindex 57473d46..a88ae514 100644--- a/src/crates/concat/locales/vi.json+++ b/src/crates/concat/locales/vi.json@@ -430,6 +430,8 @@"settings.automation": "Tự động hóa","settings.checkForUpdates": "Kiểm tra cập nhật","settings.checkingForUpdates": "Đang kiểm tra…",+ "settings.chooseFile": "Chọn tệp",+ "settings.chooseModelFile": "Chọn tệp mô hình đã tải","settings.concat": "Concat {0}","settings.concatsMirror": "Máy chủ nhân bản của Concat","settings.copySystemInformation": "Sao chép thông tin hệ thống",@@ -442,6 +444,16 @@"settings.default": "Mặc định","settings.deletingClipPullsWhat": "Khi bật, xóa clip sẽ kéo phần phía sau trên cùng đường dẫn vào chỗ trống; cắt mép cũng dịch chuyển phần còn lại của đường dẫn. Khi tắt, thao tác xóa để lại khoảng trống và cắt chỉ di chuyển mép clip. Shift-Delete sẽ đóng khoảng trống trong cả hai trường hợp.","settings.download": "Tải xuống",+ "settings.downloadBlocked": "Có thứ gì đó trên máy tính này đã chặn Concat truy cập internet: tường lửa, phần mềm diệt virus hoặc VPN. Hãy cho phép Concat ở đó, hoặc tải tệp bằng trình duyệt.",+ "settings.downloadCertificate": "Kết nối bảo mật không đáng tin: có thứ gì đó trên mạng này ký lại nó.",+ "settings.downloadDns": "Không tìm thấy máy chủ tải xuống. Có thể kết nối bị mất, hoặc mạng đang chặn chúng.",+ "settings.downloadFailed": "Tải xuống thất bại.",+ "settings.downloadInBrowser": "Tải bằng trình duyệt",+ "settings.downloadNoAnswer": "Máy chủ tải xuống không phản hồi.",+ "settings.downloadOffline": "Máy tính này chưa kết nối internet.",+ "settings.downloadProxy": "Concat không thể kết nối qua proxy {0}. Hãy kiểm tra xem nó có đang chạy không.",+ "settings.downloadReset": "Kết nối bị cắt. Có thể mạng đang chặn máy chủ tải xuống.",+ "settings.downloadStatus": "Máy chủ tải xuống trả về lỗi (HTTP {0}).","settings.downloadingVersion": "Đang tải Concat {0}…","settings.downloads": "Tải xuống","settings.exposedAddressWarning": "Địa chỉ này có thể truy cập qua mạng. Bất cứ thứ gì tới được nó cùng mã thông báo đều có thể đọc và ghi tệp như bạn, và kết nối không được mã hóa.",@@ -479,6 +491,7 @@"settings.noReleasesYet": "Chưa có bản phát hành nào từ 0.2.5 trở đi.","settings.notAnAddress": "{0} không phải địa chỉ dạng 127.0.0.1:7420","settings.notFromPackage": "Bản dựng này không được cài đặt từ gói, nên không có gì để thay thế.",+ "settings.notTheModelFile": "Tệp đó không phải mô hình này. Hãy tải lại bằng liên kết.","settings.off": "Tắt","settings.offClickRulerPast": "Khi tắt, nhấp vào thước sau clip cuối sẽ đặt đầu phát tại đó và clip thêm vào sẽ theo đầu phát. Khi bật, đầu phát không thể vượt ra ngoài phần nội dung.","settings.originalSource": "Nguồn gốc",diff --git a/src/crates/concat/locales/zh-Hans.json b/src/crates/concat/locales/zh-Hans.jsonindex 82ceb675..8988c5f1 100644--- a/src/crates/concat/locales/zh-Hans.json+++ b/src/crates/concat/locales/zh-Hans.json@@ -430,6 +430,8 @@"settings.automation": "自动化","settings.checkForUpdates": "检查更新","settings.checkingForUpdates": "正在检查…",+ "settings.chooseFile": "选择文件",+ "settings.chooseModelFile": "选择已下载的模型文件","settings.concat": "Concat {0}","settings.concatsMirror": "Concat 镜像","settings.copySystemInformation": "复制系统信息",@@ -442,6 +444,16 @@"settings.default": "默认","settings.deletingClipPullsWhat": "开启时,删除片段会把同一轨道上其后的内容拉进空隙,修剪边缘时轨道上的其余内容也随之移动。关闭时,删除会留下空隙,修剪只移动边缘。无论开关与否,Shift-Delete 都会合拢空隙。","settings.download": "下载",+ "settings.downloadBlocked": "这台电脑上的某个程序(防火墙、杀毒软件或 VPN)阻止了 Concat 访问网络。请在其中允许 Concat,或在浏览器中下载该文件。",+ "settings.downloadCertificate": "安全连接不受信任:此网络上有程序在重新签名连接。",+ "settings.downloadDns": "找不到下载服务器。可能是网络断开,或网络屏蔽了它们。",+ "settings.downloadFailed": "下载失败。",+ "settings.downloadInBrowser": "在浏览器中下载",+ "settings.downloadNoAnswer": "下载服务器没有响应。",+ "settings.downloadOffline": "这台电脑没有连接到互联网。",+ "settings.downloadProxy": "Concat 无法通过代理 {0} 连接。请确认代理正在运行。",+ "settings.downloadReset": "连接被中断。网络可能屏蔽了下载服务器。",+ "settings.downloadStatus": "下载服务器返回了错误(HTTP {0})。","settings.downloadingVersion": "正在下载 Concat {0}…","settings.downloads": "下载项","settings.exposedAddressWarning": "此地址可从网络访问。任何带着令牌访问它的程序都能像你一样读写文件,且连接未加密。",@@ -479,6 +491,7 @@"settings.noReleasesYet": "0.2.5 及之后的版本尚未发布。","settings.notAnAddress": "{0} 不是类似 127.0.0.1:7420 的地址","settings.notFromPackage": "此构建并非从软件包安装,因此没有可替换的内容。",+ "settings.notTheModelFile": "该文件不是这个模型。请通过链接重新下载。","settings.off": "关","settings.offClickRulerPast": "关闭时,在标尺上点击最后一个片段之后的位置,播放头会停在那里,放置在播放头处的片段也随之落在该处。开启时,播放头始终不会离开内容范围。","settings.originalSource": "原始来源",diff --git a/src/crates/concat/locales/zh-TW.json b/src/crates/concat/locales/zh-TW.jsonindex 9cd0736b..a1ef1bb8 100644--- a/src/crates/concat/locales/zh-TW.json+++ b/src/crates/concat/locales/zh-TW.json@@ -430,6 +430,8 @@"settings.automation": "自動化","settings.checkForUpdates": "檢查更新","settings.checkingForUpdates": "正在檢查…",+ "settings.chooseFile": "選擇檔案",+ "settings.chooseModelFile": "選擇已下載的模型檔案","settings.concat": "Concat {0}","settings.concatsMirror": "Concat 鏡像","settings.copySystemInformation": "拷貝系統資訊",@@ -442,6 +444,16 @@"settings.default": "預設","settings.deletingClipPullsWhat": "開啟時,刪除片段會把同一軌道上其後的內容拉進空隙,修剪邊緣時軌道上的其餘內容也隨之移動。關閉時,刪除會留下空隙,修剪只移動邊緣。無論開關與否,Shift-Delete 都會閉合空隙。","settings.download": "下載",+ "settings.downloadBlocked": "這台電腦上的某個程式(防火牆、防毒軟體或 VPN)阻擋了 Concat 連上網路。請在其中允許 Concat,或在瀏覽器中下載該檔案。",+ "settings.downloadCertificate": "安全連線不受信任:此網路上有程式重新簽署連線。",+ "settings.downloadDns": "找不到下載伺服器。可能是網路中斷,或網路封鎖了它們。",+ "settings.downloadFailed": "下載失敗。",+ "settings.downloadInBrowser": "在瀏覽器中下載",+ "settings.downloadNoAnswer": "下載伺服器沒有回應。",+ "settings.downloadOffline": "這台電腦沒有連上網際網路。",+ "settings.downloadProxy": "Concat 無法透過代理伺服器 {0} 連線。請確認它正在執行。",+ "settings.downloadReset": "連線被中斷。網路可能封鎖了下載伺服器。",+ "settings.downloadStatus": "下載伺服器回傳了錯誤(HTTP {0})。","settings.downloadingVersion": "正在下載 Concat {0}…","settings.downloads": "下載","settings.exposedAddressWarning": "此位址可從網路存取。任何帶著權杖存取它的程式都能像你一樣讀寫檔案,且連線未加密。",@@ -479,6 +491,7 @@"settings.noReleasesYet": "0.2.5 之後的版本尚未發布。","settings.notAnAddress": "{0} 不是類似 127.0.0.1:7420 的位址","settings.notFromPackage": "此建置並非從套件安裝,因此沒有可取代的內容。",+ "settings.notTheModelFile": "該檔案不是這個模型。請透過連結重新下載。","settings.off": "關","settings.offClickRulerPast": "關閉時,在尺標上點按最後一個片段之後的位置,播放磁頭會停在該處,放置於播放磁頭的片段也隨之落在該處。開啟時,播放磁頭永遠不會離開內容範圍。","settings.originalSource": "原始來源",diff --git a/src/crates/concat/src/lib.rs b/src/crates/concat/src/lib.rsindex bde68ec0..600b0f26 100644--- a/src/crates/concat/src/lib.rs+++ b/src/crates/concat/src/lib.rs@@ -2133,6 +2133,12 @@ fn start(project: Option<std::path::PathBuf>, smoke: bool) -> Result<(), slint::app.on_model_remove(on_window!(|state, id: SharedString| {state.handle(Msg::Settings(SettingsMsg::ModelRemove(id.to_string())));}));+ app.on_model_open_link(on_window!(|state, id: SharedString| {+ state.handle(Msg::Settings(SettingsMsg::ModelOpenLink(id.to_string())));+ }));+ app.on_model_choose_file(on_window!(|state, id: SharedString| {+ state.handle(Msg::Settings(SettingsMsg::ModelChooseFile(id.to_string())));+ }));// ── the tray's sound and word tools ──// The tray's panel buttons are toggles: a press opens the panel, ordiff --git a/src/crates/concat/src/panes/settings.rs b/src/crates/concat/src/panes/settings.rsindex 7d68d146..42bdbc6c 100644--- a/src/crates/concat/src/panes/settings.rs+++ b/src/crates/concat/src/panes/settings.rs@@ -76,6 +76,16 @@ pub enum SettingsMsg {ModelDownload(String),ModelCancel(String),ModelRemove(String),+ /// A failed download's way round: open the model's first source in+ /// the browser, which the network may let through where it did not+ /// let Concat ...+ ModelOpenLink(String),+ /// ... and install the file that browser saved, once it is picked.+ ModelChooseFile(String),+ ModelChosen {+ id: String,+ path: std::path::PathBuf,+ },/// A download's worker reporting where it is.ModelProgress {id: String,@@ -130,6 +140,9 @@ pub struct ModelState {/// Megabytes fetched so far while a download runs.pub fetched: Option<f32>,pub unpacking: bool,+ /// Why the last download failed, when it failed for a reason the row+ /// can say and offer a way round.+ pub failure: Option<concat_host::models::Failure>,}impl ModelState {@@ -161,10 +174,49 @@ impl ModelState {.into()},eta: SharedString::new(),+ problem: self+ .failure+ .as_ref()+ .map(failure_line)+ .unwrap_or_default()+ .into(),+ manual: self.failure.is_some() && model_sources(&self.id).is_some(),}}}+/// What model `id` is called as a file and where it is downloaded from,+/// whichever list it is on; `None` for one that cannot be installed from+/// a single file.+fn model_sources(id: &str) -> Option<(String, Vec<String>)> {+ concat_speech::Transcriber::model_sources(id)+ .or_else(|| concat_speech::Speech::model_sources(id))+}++/// A failed download, as the row under the model says it.+fn failure_line(failure: &concat_host::models::Failure) -> String {+ use concat_host::models::Failure;+ use concat_host::net::Cause;++ match failure {+ Failure::NotTheFile => t("settings.notTheModelFile"),+ Failure::Unreachable { cause, proxy } => match cause {+ Cause::Blocked => t("settings.downloadBlocked"),+ Cause::Offline => t("settings.downloadOffline"),+ Cause::Dns => t("settings.downloadDns"),+ Cause::Proxy => tf(+ "settings.downloadProxy",+ &[&proxy.as_deref().unwrap_or_default()],+ ),+ Cause::Certificate => t("settings.downloadCertificate"),+ Cause::Reset => t("settings.downloadReset"),+ Cause::Refused | Cause::Timeout => t("settings.downloadNoAnswer"),+ Cause::Status(code) => tf("settings.downloadStatus", &[code]),+ Cause::Other => t("settings.downloadFailed"),+ },+ }+}+/// The models of a kind that are on disk, in the settings' order: the/// rows of a sheet's model list.pub fn installed(models: &[ModelState]) -> Vec<&ModelState> {@@ -386,6 +438,33 @@ impl SettingsPane {self.refresh(studio);}SettingsMsg::ModelDownload(id) => self.download(&id, studio),+ SettingsMsg::ModelOpenLink(id) => {+ if let Some(url) = model_sources(&id).and_then(|(_, urls)| urls.into_iter().next())+ && let Err(error) = platform::open_link(&url)+ {+ studio.notify(&error, true);+ }+ }+ SettingsMsg::ModelChooseFile(id) => {+ crate::host::pick_files_then(+ t("settings.chooseModelFile"),+ None,+ move |studio, _, _, paths| {+ if let Some(path) = paths.into_iter().next() {+ studio.handle(Msg::Settings(SettingsMsg::ModelChosen { id, path }));+ }+ },+ );+ }+ // The file goes the way a download does - into the model's+ // partial, checked against the digest, unpacked if it is an+ // archive - so a wrong file is refused the same way.+ SettingsMsg::ModelChosen { id, path } => {+ if let Some((file, _)) = model_sources(&id) {+ concat_host::models::supply(&file, path);+ self.download(&id, studio);+ }+ }SettingsMsg::ModelCancel(id) => {if self.is_transcriber(&id) {studio.host.transcriber.cancel_download();@@ -419,9 +498,16 @@ impl SettingsPane {}}SettingsMsg::ModelFinished { id, result } => {+ // The host's account of a failed fetch, when it was the+ // network or the file and not a cancel or the disk.+ let failure = result.as_ref().err().and_then(|_| {+ model_sources(&id)+ .and_then(|(file, _)| concat_host::models::last_failure(&file))+ });if let Some(model) = self.model_mut(&id) {model.fetched = None;model.unpacking = false;+ model.failure = failure.clone();}match result {Ok(()) => {@@ -433,7 +519,10 @@ impl SettingsPane {}studio.prefs.save(&studio.host.dirs);}- Err(error) => studio.notify(&error, true),+ Err(error) => match &failure {+ Some(failure) => studio.notify(&failure_line(failure), true),+ None => studio.notify(&error, true),+ },}self.refresh(studio);}@@ -703,6 +792,12 @@ impl SettingsPane {.filter(|model| model.fetched.is_some()).map(|model| (model.id.clone(), (model.fetched, model.unpacking))).collect();+ let failed: HashMap<String, concat_host::models::Failure> = self+ .transcribers+ .iter()+ .chain(self.voices.iter())+ .filter_map(|model| Some((model.id.clone(), model.failure.clone()?)))+ .collect();let chosen_transcriber = studio.prefs.transcriber_model.clone();let chosen_voice = studio.prefs.tts_model.clone();if let Ok(status) = concat_speech::Transcriber::status(dirs) {@@ -728,6 +823,7 @@ impl SettingsPane {active: chosen_transcriber.as_deref() == Some(model.id.as_str()),fetched,unpacking,+ failure: failed.get(&model.id).cloned(),}}).collect();@@ -750,6 +846,7 @@ impl SettingsPane {active: chosen_voice.as_deref() == Some(model.id.as_str()),fetched,unpacking,+ failure: failed.get(&model.id).cloned(),}}).collect();@@ -786,6 +883,7 @@ impl SettingsPane {return;}model.fetched = Some(0.0);+ model.failure = None;let id = id.to_owned();let dirs = studio.host.dirs.clone();let whisper = Arc::clone(&studio.host.transcriber);@@ -1016,11 +1114,52 @@ mod tests {active: true,fetched: Some(50.0),unpacking: false,+ failure: None,};let row = model.row();assert!(row.downloading);assert!(!row.active, "a model that is not installed is not active");assert!((row.progress - 0.25).abs() < 1e-6);+ assert!(row.problem.is_empty() && !row.manual);+ }++ #[test]+ fn a_failed_download_says_why_and_offers_the_way_round() {+ use concat_host::models::Failure;+ use concat_host::net::Cause;++ let failed = |id: &str, failure| ModelState {+ id: id.into(),+ name: id.into(),+ note: String::new(),+ megabytes: 75.0,+ accuracy: 2,+ installed: false,+ active: false,+ fetched: None,+ unpacking: false,+ failure: Some(failure),+ };+ let blocked = Failure::Unreachable {+ cause: Cause::Blocked,+ proxy: None,+ };+ let row = failed("tiny", blocked.clone()).row();+ assert_eq!(row.problem.as_str(), t("settings.downloadBlocked"));+ assert!(row.manual, "a whisper model is one file, so it can be chosen");+ let row = failed("no-such-model", blocked).row();+ assert!(!row.problem.is_empty());+ assert!(!row.manual, "nothing to download it from, nothing to choose");+ let proxy = Failure::Unreachable {+ cause: Cause::Proxy,+ proxy: Some("127.0.0.1:7890".into()),+ };+ assert!(failure_line(&proxy).contains("127.0.0.1:7890"));+ assert!(failure_line(&Failure::Unreachable {+ cause: Cause::Status(404),+ proxy: None+ })+ .contains("404"));}#[test]@@ -1035,6 +1174,7 @@ mod tests {active: false,fetched: None,unpacking: false,+ failure: None,};let list = [model("a", true), model("b", false), model("c", true)];let ids: Vec<&str> = installed(&list).iter().map(|m| m.id.as_str()).collect();diff --git a/src/crates/concat/ui/app.slint b/src/crates/concat/ui/app.slintindex ccf82ed7..2e48e1a1 100644--- a/src/crates/concat/ui/app.slint+++ b/src/crates/concat/ui/app.slint@@ -402,6 +402,8 @@ export component App inherits Window {callback model-download(id: string);callback model-cancel(id: string);callback model-remove(id: string);+ callback model-open-link(id: string);+ callback model-choose-file(id: string);callback open-settings();callback export-clicked();@@ -1033,6 +1035,8 @@ export component App inherits Window {model-download(id) => { root.model-download(id); }model-cancel(id) => { root.model-cancel(id); }model-remove(id) => { root.model-remove(id); }+ model-open-link(id) => { root.model-open-link(id); }+ model-choose-file(id) => { root.model-choose-file(id); }}in property <RelinkData> relink;diff --git a/src/crates/concat/ui/dialogs/settings.slint b/src/crates/concat/ui/dialogs/settings.slintindex c1177b16..97ca7075 100644--- a/src/crates/concat/ui/dialogs/settings.slint+++ b/src/crates/concat/ui/dialogs/settings.slint@@ -39,6 +39,11 @@ export struct ModelData {/// "42 MB of 142 MB · 3.1 MB/s"transferred: string,eta: string,+ /// why the last download failed, in a sentence; "" when it did not+ problem: string,+ /// the failure can be got round: the model is one file, which the+ /// browser can fetch and the row can take+ manual: bool,}/// One line of the system report: what it is called, and what it says.@@ -201,6 +206,8 @@ component ModelRow inherits Rectangle {callback download();callback cancel();callback remove();+ callback open-link();+ callback choose-file();border-radius: Theme.r;border-width: 1px;@@ -340,6 +347,41 @@ component ModelRow inherits Rectangle {}}}++ // A download that failed says why under the name, and - when the+ // model is one file - offers the way round a network that lets the+ // browser through and not Concat: fetch it there, then hand the+ // file over. Download stays the retry.+ if root.model.problem != "" && !root.model.downloading && !root.model.installed: VerticalLayout {+ padding-left: 26px;+ spacing: 8px;++ Text {+ text: root.model.problem;+ color: Theme.danger;+ font-size: Theme.fs-sm;+ wrap: word-wrap;+ }++ if root.model.manual: HorizontalLayout {+ spacing: 6px;+ alignment: start;++ Button {+ label: I18n.t("settings.downloadInBrowser");+ glyph: Glyph.arrow-up-right;+ ghost: true;+ clicked => { root.open-link(); }+ }++ Button {+ label: I18n.t("settings.chooseFile");+ glyph: Glyph.folder;+ ghost: true;+ clicked => { root.choose-file(); }+ }+ }+ }}}@@ -639,6 +681,8 @@ export component SettingsDialog inherits Modal {callback model-download(id: string);callback model-cancel(id: string);callback model-remove(id: string);+ callback model-open-link(id: string);+ callback model-choose-file(id: string);/// The Shortcuts page: a row asked for the next keys it should be/// bound to, one row put back as it ships, and all of them put back.callback shortcut-capture(id: string);@@ -1187,6 +1231,8 @@ export component SettingsDialog inherits Modal {download => { root.model-download(model.id); }cancel => { root.model-cancel(model.id); }remove => { root.model-remove(model.id); }+ open-link => { root.model-open-link(model.id); }+ choose-file => { root.model-choose-file(model.id); }}HorizontalLayout {@@ -1230,6 +1276,8 @@ export component SettingsDialog inherits Modal {download => { root.model-download(model.id); }cancel => { root.model-cancel(model.id); }remove => { root.model-remove(model.id); }+ open-link => { root.model-open-link(model.id); }+ choose-file => { root.model-choose-file(model.id); }}}}