diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7c76b253..1f9a6a02 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -148,7 +148,7 @@ arguments, e.g., "hello ", please follow this convention: ``` Arguments in the key should be in format `{argument_name}`, and they will have -a preceeding `%` when used in translations. +a preceding `%` when used in translations. [app_yml]: https://github.com/topgrade-rs/topgrade/blob/main/locales/app.yml diff --git a/config.example.toml b/config.example.toml index 579ea409..988a62a9 100644 --- a/config.example.toml +++ b/config.example.toml @@ -193,7 +193,7 @@ # rpm_ostree = false # For Fedora/CentOS/RHEL Atomic variants, if `bootc` is available and this configuration entry is set to true, use -# it to do the update - Will also supercede rpm-ostree if enabled +# it to do the update - Will also supersede rpm-ostree if enabled # (default: false) # bootc = false @@ -308,7 +308,7 @@ # runtime = "podman" [lensfun] -# If disabled, Topgrade invokes `lensfun‑update‑data` without root priviledge, +# If disabled, Topgrade invokes `lensfun‑update‑data` without root privilege, # then the update will be only available to you. Otherwise, `sudo` is required, # and the update will be installed system-wide, i.e., available to all users. # (default: false) diff --git a/locales/app.yml b/locales/app.yml index 6454b072..ca28bb10 100644 --- a/locales/app.yml +++ b/locales/app.yml @@ -1192,8 +1192,8 @@ _version: 2 zh_CN: "正在重新生成" zh_TW: "正在重新生成..." de: "Neustarten..." -"Could not find Topgrade in any WSL disribution": - en: "Could not find Topgrade in any WSL disribution" +"Could not find Topgrade in any WSL distribution": + en: "Could not find Topgrade in any WSL distribution" lt: "Nepavyko rasti Topgrade jokioje WSL distribucijoje" es: "No se pudo encontrar Topgrade en ninguna distribución WSL" fr: "Impossible de trouver Topgrade installé dans WSL" diff --git a/src/main.rs b/src/main.rs index 2df07dd4..e318ce75 100644 --- a/src/main.rs +++ b/src/main.rs @@ -151,7 +151,7 @@ fn run() -> Result<()> { // If // - // 1. the breaking changes notification shouldnot be skipped + // 1. the breaking changes notification shouldn't be skipped // 2. this is the first execution of a major release // // inform user of breaking changes diff --git a/src/steps/generic.rs b/src/steps/generic.rs index 43404f61..b41f428d 100644 --- a/src/steps/generic.rs +++ b/src/steps/generic.rs @@ -815,7 +815,7 @@ pub fn run_tlmgr_update(ctx: &ExecutionContext) -> Result<()> { cfg_if::cfg_if! { if #[cfg(any(target_os = "linux", target_os = "android"))] { if !ctx.config().enable_tlmgr_linux() { - return Err(SkipStep(String::from("tlmgr must be explicity enabled in the configuration to run in Android/Linux")).into()); + return Err(SkipStep(String::from("tlmgr must be explicitly enabled in the configuration to run in Android/Linux")).into()); } } } diff --git a/src/steps/kakoune.rs b/src/steps/kakoune.rs index 11e4be87..d7526bda 100644 --- a/src/steps/kakoune.rs +++ b/src/steps/kakoune.rs @@ -12,7 +12,7 @@ pub fn upgrade_kak_plug(ctx: &ExecutionContext) -> Result<()> { print_separator("Kakoune"); - // TODO: Why supress output for this command? + // TODO: Why suppress output for this command? ctx.execute(kak).args(["-ui", "dummy", "-e", UPGRADE_KAK]).output()?; println!("{}", t!("Plugins upgraded")); diff --git a/src/steps/os/linux.rs b/src/steps/os/linux.rs index a8ec8977..1e926e1f 100644 --- a/src/steps/os/linux.rs +++ b/src/steps/os/linux.rs @@ -475,7 +475,7 @@ fn upgrade_gentoo(ctx: &ExecutionContext) -> Result<()> { println!("{}", t!("Syncing portage")); if let Some(ego) = which("ego") { - // The Funtoo team doesn't reccomend running both ego sync and emerge --sync + // The Funtoo team doesn't recommend running both ego sync and emerge --sync sudo.execute(ctx, &ego)?.arg("sync").status_checked()?; } else { sudo.execute(ctx, &emerge)? diff --git a/src/steps/os/windows.rs b/src/steps/os/windows.rs index f4544491..cfd852a2 100644 --- a/src/steps/os/windows.rs +++ b/src/steps/os/windows.rs @@ -100,7 +100,7 @@ pub fn update_wsl(ctx: &ExecutionContext) -> Result<()> { /// Detect if WSL is installed or not. /// /// For WSL, we cannot simply check if command `wsl` is installed as on newer -/// versions of Windows (since windows 10 version 2004), this commmand is +/// versions of Windows (since windows 10 version 2004), this command is /// installed by default. /// /// If the command is installed and the user hasn't installed any Linux distros @@ -206,7 +206,7 @@ pub fn run_wsl_topgrade(ctx: &ExecutionContext) -> Result<()> { if ran { Ok(()) } else { - Err(SkipStep(t!("Could not find Topgrade in any WSL disribution").to_string()).into()) + Err(SkipStep(t!("Could not find Topgrade in any WSL distribution").to_string()).into()) } } diff --git a/src/steps/remote/vagrant.rs b/src/steps/remote/vagrant.rs index 9202aad0..61a222a6 100644 --- a/src/steps/remote/vagrant.rs +++ b/src/steps/remote/vagrant.rs @@ -179,7 +179,7 @@ pub fn topgrade_vagrant_box(ctx: &ExecutionContext, vagrant_box: &VagrantBox) -> path: utils::require("vagrant")?, }; - let seperator = format!("Vagrant ({})", vagrant_box.smart_name()); + let separator = format!("Vagrant ({})", vagrant_box.smart_name()); let mut _poweron = None; if !vagrant_box.initial_status.powered_on() { if !(ctx.config().vagrant_power_on().unwrap_or(true)) { @@ -189,11 +189,11 @@ pub fn topgrade_vagrant_box(ctx: &ExecutionContext, vagrant_box: &VagrantBox) -> )) .into()); } else { - print_separator(seperator); + print_separator(separator); _poweron = Some(vagrant.temporary_power_on(vagrant_box, ctx)?); } } else { - print_separator(seperator); + print_separator(separator); } let mut command = format!("env TOPGRADE_PREFIX={} topgrade", vagrant_box.smart_name()); if ctx.config().yes(Step::Vagrant) { diff --git a/src/utils.rs b/src/utils.rs index c9f0ff22..20bdaf99 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -226,7 +226,7 @@ pub mod merge_strategies { /// /// # Shim /// On Windows, if you install `python` through `winget`, an actual `python` -/// is installed as well as a `python3` shim. Shim is invokable, but when you +/// is installed as well as a `python3` shim. Shim is invocable, but when you /// execute it, the Microsoft App Store will be launched instead of a Python /// shell. ///