From 7a8eec026b90477e6165d92d83057029a91792f0 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 2 Sep 2024 22:36:25 +0200 Subject: [PATCH] Update branding --- flake.nix | 2 +- .../branding/desk_os/branding.desc | 10 +++++----- .../calamares-extensions/modules/desk_os/main.py | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index c781e04..cef1a82 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Desk OS - A simple, general purpose operating system for desktop computers"; + description = "deskOS - An easy to use, stable desktop operating system"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; diff --git a/packages/calamares-extensions/branding/desk_os/branding.desc b/packages/calamares-extensions/branding/desk_os/branding.desc index 5e19327..2c266a8 100644 --- a/packages/calamares-extensions/branding/desk_os/branding.desc +++ b/packages/calamares-extensions/branding/desk_os/branding.desc @@ -115,13 +115,13 @@ navigation: widget # are visible as buttons there if the corresponding *show* keys # are set to "true" (they can also be overridden). strings: - productName: Desk OS - shortProductName: Desk OS + productName: deskOS + shortProductName: deskOS version: shortVersion: - versionedName: Desk OS - shortVersionedName: Desk OS - bootloaderEntryName: Desk OS + versionedName: deskOS + shortVersionedName: deskOS + bootloaderEntryName: deskOS productUrl: https://nixup.io/ supportUrl: https://nixup.io knownIssuesUrl: https://github.com/nixup-io/desk-os/issues diff --git a/packages/calamares-extensions/modules/desk_os/main.py b/packages/calamares-extensions/modules/desk_os/main.py index fd76721..e6faa6b 100644 --- a/packages/calamares-extensions/modules/desk_os/main.py +++ b/packages/calamares-extensions/modules/desk_os/main.py @@ -172,7 +172,7 @@ configuration_tail = """ """ def pretty_name(): - return _("Installing Desk OS.") + return _("Installing deskOS.") status = pretty_name() @@ -196,10 +196,10 @@ def catenate(d, key, *values): def run(): - """Desk OS Configuration.""" + """deskOS Configuration.""" global status - status = _("Configuring Desk OS") + status = _("Configuring deskOS") libcalamares.job.setprogress(0.1) # Create initial config file @@ -223,7 +223,7 @@ def run(): cfg += """ boot.initrd.luks.devices."{}".device = "/dev/disk/by-uuid/{}";\n""".format( part["luksMapperName"], part["uuid"]) - status = _("Configuring Desk OS") + status = _("Configuring deskOS") libcalamares.job.setprogress(0.18) cfg += cfghostname @@ -334,7 +334,7 @@ def run(): pattern = "@@{key}@@".format(key=key) cfg = cfg.replace(pattern, str(variables[key])) - status = _("Generating Desk OS configuration") + status = _("Generating deskOS configuration") libcalamares.job.setprogress(0.25) try: @@ -354,7 +354,7 @@ def run(): libcalamares.utils.host_env_process_output( ["cp", "/dev/stdin", flakeFile], None, flake) - status = _("Installing Desk OS") + status = _("Installing deskOS") libcalamares.job.setprogress(0.3) # Install