diff --git a/.github/ISSUE_TEMPLATE/01_bug.yml b/.github/ISSUE_TEMPLATE/01_bug.yml index ab40754f..92061f64 100644 --- a/.github/ISSUE_TEMPLATE/01_bug.yml +++ b/.github/ISSUE_TEMPLATE/01_bug.yml @@ -41,8 +41,8 @@ body: attributes: value: > **Note**: Assuming you have network connectivity, - you can easily post the installation log using the following command: - `curl -F'file=@/var/log/archinstall/install.log' https://0x0.st` + you can easily upload the installation log and get a shareable URL by running: + `archinstall share-log` - type: textarea id: freeform diff --git a/.github/workflows/iso-build.yaml b/.github/workflows/iso-build.yaml index dfaed9b8..83d58fd6 100644 --- a/.github/workflows/iso-build.yaml +++ b/.github/workflows/iso-build.yaml @@ -32,7 +32,7 @@ jobs: - run: cat /etc/os-release - run: pacman-key --init - run: pacman --noconfirm -Sy archlinux-keyring - - run: ./build_iso.sh + - run: ./test_tooling/mkarchiso/build_iso.sh - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: name: Arch Live ISO diff --git a/.github/workflows/translation-check.yaml b/.github/workflows/translation-check.yaml index 3cd4d14c..15be16cf 100644 --- a/.github/workflows/translation-check.yaml +++ b/.github/workflows/translation-check.yaml @@ -1,28 +1,22 @@ -#on: -# push: -# paths: -# - 'archinstall/locales/**' -# pull_request: -# paths: -# - 'archinstall/locales/**' -#name: Verify local_generate script was run on translation changes -#jobs: -# translation-check: -# runs-on: ubuntu-latest -# container: -# image: archlinux/archlinux:latest -# steps: -# - uses: actions/checkout@v4 -# - run: pacman --noconfirm -Syu python git diffutils -# - name: Verify all translation scripts are up to date -# run: | -# cd .. -# cp -r archinstall archinstall_orig -# cd archinstall/archinstall/locales -# bash locales_generator.sh 1> /dev/null -# cd ../../.. -# git diff \ -# --quiet --no-index --name-only \ -# archinstall_orig/archinstall/locales \ -# archinstall/archinstall/locales \ -# || (echo "Translation files have not been updated after translation, please run ./locales_generator.sh once more and commit" && exit 1) +name: Translation validation +on: + push: + paths: + - 'archinstall/**/*.py' + - 'archinstall/locales/**' + - '.github/workflows/translation-check.yaml' + pull_request: + paths: + - 'archinstall/**/*.py' + - 'archinstall/locales/**' + - '.github/workflows/translation-check.yaml' +jobs: + translations: + name: Validate translations + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - name: Install gettext + run: sudo apt-get update && sudo apt-get install -y gettext + - name: Run translation checks + run: bash archinstall/locales/locales_generator.sh check diff --git a/.github/workflows/uki-build.yaml b/.github/workflows/uki-build.yaml new file mode 100644 index 00000000..df41bc55 --- /dev/null +++ b/.github/workflows/uki-build.yaml @@ -0,0 +1,40 @@ +# This workflow will build an Arch Linux UKI file with the commit on it + +name: Build Arch UKI with ArchInstall Commit + +on: + push: + branches: + - master + - main # In case we adopt this convention in the future + pull_request: + paths-ignore: + - 'docs/**' + - '**.editorconfig' + - '**.gitignore' + - '**.md' + - 'LICENSE' + - 'PKGBUILD' + release: + types: + - created + +jobs: + build: + runs-on: ubuntu-latest + container: + image: archlinux/archlinux:latest + options: --privileged + steps: + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - run: pwd + - run: find . + - run: cat /etc/os-release + - run: pacman-key --init + - run: pacman --noconfirm -Sy archlinux-keyring + - run: pacman --noconfirm -Sy mkosi + - run: (cd test_tooling/mkosi/ && mkosi build -B) + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 + with: + name: Arch Live UKI + path: test_tooling/mkosi/mkosi.output/*.efi diff --git a/.gitignore b/.gitignore index 92c2694a..0d3c150a 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,7 @@ requirements.txt /.dev/ node_modules/ uv.lock +test_tooling/mkosi/mkosi.output/*image* +test_tooling/mkosi/mkosi.cache/** +test_tooling/mkosi/mkosi.tools/** +test_tooling/mkosi/mkosi.tools.manifest diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a496557e..6ba223de 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ default_stages: ['pre-commit'] repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.11 + rev: v0.15.14 hooks: # fix unused imports and sort them - id: ruff @@ -31,7 +31,7 @@ repos: args: [--config=.flake8] fail_fast: true - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.20.2 + rev: v2.1.0 hooks: - id: mypy args: [ @@ -41,6 +41,7 @@ repos: additional_dependencies: - pydantic - pytest + - hypothesis - cryptography - textual - repo: local diff --git a/README.md b/README.md index 1447c263..4e6847f4 100644 --- a/README.md +++ b/README.md @@ -101,9 +101,9 @@ If you come across any issues, kindly submit your issue here on GitHub or post y When submitting an issue, please: * Provide the stacktrace of the output if applicable * Attach the `/var/log/archinstall/install.log` to the issue ticket. This helps us help you! - * To extract the log from the ISO image, one way is to use
+ * To upload the log from the ISO image and get a shareable URL, run
```shell - curl -F'file=@/var/log/archinstall/install.log' https://0x0.st + archinstall share-log ``` @@ -179,7 +179,7 @@ This can be done by installing `pacman -S arch-install-scripts util-linux` local # losetup --partscan --show ./testimage.img # pip install --upgrade archinstall # python -m archinstall --script guided - # qemu-system-x86_64 -enable-kvm -machine q35,accel=kvm -device intel-iommu -cpu host -m 4096 -boot order=d -drive file=./testimage.img,format=raw -drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF.4m.fd -drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF.4m.fd + # qemu-system-x86_64 -enable-kvm -machine q35,accel=kvm -device intel-iommu -cpu host -m 4096 -boot order=d -drive file=./testimage.img,format=raw -drive if=pflash,format=raw,readonly,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd -drive if=pflash,format=raw,readonly,file=/usr/share/edk2/x64/OVMF_VARS.4m.fd This will create a *20 GB* `testimage.img` and create a loop device which we can use to format and install to.
`archinstall` is installed and executed in [guided mode](#docs-todo). Once the installation is complete, ~~you can use qemu/kvm to boot the test media.~~
@@ -199,8 +199,8 @@ You may want to boot an ISO image in a VM to test `archinstall` in there. qemu-system-x86_64 -enable-kvm \ -machine q35,accel=kvm -device intel-iommu \ -cpu host -m 4096 -boot order=d \ --drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF.4m.fd \ --drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF.4m.fd \ +-drive if=pflash,format=raw,readonly,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd \ +-drive if=pflash,format=raw,readonly,file=/usr/share/edk2/x64/OVMF_VARS.4m.fd \ -drive file=./archlinux-2025.12.01-x86_64.iso,format=raw ``` @@ -209,8 +209,8 @@ HINT: For espeakup support qemu-system-x86_64 -enable-kvm \ -machine q35,accel=kvm -device intel-iommu \ -cpu host -m 4096 -boot order=d \ --drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF.4m.fd \ --drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF.4m.fd \ +-drive if=pflash,format=raw,readonly,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd \ +-drive if=pflash,format=raw,readonly,file=/usr/share/edk2/x64/OVMF_VARS.4m.fd \ -drive file=./archlinux-2025.12.01-x86_64.iso,format=raw \ -device intel-hda -device hda-duplex,audiodev=snd0 \ -audiodev pa,id=snd0,server=/run/user/1000/pulse/native @@ -219,6 +219,10 @@ qemu-system-x86_64 -enable-kvm \ # FAQ +## AUR + +`archinstall` will not offer or bundle AUR helpers or AUR packages due to a current consensus. This is not any individual developers decision. The reasons and discussions for this stance on the topic can be found on our mailing list thread: [(optional) AUR helper in archinstall](https://lists.archlinux.org/archives/list/arch-dev-public@lists.archlinux.org/thread/VYOULH2GOJLFM2BXOFLWH3D754YXFPSL/). + ## Keyring out-of-date For a description of the problem see https://archinstall.archlinux.page/help/known_issues.html#keyring-is-out-of-date-2213 and discussion in issue https://github.com/archlinux/archinstall/issues/2213. diff --git a/archinstall/applications/audio.py b/archinstall/applications/audio.py index b749fe67..e5d79718 100644 --- a/archinstall/applications/audio.py +++ b/archinstall/applications/audio.py @@ -1,9 +1,9 @@ from typing import TYPE_CHECKING from archinstall.lib.hardware import SysInfo +from archinstall.lib.log import debug from archinstall.lib.models.application import Audio, AudioConfiguration from archinstall.lib.models.users import User -from archinstall.lib.output import debug if TYPE_CHECKING: from archinstall.lib.installer import Installer diff --git a/archinstall/applications/bluetooth.py b/archinstall/applications/bluetooth.py index a0ffbc75..6bd4999e 100644 --- a/archinstall/applications/bluetooth.py +++ b/archinstall/applications/bluetooth.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from archinstall.lib.output import debug +from archinstall.lib.log import debug if TYPE_CHECKING: from archinstall.lib.installer import Installer diff --git a/archinstall/applications/firewall.py b/archinstall/applications/firewall.py index e450dbc6..dadaa05b 100644 --- a/archinstall/applications/firewall.py +++ b/archinstall/applications/firewall.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING +from archinstall.lib.log import debug from archinstall.lib.models.application import Firewall, FirewallConfiguration -from archinstall.lib.output import debug if TYPE_CHECKING: from archinstall.lib.installer import Installer diff --git a/archinstall/applications/fonts.py b/archinstall/applications/fonts.py index 3fa54c67..73eb326e 100644 --- a/archinstall/applications/fonts.py +++ b/archinstall/applications/fonts.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING +from archinstall.lib.log import debug from archinstall.lib.models.application import FontsConfiguration -from archinstall.lib.output import debug if TYPE_CHECKING: from archinstall.lib.installer import Installer diff --git a/archinstall/applications/power_management.py b/archinstall/applications/power_management.py index b9f32b05..744411f3 100644 --- a/archinstall/applications/power_management.py +++ b/archinstall/applications/power_management.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING +from archinstall.lib.log import debug from archinstall.lib.models.application import PowerManagement, PowerManagementConfiguration -from archinstall.lib.output import debug if TYPE_CHECKING: from archinstall.lib.installer import Installer diff --git a/archinstall/applications/print_service.py b/archinstall/applications/print_service.py index 3e4913f0..fbe28f89 100644 --- a/archinstall/applications/print_service.py +++ b/archinstall/applications/print_service.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -from archinstall.lib.output import debug +from archinstall.lib.log import debug if TYPE_CHECKING: from archinstall.lib.installer import Installer diff --git a/archinstall/default_profiles/desktop.py b/archinstall/default_profiles/desktop.py index 7ffe31a8..b70f9f11 100644 --- a/archinstall/default_profiles/desktop.py +++ b/archinstall/default_profiles/desktop.py @@ -1,14 +1,15 @@ from typing import TYPE_CHECKING, Self, override from archinstall.default_profiles.profile import DisplayServerType, GreeterType, Profile, ProfileType, SelectResult +from archinstall.lib.log import info from archinstall.lib.menu.helpers import Selection -from archinstall.lib.output import info from archinstall.lib.profile.profiles_handler import profile_handler -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType if TYPE_CHECKING: from archinstall.lib.installer import Installer + from archinstall.lib.models.users import User class DesktopProfile(Profile): @@ -88,6 +89,11 @@ class DesktopProfile(Profile): for profile in self.current_selection: profile.post_install(install_session) + @override + def provision(self, install_session: Installer, users: list[User]) -> None: + for profile in self.current_selection: + profile.provision(install_session, users) + @override def install(self, install_session: Installer) -> None: # Install common packages for all desktop environments diff --git a/archinstall/default_profiles/desktops/__init__.py b/archinstall/default_profiles/desktops/__init__.py index d91a0f3a..e69de29b 100644 --- a/archinstall/default_profiles/desktops/__init__.py +++ b/archinstall/default_profiles/desktops/__init__.py @@ -1,6 +0,0 @@ -from enum import Enum - - -class SeatAccess(Enum): - seatd = 'seatd' - polkit = 'polkit' diff --git a/archinstall/default_profiles/desktops/bspwm.py b/archinstall/default_profiles/desktops/bspwm.py index f8c2a7b2..8886298a 100644 --- a/archinstall/default_profiles/desktops/bspwm.py +++ b/archinstall/default_profiles/desktops/bspwm.py @@ -1,6 +1,8 @@ from typing import override from archinstall.default_profiles.profile import DisplayServerType, GreeterType, Profile, ProfileType +from archinstall.lib.installer import Installer +from archinstall.lib.models.users import User class BspwmProfile(Profile): @@ -27,3 +29,11 @@ class BspwmProfile(Profile): @override def default_greeter_type(self) -> GreeterType: return GreeterType.Lightdm + + @override + def provision(self, install_session: Installer, users: list[User]) -> None: + for user in users: + install_session.arch_chroot('mkdir -p ~/.config/bspwm ~/.config/sxhkd', run_as=user.username) + install_session.arch_chroot('cp /usr/share/doc/bspwm/examples/bspwmrc ~/.config/bspwm/', run_as=user.username) + install_session.arch_chroot('cp /usr/share/doc/bspwm/examples/sxhkdrc ~/.config/sxhkd/', run_as=user.username) + install_session.arch_chroot('chmod +x ~/.config/bspwm/bspwmrc', run_as=user.username) diff --git a/archinstall/default_profiles/desktops/budgie.py b/archinstall/default_profiles/desktops/budgie.py index f156a53b..da147851 100644 --- a/archinstall/default_profiles/desktops/budgie.py +++ b/archinstall/default_profiles/desktops/budgie.py @@ -18,12 +18,13 @@ class BudgieProfile(Profile): return [ 'materia-gtk-theme', 'budgie', - 'konsole', - 'dolphin', + 'mate-terminal', + 'nemo', + 'nemo-fileroller', 'papirus-icon-theme', ] @property @override def default_greeter_type(self) -> GreeterType: - return GreeterType.Sddm + return GreeterType.LightdmSlick diff --git a/archinstall/default_profiles/desktops/cutefish.py b/archinstall/default_profiles/desktops/cutefish.py deleted file mode 100644 index b014c8ca..00000000 --- a/archinstall/default_profiles/desktops/cutefish.py +++ /dev/null @@ -1,26 +0,0 @@ -from typing import override - -from archinstall.default_profiles.profile import DisplayServerType, GreeterType, Profile, ProfileType - - -class CutefishProfile(Profile): - def __init__(self) -> None: - super().__init__( - 'Cutefish', - ProfileType.DesktopEnv, - support_gfx_driver=True, - display_server=DisplayServerType.Xorg, - ) - - @property - @override - def packages(self) -> list[str]: - return [ - 'cutefish', - 'noto-fonts', - ] - - @property - @override - def default_greeter_type(self) -> GreeterType: - return GreeterType.Sddm diff --git a/archinstall/default_profiles/desktops/hyprland.py b/archinstall/default_profiles/desktops/hyprland.py index fa0bc581..0bf46b96 100644 --- a/archinstall/default_profiles/desktops/hyprland.py +++ b/archinstall/default_profiles/desktops/hyprland.py @@ -1,11 +1,7 @@ from typing import override -from archinstall.default_profiles.desktops import SeatAccess +from archinstall.default_profiles.desktops.utils import select_seat_access from archinstall.default_profiles.profile import CustomSetting, DisplayServerType, GreeterType, Profile, ProfileType -from archinstall.lib.menu.helpers import Selection -from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType class HyprlandProfile(Profile): @@ -49,26 +45,8 @@ class HyprlandProfile(Profile): return [pref] return [] - async def _select_seat_access(self) -> None: - # need to activate seat service and add to seat group - header = tr('Hyprland needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)') - header += '\n' + tr('Choose an option to give Hyprland access to your hardware') + '\n' - - items = [MenuItem(s.value, value=s) for s in SeatAccess] - group = MenuItemGroup(items, sort_items=True) - - default = self.custom_settings.get(CustomSetting.SeatAccess, None) - group.set_default_by_value(default) - - result = await Selection[SeatAccess]( - group, - header=header, - allow_skip=False, - ).show() - - if result.type_ == ResultType.Selection: - self.custom_settings[CustomSetting.SeatAccess] = result.get_value().value - @override async def do_on_select(self) -> None: - await self._select_seat_access() + default = self.custom_settings.get(CustomSetting.SeatAccess, None) + seat_access = await select_seat_access(self.name, default) + self.custom_settings[CustomSetting.SeatAccess] = seat_access.value diff --git a/archinstall/default_profiles/desktops/labwc.py b/archinstall/default_profiles/desktops/labwc.py index bf4a3297..48fe344e 100644 --- a/archinstall/default_profiles/desktops/labwc.py +++ b/archinstall/default_profiles/desktops/labwc.py @@ -1,11 +1,7 @@ from typing import override -from archinstall.default_profiles.desktops import SeatAccess +from archinstall.default_profiles.desktops.utils import select_seat_access from archinstall.default_profiles.profile import CustomSetting, DisplayServerType, GreeterType, Profile, ProfileType -from archinstall.lib.menu.helpers import Selection -from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType class LabwcProfile(Profile): @@ -43,26 +39,8 @@ class LabwcProfile(Profile): return [pref] return [] - async def _select_seat_access(self) -> None: - # need to activate seat service and add to seat group - header = tr('labwc needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)') - header += '\n' + tr('Choose an option to give labwc access to your hardware') + '\n' - - items = [MenuItem(s.value, value=s) for s in SeatAccess] - group = MenuItemGroup(items, sort_items=True) - - default = self.custom_settings.get(CustomSetting.SeatAccess, None) - group.set_default_by_value(default) - - result = await Selection[SeatAccess]( - group, - header=header, - allow_skip=False, - ).show() - - if result.type_ == ResultType.Selection: - self.custom_settings[CustomSetting.SeatAccess] = result.get_value().value - @override async def do_on_select(self) -> None: - await self._select_seat_access() + default = self.custom_settings.get(CustomSetting.SeatAccess, None) + seat_access = await select_seat_access(self.name, default) + self.custom_settings[CustomSetting.SeatAccess] = seat_access.value diff --git a/archinstall/default_profiles/desktops/niri.py b/archinstall/default_profiles/desktops/niri.py index 347290fe..d8db75f5 100644 --- a/archinstall/default_profiles/desktops/niri.py +++ b/archinstall/default_profiles/desktops/niri.py @@ -1,17 +1,13 @@ from typing import override -from archinstall.default_profiles.desktops import SeatAccess +from archinstall.default_profiles.desktops.utils import select_seat_access from archinstall.default_profiles.profile import CustomSetting, DisplayServerType, GreeterType, Profile, ProfileType -from archinstall.lib.menu.helpers import Selection -from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType class NiriProfile(Profile): def __init__(self) -> None: super().__init__( - 'Niri', + 'niri', ProfileType.WindowMgr, support_gfx_driver=True, display_server=DisplayServerType.Wayland, @@ -51,26 +47,8 @@ class NiriProfile(Profile): return [pref] return [] - async def _select_seat_access(self) -> None: - # need to activate seat service and add to seat group - header = tr('niri needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)') - header += '\n' + tr('Choose an option to give niri access to your hardware') + '\n' - - items = [MenuItem(s.value, value=s) for s in SeatAccess] - group = MenuItemGroup(items, sort_items=True) - - default = self.custom_settings.get(CustomSetting.SeatAccess, None) - group.set_default_by_value(default) - - result = await Selection[SeatAccess]( - group, - header=header, - allow_skip=False, - ).show() - - if result.type_ == ResultType.Selection: - self.custom_settings[CustomSetting.SeatAccess] = result.get_value().value - @override async def do_on_select(self) -> None: - await self._select_seat_access() + default = self.custom_settings.get(CustomSetting.SeatAccess, None) + seat_access = await select_seat_access(self.name, default) + self.custom_settings[CustomSetting.SeatAccess] = seat_access.value diff --git a/archinstall/default_profiles/desktops/niri_dms.py b/archinstall/default_profiles/desktops/niri_dms.py new file mode 100644 index 00000000..11f32e34 --- /dev/null +++ b/archinstall/default_profiles/desktops/niri_dms.py @@ -0,0 +1,66 @@ +import shutil +from pathlib import Path +from typing import TYPE_CHECKING, override + +from archinstall.default_profiles.profile import DisplayServerType, GreeterType, Profile, ProfileType + +if TYPE_CHECKING: + from archinstall.lib.installer import Installer + from archinstall.lib.models.users import User + + +_TERMINAL = 'alacritty' +_ASSETS_DIR = Path(__file__).parent / 'niri_dms_assets' + + +class NiriDmsProfile(Profile): + def __init__(self) -> None: + super().__init__( + 'niri - DankMaterialShell', + ProfileType.WindowMgr, + support_gfx_driver=True, + display_server=DisplayServerType.Wayland, + ) + + @property + @override + def packages(self) -> list[str]: + return [ + 'niri', + 'dms-shell-niri', + 'polkit', + 'xdg-desktop-portal-gnome', + 'xorg-xwayland', + 'matugen', + 'cava', + 'kimageformats', + 'cups-pk-helper', + 'tuned-ppd', + _TERMINAL, + ] + + @property + @override + def default_greeter_type(self) -> GreeterType: + return GreeterType.GreetdDms + + @override + def provision(self, install_session: Installer, users: list[User]) -> None: + binds = (_ASSETS_DIR / 'dms/binds.kdl').read_text().replace('{{TERMINAL_COMMAND}}', _TERMINAL) + + for user in users: + home = install_session.target / 'home' / user.username + niri_dir = home / '.config/niri' + dms_dir = niri_dir / 'dms' + dms_dir.mkdir(parents=True, exist_ok=True) + + shutil.copy(_ASSETS_DIR / 'niri.kdl', niri_dir / 'config.kdl') + for name in ('colors.kdl', 'layout.kdl', 'alttab.kdl', 'outputs.kdl', 'cursor.kdl'): + shutil.copy(_ASSETS_DIR / 'dms' / name, dms_dir / name) + (dms_dir / 'binds.kdl').write_text(binds) + + niri_unit_dropin = home / '.config/systemd/user/niri.service.d' + niri_unit_dropin.mkdir(parents=True, exist_ok=True) + (niri_unit_dropin / 'dms.conf').write_text('[Unit]\nWants=dms.service\n') + + install_session.arch_chroot(f'chown -R {user.username}:{user.username} /home/{user.username}/.config') diff --git a/archinstall/default_profiles/desktops/niri_dms_assets/dms/alttab.kdl b/archinstall/default_profiles/desktops/niri_dms_assets/dms/alttab.kdl new file mode 100644 index 00000000..5f9bdcd0 --- /dev/null +++ b/archinstall/default_profiles/desktops/niri_dms_assets/dms/alttab.kdl @@ -0,0 +1,10 @@ +// ! DO NOT EDIT ! +// ! AUTO-GENERATED BY DMS ! +// ! CHANGES WILL BE OVERWRITTEN ! +// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE ! + +recent-windows { + highlight { + corner-radius 12 + } +} diff --git a/archinstall/default_profiles/desktops/niri_dms_assets/dms/binds.kdl b/archinstall/default_profiles/desktops/niri_dms_assets/dms/binds.kdl new file mode 100644 index 00000000..27cb860e --- /dev/null +++ b/archinstall/default_profiles/desktops/niri_dms_assets/dms/binds.kdl @@ -0,0 +1,221 @@ +binds { + // === System & Overview === + Mod+D repeat=false { toggle-overview; } + Mod+Tab repeat=false { toggle-overview; } + Mod+Shift+Slash { show-hotkey-overlay; } + + // === Application Launchers === + Mod+T hotkey-overlay-title="Open Terminal" { spawn "{{TERMINAL_COMMAND}}"; } + Mod+Space hotkey-overlay-title="Application Launcher" { + spawn "dms" "ipc" "call" "spotlight" "toggle"; + } + Mod+V hotkey-overlay-title="Clipboard Manager" { + spawn "dms" "ipc" "call" "clipboard" "toggle"; + } + Mod+M hotkey-overlay-title="Task Manager" { + spawn "dms" "ipc" "call" "processlist" "focusOrToggle"; + } + + Super+X hotkey-overlay-title="Power Menu: Toggle" { spawn "dms" "ipc" "call" "powermenu" "toggle"; } + Mod+Comma hotkey-overlay-title="Settings" { + spawn "dms" "ipc" "call" "settings" "focusOrToggle"; + } + Mod+Y hotkey-overlay-title="Browse Wallpapers" { + spawn "dms" "ipc" "call" "dankdash" "wallpaper"; + } + Mod+N hotkey-overlay-title="Notification Center" { spawn "dms" "ipc" "call" "notifications" "toggle"; } + Mod+Shift+N hotkey-overlay-title="Notepad" { spawn "dms" "ipc" "call" "notepad" "toggle"; } + + // === Security === + Mod+Alt+L hotkey-overlay-title="Lock Screen" { + spawn "dms" "ipc" "call" "lock" "lock"; + } + Mod+Shift+E { quit; } + Ctrl+Alt+Delete hotkey-overlay-title="Task Manager" { + spawn "dms" "ipc" "call" "processlist" "focusOrToggle"; + } + + // === Audio Controls === + XF86AudioRaiseVolume allow-when-locked=true { + spawn "dms" "ipc" "call" "audio" "increment" "3"; + } + XF86AudioLowerVolume allow-when-locked=true { + spawn "dms" "ipc" "call" "audio" "decrement" "3"; + } + XF86AudioMute allow-when-locked=true { + spawn "dms" "ipc" "call" "audio" "mute"; + } + XF86AudioMicMute allow-when-locked=true { + spawn "dms" "ipc" "call" "audio" "micmute"; + } + XF86AudioPause allow-when-locked=true { + spawn "dms" "ipc" "call" "mpris" "playPause"; + } + XF86AudioPlay allow-when-locked=true { + spawn "dms" "ipc" "call" "mpris" "playPause"; + } + XF86AudioPrev allow-when-locked=true { + spawn "dms" "ipc" "call" "mpris" "previous"; + } + XF86AudioNext allow-when-locked=true { + spawn "dms" "ipc" "call" "mpris" "next"; + } + Ctrl+XF86AudioRaiseVolume allow-when-locked=true { + spawn "dms" "ipc" "call" "mpris" "increment" "3"; + } + Ctrl+XF86AudioLowerVolume allow-when-locked=true { + spawn "dms" "ipc" "call" "mpris" "decrement" "3"; + } + + // === Brightness Controls === + XF86MonBrightnessUp allow-when-locked=true { + spawn "dms" "ipc" "call" "brightness" "increment" "5" ""; + } + XF86MonBrightnessDown allow-when-locked=true { + spawn "dms" "ipc" "call" "brightness" "decrement" "5" ""; + } + + // === Window Management === + Mod+Q repeat=false { close-window; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + Mod+Shift+T { toggle-window-floating; } + Mod+Shift+V { switch-focus-between-floating-and-tiling; } + Mod+W { toggle-column-tabbed-display; } + Mod+Shift+W hotkey-overlay-title="Create window rule" { spawn "dms" "ipc" "call" "window-rules" "toggle"; } + + // === Focus Navigation === + Mod+Left { focus-column-left; } + Mod+Down { focus-window-down; } + Mod+Up { focus-window-up; } + Mod+Right { focus-column-right; } + Mod+H { focus-column-left; } + Mod+J { focus-window-down; } + Mod+K { focus-window-up; } + Mod+L { focus-column-right; } + + // === Window Movement === + Mod+Shift+Left { move-column-left; } + Mod+Shift+Down { move-window-down; } + Mod+Shift+Up { move-window-up; } + Mod+Shift+Right { move-column-right; } + Mod+Shift+H { move-column-left; } + Mod+Shift+J { move-window-down; } + Mod+Shift+K { move-window-up; } + Mod+Shift+L { move-column-right; } + + // === Column Navigation === + Mod+Home { focus-column-first; } + Mod+End { focus-column-last; } + Mod+Ctrl+Home { move-column-to-first; } + Mod+Ctrl+End { move-column-to-last; } + + // === Monitor Navigation === + Mod+Ctrl+Left { focus-monitor-left; } + //Mod+Ctrl+Down { focus-monitor-down; } + //Mod+Ctrl+Up { focus-monitor-up; } + Mod+Ctrl+Right { focus-monitor-right; } + Mod+Ctrl+H { focus-monitor-left; } + Mod+Ctrl+J { focus-monitor-down; } + Mod+Ctrl+K { focus-monitor-up; } + Mod+Ctrl+L { focus-monitor-right; } + + // === Move to Monitor === + Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } + Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } + Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } + Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } + Mod+Shift+Ctrl+H { move-column-to-monitor-left; } + Mod+Shift+Ctrl+J { move-column-to-monitor-down; } + Mod+Shift+Ctrl+K { move-column-to-monitor-up; } + Mod+Shift+Ctrl+L { move-column-to-monitor-right; } + + // === Workspace Navigation === + Mod+Page_Down { focus-workspace-down; } + Mod+Page_Up { focus-workspace-up; } + Mod+U { focus-workspace-down; } + Mod+I { focus-workspace-up; } + Mod+Ctrl+Down { move-column-to-workspace-down; } + Mod+Ctrl+Up { move-column-to-workspace-up; } + Mod+Ctrl+U { move-column-to-workspace-down; } + Mod+Ctrl+I { move-column-to-workspace-up; } + + // === Workspace Management === + Ctrl+Shift+R hotkey-overlay-title="Rename Workspace" { + spawn "dms" "ipc" "call" "workspace-rename" "open"; + } + + // === Move Workspaces === + Mod+Shift+Page_Down { move-workspace-down; } + Mod+Shift+Page_Up { move-workspace-up; } + Mod+Shift+U { move-workspace-down; } + Mod+Shift+I { move-workspace-up; } + + // === Mouse Wheel Navigation === + Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } + + Mod+WheelScrollRight { focus-column-right; } + Mod+WheelScrollLeft { focus-column-left; } + Mod+Ctrl+WheelScrollRight { move-column-right; } + Mod+Ctrl+WheelScrollLeft { move-column-left; } + + Mod+Shift+WheelScrollDown { focus-column-right; } + Mod+Shift+WheelScrollUp { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } + Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } + + // === Numbered Workspaces === + Mod+1 { focus-workspace 1; } + Mod+2 { focus-workspace 2; } + Mod+3 { focus-workspace 3; } + Mod+4 { focus-workspace 4; } + Mod+5 { focus-workspace 5; } + Mod+6 { focus-workspace 6; } + Mod+7 { focus-workspace 7; } + Mod+8 { focus-workspace 8; } + Mod+9 { focus-workspace 9; } + + // === Move to Numbered Workspaces === + Mod+Shift+1 { move-column-to-workspace 1; } + Mod+Shift+2 { move-column-to-workspace 2; } + Mod+Shift+3 { move-column-to-workspace 3; } + Mod+Shift+4 { move-column-to-workspace 4; } + Mod+Shift+5 { move-column-to-workspace 5; } + Mod+Shift+6 { move-column-to-workspace 6; } + Mod+Shift+7 { move-column-to-workspace 7; } + Mod+Shift+8 { move-column-to-workspace 8; } + Mod+Shift+9 { move-column-to-workspace 9; } + + // === Column Management === + Mod+BracketLeft { consume-or-expel-window-left; } + Mod+BracketRight { consume-or-expel-window-right; } + Mod+Period { expel-window-from-column; } + + // === Sizing & Layout === + Mod+R { switch-preset-column-width; } + Mod+Shift+R { switch-preset-window-height; } + Mod+Ctrl+R { reset-window-height; } + Mod+Ctrl+F { expand-column-to-available-width; } + Mod+C { center-column; } + Mod+Ctrl+C { center-visible-columns; } + + // === Manual Sizing === + Mod+Minus { set-column-width "-10%"; } + Mod+Equal { set-column-width "+10%"; } + Mod+Shift+Minus { set-window-height "-10%"; } + Mod+Shift+Equal { set-window-height "+10%"; } + + // === Screenshots === + XF86Launch1 { screenshot; } + Ctrl+XF86Launch1 { screenshot-screen; } + Alt+XF86Launch1 { screenshot-window; } + Print { screenshot; } + Ctrl+Print { screenshot-screen; } + Alt+Print { screenshot-window; } + // === System Controls === + Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } + Mod+Shift+P { power-off-monitors; } +} diff --git a/archinstall/default_profiles/desktops/niri_dms_assets/dms/colors.kdl b/archinstall/default_profiles/desktops/niri_dms_assets/dms/colors.kdl new file mode 100644 index 00000000..145a1798 --- /dev/null +++ b/archinstall/default_profiles/desktops/niri_dms_assets/dms/colors.kdl @@ -0,0 +1,39 @@ +// ! Auto-generated file. Do not edit directly. +// Remove `include "dms/colors.kdl"` from your config to override. + +layout { + background-color "transparent" + + focus-ring { + active-color "#d0bcff" + inactive-color "#948f99" + urgent-color "#f2b8b5" + } + + border { + active-color "#d0bcff" + inactive-color "#948f99" + urgent-color "#f2b8b5" + } + + shadow { + color "#00000070" + } + + tab-indicator { + active-color "#d0bcff" + inactive-color "#948f99" + urgent-color "#f2b8b5" + } + + insert-hint { + color "#d0bcff80" + } +} + +recent-windows { + highlight { + active-color "#4f378b" + urgent-color "#f2b8b5" + } +} diff --git a/archinstall/default_profiles/desktops/niri_dms_assets/dms/cursor.kdl b/archinstall/default_profiles/desktops/niri_dms_assets/dms/cursor.kdl new file mode 100644 index 00000000..db3d385a --- /dev/null +++ b/archinstall/default_profiles/desktops/niri_dms_assets/dms/cursor.kdl @@ -0,0 +1,6 @@ +// Place cursor configuration here. +// Example: +// cursor { +// xcursor-theme "Adwaita" +// xcursor-size 24 +// } diff --git a/archinstall/default_profiles/desktops/niri_dms_assets/dms/layout.kdl b/archinstall/default_profiles/desktops/niri_dms_assets/dms/layout.kdl new file mode 100644 index 00000000..1951500b --- /dev/null +++ b/archinstall/default_profiles/desktops/niri_dms_assets/dms/layout.kdl @@ -0,0 +1,22 @@ +// ! DO NOT EDIT ! +// ! AUTO-GENERATED BY DMS ! +// ! CHANGES WILL BE OVERWRITTEN ! +// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE ! + +layout { + gaps 4 + + border { + width 2 + } + + focus-ring { + width 2 + } +} +window-rule { + geometry-corner-radius 12 + clip-to-geometry true + tiled-state true + draw-border-with-background false +} diff --git a/archinstall/default_profiles/desktops/niri_dms_assets/dms/outputs.kdl b/archinstall/default_profiles/desktops/niri_dms_assets/dms/outputs.kdl new file mode 100644 index 00000000..3fe37358 --- /dev/null +++ b/archinstall/default_profiles/desktops/niri_dms_assets/dms/outputs.kdl @@ -0,0 +1,7 @@ +// Place per-output configuration here. +// Example: +// output "DP-1" { +// mode "2560x1440@165" +// position x=0 y=0 +// scale 1 +// } diff --git a/archinstall/default_profiles/desktops/niri_dms_assets/niri.kdl b/archinstall/default_profiles/desktops/niri_dms_assets/niri.kdl new file mode 100644 index 00000000..0a759e46 --- /dev/null +++ b/archinstall/default_profiles/desktops/niri_dms_assets/niri.kdl @@ -0,0 +1,279 @@ +// This config is in the KDL format: https://kdl.dev +// "/-" comments out the following node. +// Check the wiki for a full description of the configuration: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Introduction +config-notification { + disable-failed +} + +gestures { + hot-corners { + off + } +} + +// Input device configuration. +// Find the full list of options on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Input +input { + keyboard { + xkb { + // You can set rules, model, layout, variant and options. + // For more information, see xkeyboard-config(7). + + // For example: + // layout "us,ru" + // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps" + + // If this section is empty, niri will fetch xkb settings + // from org.freedesktop.locale1. You can control these using + // localectl set-x11-keymap. + } + + // Enable numlock on startup, omitting this setting disables it. + numlock + } + + // Next sections include libinput settings. + // Omitting settings disables them, or leaves them at their default values. + // All commented-out settings here are examples, not defaults. + touchpad { + // off + tap + // dwt + // dwtp + // drag false + // drag-lock + natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "two-finger" + // disabled-on-external-mouse + } + + mouse { + // off + // natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "no-scroll" + } + + trackpoint { + // off + // natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "on-button-down" + // scroll-button 273 + // scroll-button-lock + // middle-emulation + } + + // Uncomment this to make the mouse warp to the center of newly focused windows. + // warp-mouse-to-focus + + // Focus windows and outputs automatically when moving the mouse into them. + // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen. + // focus-follows-mouse max-scroll-amount="0%" +} +// You can configure outputs by their name, which you can find +// by running `niri msg outputs` while inside a niri instance. +// The built-in laptop monitor is usually called "eDP-1". +// Find more information on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs +// Remember to uncomment the node by removing "/-"! +/-output "eDP-2" { + mode "2560x1600@239.998993" + position x=2560 y=0 + variable-refresh-rate +} +// Settings that influence how windows are positioned and sized. +// Find more information on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout +layout { + // Set gaps around windows in logical pixels. + background-color "transparent" + // When to center a column when changing focus, options are: + // - "never", default behavior, focusing an off-screen column will keep at the left + // or right edge of the screen. + // - "always", the focused column will always be centered. + // - "on-overflow", focusing a column will center it if it doesn't fit + // together with the previously focused column. + center-focused-column "never" + // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between. + preset-column-widths { + // Proportion sets the width as a fraction of the output width, taking gaps into account. + // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. + // The default preset widths are 1/3, 1/2 and 2/3 of the output. + proportion 0.33333 + proportion 0.5 + proportion 0.66667 + // Fixed sets the width in logical pixels exactly. + // fixed 1920 + } + // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between. + // preset-window-heights { } + // You can change the default width of the new windows. + default-column-width { proportion 0.5; } + // If you leave the brackets empty, the windows themselves will decide their initial width. + // default-column-width {} + // By default focus ring and border are rendered as a solid background rectangle + // behind windows. That is, they will show up through semitransparent windows. + // This is because windows using client-side decorations can have an arbitrary shape. + // + // If you don't like that, you should uncomment `prefer-no-csd` below. + // Niri will draw focus ring and border *around* windows that agree to omit their + // client-side decorations. + // + // Alternatively, you can override it with a window rule called + // `draw-border-with-background`. + border { + off + width 4 + active-color "#707070" // Neutral gray + inactive-color "#d0d0d0" // Light gray + urgent-color "#cc4444" // Softer red + } + shadow { + softness 30 + spread 5 + offset x=0 y=5 + color "#0007" + } + struts { + } +} +layer-rule { + match namespace="^quickshell$" + place-within-backdrop true +} +overview { + workspace-shadow { + off + } +} +// Add lines like this to spawn processes at startup. +// Note that running niri as a session supports xdg-desktop-autostart, +// which may be more convenient to use. +// See the binds section below for more spawn examples. +// This line starts waybar, a commonly used bar for Wayland compositors. +environment { + XDG_CURRENT_DESKTOP "niri" +} +hotkey-overlay { + skip-at-startup +} +prefer-no-csd +screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" +animations { + workspace-switch { + spring damping-ratio=0.80 stiffness=523 epsilon=0.0001 + } + window-open { + duration-ms 150 + curve "ease-out-expo" + } + window-close { + duration-ms 150 + curve "ease-out-quad" + } + horizontal-view-movement { + spring damping-ratio=0.85 stiffness=423 epsilon=0.0001 + } + window-movement { + spring damping-ratio=0.75 stiffness=323 epsilon=0.0001 + } + window-resize { + spring damping-ratio=0.85 stiffness=423 epsilon=0.0001 + } + config-notification-open-close { + spring damping-ratio=0.65 stiffness=923 epsilon=0.001 + } + screenshot-ui-open { + duration-ms 200 + curve "ease-out-quad" + } + overview-open-close { + spring damping-ratio=0.85 stiffness=800 epsilon=0.0001 + } +} +// Window rules let you adjust behavior for individual windows. +// Find more information on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules +// Work around WezTerm's initial configure bug +// by setting an empty default-column-width. +window-rule { + // This regular expression is intentionally made as specific as possible, + // since this is the default config, and we want no false positives. + // You can get away with just app-id="wezterm" if you want. + match app-id=r#"^org\.wezfurlong\.wezterm$"# + default-column-width {} +} +window-rule { + match app-id=r#"^org\.gnome\."# + draw-border-with-background false + geometry-corner-radius 12 + clip-to-geometry true +} +window-rule { + match app-id=r#"^gnome-control-center$"# + match app-id=r#"^pavucontrol$"# + match app-id=r#"^nm-connection-editor$"# + default-column-width { proportion 0.5; } + open-floating false +} +window-rule { + match app-id=r#"^org\.gnome\.Calculator$"# + match app-id=r#"^gnome-calculator$"# + match app-id=r#"^galculator$"# + match app-id=r#"^blueman-manager$"# + match app-id=r#"^org\.gnome\.Nautilus$"# + match app-id=r#"^xdg-desktop-portal$"# + open-floating true +} +window-rule { + match app-id=r#"^steam$"# title=r#"^notificationtoasts_\d+_desktop$"# + default-floating-position x=10 y=10 relative-to="bottom-right" + open-focused false +} +window-rule { + match app-id=r#"^org\.wezfurlong\.wezterm$"# + match app-id="Alacritty" + match app-id="zen" + match app-id="com.mitchellh.ghostty" + match app-id="kitty" + draw-border-with-background false +} +window-rule { + match app-id=r#"firefox$"# title="^Picture-in-Picture$" + match app-id="zoom" + open-floating true +} +// Open dms windows as floating by default +window-rule { + match app-id=r#"org.quickshell$"# + match app-id=r#"com.danklinux.dms$"# + open-floating true +} +debug { + honor-xdg-activation-with-invalid-serial +} + +// Override to disable super+tab +recent-windows { + binds { + Alt+Tab { next-window scope="output"; } + Alt+Shift+Tab { previous-window scope="output"; } + Alt+grave { next-window filter="app-id"; } + Alt+Shift+grave { previous-window filter="app-id"; } + } +} + +// Include dms files +include "dms/colors.kdl" +include "dms/layout.kdl" +include "dms/alttab.kdl" +include "dms/binds.kdl" +include "dms/outputs.kdl" +include "dms/cursor.kdl" diff --git a/archinstall/default_profiles/desktops/plasma.py b/archinstall/default_profiles/desktops/plasma.py index e90f8a27..66a5ae9a 100644 --- a/archinstall/default_profiles/desktops/plasma.py +++ b/archinstall/default_profiles/desktops/plasma.py @@ -5,8 +5,8 @@ from archinstall.default_profiles.profile import CustomSetting, DisplayServerTyp from archinstall.lib.menu.helpers import Selection from archinstall.lib.packages.packages import available_package, package_group_info from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class PlasmaFlavor(StrEnum): diff --git a/archinstall/default_profiles/desktops/sway.py b/archinstall/default_profiles/desktops/sway.py index 5d222307..7a038dc0 100644 --- a/archinstall/default_profiles/desktops/sway.py +++ b/archinstall/default_profiles/desktops/sway.py @@ -1,11 +1,7 @@ from typing import override -from archinstall.default_profiles.desktops import SeatAccess +from archinstall.default_profiles.desktops.utils import select_seat_access from archinstall.default_profiles.profile import CustomSetting, DisplayServerType, GreeterType, Profile, ProfileType -from archinstall.lib.menu.helpers import Selection -from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType class SwayProfile(Profile): @@ -53,26 +49,8 @@ class SwayProfile(Profile): return [pref] return [] - async def _select_seat_access(self) -> None: - # need to activate seat service and add to seat group - header = tr('Sway needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)') - header += '\n' + tr('Choose an option to give Sway access to your hardware') + '\n' - - items = [MenuItem(s.value, value=s) for s in SeatAccess] - group = MenuItemGroup(items, sort_items=True) - - default = self.custom_settings.get(CustomSetting.SeatAccess, None) - group.set_default_by_value(default) - - result = await Selection[SeatAccess]( - group, - header=header, - allow_skip=False, - ).show() - - if result.type_ == ResultType.Selection: - self.custom_settings[CustomSetting.SeatAccess] = result.get_value().value - @override async def do_on_select(self) -> None: - await self._select_seat_access() + default = self.custom_settings.get(CustomSetting.SeatAccess, None) + seat_access = await select_seat_access(self.name, default) + self.custom_settings[CustomSetting.SeatAccess] = seat_access.value diff --git a/archinstall/default_profiles/desktops/utils.py b/archinstall/default_profiles/desktops/utils.py new file mode 100644 index 00000000..03e85aa5 --- /dev/null +++ b/archinstall/default_profiles/desktops/utils.py @@ -0,0 +1,33 @@ +from enum import Enum + +from archinstall.lib.menu.helpers import Selection +from archinstall.lib.translationhandler import tr +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType + + +class SeatAccess(Enum): + seatd = 'seatd' + polkit = 'polkit' + + +async def select_seat_access(profile_name: str, default: str | None) -> SeatAccess: + header = tr('{} needs access to your seat').format(profile_name) + header += f' ({tr("collection of hardware devices i.e. keyboard, mouse")})' + '\n' + header += tr('Choose an option how to give {} access to your hardware').format(profile_name) + + items = [MenuItem(s.value, value=s) for s in SeatAccess] + group = MenuItemGroup(items, sort_items=True) + + group.set_default_by_value(default) + + result = await Selection[SeatAccess]( + group, + header=header, + allow_skip=False, + ).show() + + if result.type_ == ResultType.Selection: + return result.get_value() + else: + raise ValueError('Unexpected result type from seat access selection') diff --git a/archinstall/default_profiles/profile.py b/archinstall/default_profiles/profile.py index cc56186f..6c328a46 100644 --- a/archinstall/default_profiles/profile.py +++ b/archinstall/default_profiles/profile.py @@ -37,6 +37,7 @@ class GreeterType(Enum): Ly = 'ly' CosmicSession = 'cosmic-greeter' PlasmaLoginManager = 'plasma-login-manager' + GreetdDms = 'dms-greeter' class SelectResult(Enum): diff --git a/archinstall/default_profiles/server.py b/archinstall/default_profiles/server.py index 6833731f..0e2506e0 100644 --- a/archinstall/default_profiles/server.py +++ b/archinstall/default_profiles/server.py @@ -1,11 +1,11 @@ from typing import TYPE_CHECKING, Self, override from archinstall.default_profiles.profile import Profile, ProfileType, SelectResult +from archinstall.lib.log import info from archinstall.lib.menu.helpers import Selection -from archinstall.lib.output import info from archinstall.lib.profile.profiles_handler import profile_handler -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType if TYPE_CHECKING: from archinstall.lib.installer import Installer diff --git a/archinstall/lib/applications/application_menu.py b/archinstall/lib/applications/application_menu.py index 990dcda7..99e48726 100644 --- a/archinstall/lib/applications/application_menu.py +++ b/archinstall/lib/applications/application_menu.py @@ -17,8 +17,8 @@ from archinstall.lib.models.application import ( PrintServiceConfiguration, ) from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class ApplicationMenu(AbstractSubMenu[ApplicationConfiguration]): diff --git a/archinstall/lib/args.py b/archinstall/lib/args.py index 79441a06..e3729504 100644 --- a/archinstall/lib/args.py +++ b/archinstall/lib/args.py @@ -6,6 +6,7 @@ import urllib.error import urllib.parse from argparse import ArgumentParser, Namespace from dataclasses import dataclass, field +from enum import Enum, StrEnum from pathlib import Path from typing import Any, Self from urllib.request import Request, urlopen @@ -13,23 +14,29 @@ from urllib.request import Request, urlopen from pydantic.dataclasses import dataclass as p_dataclass from archinstall.lib.crypt import decrypt +from archinstall.lib.log import debug, error, logger, warn from archinstall.lib.menu.util import get_password from archinstall.lib.models.application import ApplicationConfiguration, ZramConfiguration from archinstall.lib.models.authentication import AuthenticationConfiguration from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration +from archinstall.lib.models.config import SubConfig from archinstall.lib.models.device import DiskEncryption, DiskLayoutConfiguration from archinstall.lib.models.locale import LocaleConfiguration from archinstall.lib.models.mirrors import MirrorConfiguration from archinstall.lib.models.network import NetworkConfiguration +from archinstall.lib.models.package_types import DEFAULT_KERNEL from archinstall.lib.models.packages import Repository from archinstall.lib.models.pacman import PacmanConfiguration from archinstall.lib.models.profile import ProfileConfiguration from archinstall.lib.models.users import Password, User, UserSerialization -from archinstall.lib.output import debug, error, logger, warn from archinstall.lib.plugins import load_plugin from archinstall.lib.translationhandler import Language, tr, translation_handler from archinstall.lib.version import get_version -from archinstall.tui.ui.components import tui +from archinstall.tui.components import tui + + +class SubCommand(Enum): + SHARE_LOG = 'share-log' @p_dataclass @@ -55,6 +62,83 @@ class Arguments: advanced: bool = False verbose: bool = False + command: SubCommand | None = None + + +class ArchConfigType(StrEnum): + VERSION = 'version' + SCRIPT = 'script' + LOCALE_CONFIG = 'locale_config' + ARCHINSTALL_LANGUAGE = 'archinstall_language' + DISK_CONFIG = 'disk_config' + PROFILE_CONFIG = 'profile_config' + MIRROR_CONFIG = 'mirror_config' + NETWORK_CONFIG = 'network_config' + BOOTLOADER_CONFIG = 'bootloader_config' + APP_CONFIG = 'app_config' + AUTH_CONFIG = 'auth_config' + SWAP = 'swap' + USERS = 'users' + ROOT_ENC_PASSWORD = 'root_enc_password' + ENCRYPTION_PASSWORD = 'encryption_password' + HOSTNAME = 'hostname' + KERNELS = 'kernels' + NTP = 'ntp' + TIMEZONE = 'timezone' + SERVICES = 'services' + PACKAGES = 'packages' + PACMAN_CONFIG = 'pacman_config' + CUSTOM_COMMANDS = 'custom_commands' + + def text(self) -> str: + match self: + case ArchConfigType.ARCHINSTALL_LANGUAGE: + return tr('ArchInstall Language') + case ArchConfigType.VERSION: + return tr('Version') + case ArchConfigType.SCRIPT: + return tr('Installation Script') + case ArchConfigType.LOCALE_CONFIG: + return tr('Locales') + case ArchConfigType.DISK_CONFIG: + return tr('Disk configuration') + case ArchConfigType.PROFILE_CONFIG: + return tr('Profile') + case ArchConfigType.MIRROR_CONFIG: + return tr('Mirrors and repositories') + case ArchConfigType.NETWORK_CONFIG: + return tr('Network') + case ArchConfigType.BOOTLOADER_CONFIG: + return tr('Bootloader') + case ArchConfigType.APP_CONFIG: + return tr('Application') + case ArchConfigType.AUTH_CONFIG: + return tr('Authentication') + case ArchConfigType.SWAP: + return tr('Swap') + case ArchConfigType.HOSTNAME: + return tr('Hostname') + case ArchConfigType.KERNELS: + return tr('Kernels') + case ArchConfigType.NTP: + return tr('Automatic time sync (NTP)') + case ArchConfigType.TIMEZONE: + return tr('Timezone') + case ArchConfigType.SERVICES: + return tr('Services') + case ArchConfigType.PACKAGES: + return tr('Additional packages') + case ArchConfigType.PACMAN_CONFIG: + return tr('Pacman') + case ArchConfigType.CUSTOM_COMMANDS: + return tr('Custom commands') + case ArchConfigType.USERS: + return tr('Users') + case ArchConfigType.ROOT_ENC_PASSWORD: + return tr('Root encrypted password') + case ArchConfigType.ENCRYPTION_PASSWORD: + return tr('Disk encryption password') + @dataclass class ArchConfig: @@ -71,7 +155,7 @@ class ArchConfig: auth_config: AuthenticationConfiguration | None = None swap: ZramConfiguration | None = None hostname: str = 'archlinux' - kernels: list[str] = field(default_factory=lambda: ['linux']) + kernels: list[str] = field(default_factory=lambda: [DEFAULT_KERNEL.value]) ntp: bool = True packages: list[str] = field(default_factory=list) pacman_config: PacmanConfiguration = field(default_factory=PacmanConfiguration.default) @@ -79,58 +163,84 @@ class ArchConfig: services: list[str] = field(default_factory=list) custom_commands: list[str] = field(default_factory=list) - def unsafe_config(self) -> dict[str, Any]: - config: dict[str, list[UserSerialization] | str | None] = {} + def unsafe_config(self) -> dict[ArchConfigType, Any]: + config: dict[ArchConfigType, list[UserSerialization] | str | None] = {} if self.auth_config: if self.auth_config.users: - config['users'] = [user.json() for user in self.auth_config.users] + config[ArchConfigType.USERS] = [user.json() for user in self.auth_config.users] if self.auth_config.root_enc_password: - config['root_enc_password'] = self.auth_config.root_enc_password.enc_password + config[ArchConfigType.ROOT_ENC_PASSWORD] = self.auth_config.root_enc_password.enc_password if self.disk_config: disk_encryption = self.disk_config.disk_encryption if disk_encryption and disk_encryption.encryption_password: - config['encryption_password'] = disk_encryption.encryption_password.plaintext + config[ArchConfigType.ENCRYPTION_PASSWORD] = disk_encryption.encryption_password.plaintext return config - def safe_config(self) -> dict[str, Any]: - config: Any = { - 'version': self.version, - 'script': self.script, - 'archinstall-language': self.archinstall_language.json(), - 'hostname': self.hostname, - 'kernels': self.kernels, - 'ntp': self.ntp, - 'packages': self.packages, - 'pacman_config': self.pacman_config.json(), - 'swap': self.swap, - 'timezone': self.timezone, - 'services': self.services, - 'custom_commands': self.custom_commands, - 'bootloader_config': self.bootloader_config.json() if self.bootloader_config else None, - 'app_config': self.app_config.json() if self.app_config else None, - 'auth_config': self.auth_config.json() if self.auth_config else None, + def safe_config(self) -> dict[ArchConfigType, Any]: + base_config: dict[ArchConfigType, Any] = { + ArchConfigType.VERSION: self.version, + ArchConfigType.SCRIPT: self.script, + ArchConfigType.ARCHINSTALL_LANGUAGE: self.archinstall_language.json(), } - if self.locale_config: - config['locale_config'] = self.locale_config.json() + base_config.update(self.plain_cfg()) + sub_config = self.sub_cfg() - if self.disk_config: - config['disk_config'] = self.disk_config.json() + for config_type, value in sub_config.items(): + if not hasattr(value, 'json'): + raise ValueError(f'Config value for {config_type} must implement json() method') + base_config[config_type] = value.json() - if self.profile_config: - config['profile_config'] = self.profile_config.json() + return base_config + + def plain_cfg(self) -> dict[ArchConfigType, str | list[str] | bool]: + return { + ArchConfigType.HOSTNAME: self.hostname, + ArchConfigType.KERNELS: self.kernels, + ArchConfigType.NTP: self.ntp, + ArchConfigType.TIMEZONE: self.timezone, + ArchConfigType.SERVICES: self.services, + ArchConfigType.PACKAGES: self.packages, + ArchConfigType.CUSTOM_COMMANDS: self.custom_commands, + } + + def sub_cfg(self) -> dict[ArchConfigType, SubConfig]: + cfg: dict[ArchConfigType, SubConfig] = { + ArchConfigType.PACMAN_CONFIG: self.pacman_config, + } if self.mirror_config: - config['mirror_config'] = self.mirror_config.json() + cfg[ArchConfigType.MIRROR_CONFIG] = self.mirror_config + + if self.bootloader_config: + cfg[ArchConfigType.BOOTLOADER_CONFIG] = self.bootloader_config + + if self.disk_config: + cfg[ArchConfigType.DISK_CONFIG] = self.disk_config + + if self.swap: + cfg[ArchConfigType.SWAP] = self.swap + + if self.auth_config: + cfg[ArchConfigType.AUTH_CONFIG] = self.auth_config + + if self.locale_config: + cfg[ArchConfigType.LOCALE_CONFIG] = self.locale_config + + if self.profile_config: + cfg[ArchConfigType.PROFILE_CONFIG] = self.profile_config if self.network_config: - config['network_config'] = self.network_config.json() + cfg[ArchConfigType.NETWORK_CONFIG] = self.network_config - return config + if self.app_config: + cfg[ArchConfigType.APP_CONFIG] = self.app_config + + return cfg @classmethod def from_config(cls, args_config: dict[str, Any], args: Arguments) -> Self: @@ -261,13 +371,13 @@ class ArchConfig: class ArchConfigHandler: def __init__(self) -> None: self._parser: ArgumentParser = self._define_arguments() - args: Arguments = self._parse_args() - self._args = args + self._add_sub_parsers() + self._args: Arguments = self._parse_args() config = self._parse_config() try: - self._config = ArchConfig.from_config(config, args) + self._config = ArchConfig.from_config(config, self._args) self._config.version = get_version() except ValueError as err: warn(str(err)) @@ -293,8 +403,13 @@ class ArchConfigHandler: def print_help(self) -> None: self._parser.print_help() + def _add_sub_parsers(self) -> None: + subparsers = self._parser.add_subparsers(dest='command', help='Available subcommands') + _ = subparsers.add_parser(SubCommand.SHARE_LOG.value, help='Upload log file to public server') + def _define_arguments(self) -> ArgumentParser: parser = ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter) + parser.add_argument( '-v', '--version', @@ -430,7 +545,6 @@ class ArchConfigHandler: default=False, help='Enabled verbose options', ) - return parser def _parse_args(self) -> Arguments: diff --git a/archinstall/lib/authentication/authentication_handler.py b/archinstall/lib/authentication/authentication_handler.py index a0b8e132..bae192fd 100644 --- a/archinstall/lib/authentication/authentication_handler.py +++ b/archinstall/lib/authentication/authentication_handler.py @@ -3,9 +3,9 @@ from pathlib import Path from typing import TYPE_CHECKING from archinstall.lib.command import SysCommandWorker +from archinstall.lib.log import debug, info from archinstall.lib.models.authentication import AuthenticationConfiguration, U2FLoginConfiguration, U2FLoginMethod from archinstall.lib.models.users import User -from archinstall.lib.output import debug, info from archinstall.lib.translationhandler import tr if TYPE_CHECKING: @@ -53,7 +53,7 @@ class AuthenticationHandler: def _add_u2f_entry(self, file: Path, entry: str) -> None: if not file.exists(): debug(f'File does not exist: {file}') - return None + return content = file.read_text().splitlines() @@ -81,7 +81,7 @@ class AuthenticationHandler: install_session.pacman.strap('pam-u2f') - print(tr(f'Setting up U2F login: {u2f_config.u2f_login_method.value}')) + print(tr('Setting up U2F login: {}').format(u2f_config.u2f_login_method.value)) # https://developers.yubico.com/pam-u2f/ u2f_auth_file = install_session.target / 'etc/u2f_mappings' diff --git a/archinstall/lib/authentication/authentication_menu.py b/archinstall/lib/authentication/authentication_menu.py index 6bead8ca..497b925b 100644 --- a/archinstall/lib/authentication/authentication_menu.py +++ b/archinstall/lib/authentication/authentication_menu.py @@ -6,11 +6,11 @@ from archinstall.lib.menu.helpers import Confirmation, Selection from archinstall.lib.menu.util import get_password from archinstall.lib.models.authentication import AuthenticationConfiguration, U2FLoginConfiguration, U2FLoginMethod from archinstall.lib.models.users import Password, User -from archinstall.lib.output import FormattedOutput from archinstall.lib.translationhandler import tr from archinstall.lib.user.user_menu import select_users -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.lib.utils.format import as_table +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class AuthenticationMenu(AbstractSubMenu[AuthenticationConfiguration]): @@ -65,7 +65,7 @@ class AuthenticationMenu(AbstractSubMenu[AuthenticationConfiguration]): users: list[User] | None = item.value if users: - return FormattedOutput.as_table(users) + return as_table(users) return None def _prev_root_pwd(self, item: MenuItem) -> str | None: diff --git a/archinstall/lib/boot.py b/archinstall/lib/boot.py index b1e8c888..e8fa4c88 100644 --- a/archinstall/lib/boot.py +++ b/archinstall/lib/boot.py @@ -6,7 +6,7 @@ from typing import ClassVar, Self from archinstall.lib.command import SysCommand, SysCommandWorker from archinstall.lib.exceptions import SysCallError -from archinstall.lib.output import error +from archinstall.lib.log import error class Boot: diff --git a/archinstall/lib/bootloader/bootloader_menu.py b/archinstall/lib/bootloader/bootloader_menu.py index 37eaeb8d..d32a5a21 100644 --- a/archinstall/lib/bootloader/bootloader_menu.py +++ b/archinstall/lib/bootloader/bootloader_menu.py @@ -5,8 +5,8 @@ from archinstall.lib.menu.abstract_menu import AbstractSubMenu from archinstall.lib.menu.helpers import Confirmation, Selection from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class BootloaderMenu(AbstractSubMenu[BootloaderConfiguration]): diff --git a/archinstall/lib/bootloader/utils.py b/archinstall/lib/bootloader/utils.py index a732f4e1..ed761722 100644 --- a/archinstall/lib/bootloader/utils.py +++ b/archinstall/lib/bootloader/utils.py @@ -2,6 +2,7 @@ from dataclasses import dataclass from enum import Enum, auto from pathlib import Path +from archinstall.lib.hardware import SysInfo from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration from archinstall.lib.models.device import DiskLayoutConfiguration @@ -9,6 +10,8 @@ from archinstall.lib.models.device import DiskLayoutConfiguration class BootloaderValidationFailureKind(Enum): LimineNonFatBoot = auto() LimineLayout = auto() + BootloaderRequiresUefi = auto() + EfistubNonFatBoot = auto() @dataclass(frozen=True) @@ -29,12 +32,32 @@ def validate_bootloader_layout( if not (bootloader_config and disk_config): return None - if bootloader_config.bootloader == Bootloader.Limine: - boot_part = next( - (p for m in disk_config.device_modifications if (p := m.get_boot_partition())), - None, + bootloader = bootloader_config.bootloader + + if bootloader == Bootloader.NO_BOOTLOADER: + return None + + if bootloader.is_uefi_only() and not SysInfo.has_uefi(): + return BootloaderValidationFailure( + kind=BootloaderValidationFailureKind.BootloaderRequiresUefi, + description=f'{bootloader.value} requires a UEFI system.', ) + boot_part = next( + (p for m in disk_config.device_modifications if (p := m.get_boot_partition())), + None, + ) + + if bootloader == Bootloader.Efistub: + # The UEFI firmware reads the kernel directly from the boot partition, + # which must be FAT. + if boot_part and (boot_part.fs_type is None or not boot_part.fs_type.is_fat()): + return BootloaderValidationFailure( + kind=BootloaderValidationFailureKind.EfistubNonFatBoot, + description='Efistub does not support booting with a non-FAT boot partition.', + ) + + if bootloader == Bootloader.Limine: # Limine reads its config and kernels from the boot partition, which # must be FAT. if boot_part and (boot_part.fs_type is None or not boot_part.fs_type.is_fat()): diff --git a/archinstall/lib/command.py b/archinstall/lib/command.py index b99854d2..b0d45754 100644 --- a/archinstall/lib/command.py +++ b/archinstall/lib/command.py @@ -11,7 +11,7 @@ from types import TracebackType from typing import Any, Self, override from archinstall.lib.exceptions import RequirementError, SysCallError -from archinstall.lib.output import debug, error, logger +from archinstall.lib.log import debug, error, logger from archinstall.lib.utils.encoding import clear_vt100_escape_codes diff --git a/archinstall/lib/configuration.py b/archinstall/lib/configuration.py index 39d39511..f0096872 100644 --- a/archinstall/lib/configuration.py +++ b/archinstall/lib/configuration.py @@ -6,14 +6,16 @@ from typing import Any from pydantic import TypeAdapter -from archinstall.lib.args import ArchConfig +from archinstall.lib.args import ArchConfig, ArchConfigType from archinstall.lib.crypt import encrypt +from archinstall.lib.log import debug, logger, warn from archinstall.lib.menu.helpers import Confirmation, Selection from archinstall.lib.menu.util import get_password, prompt_dir -from archinstall.lib.output import debug, logger, warn +from archinstall.lib.models.network import NetworkConfiguration from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.lib.utils.format import as_key_value_pair +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class ConfigurationOutput: @@ -43,25 +45,51 @@ class ConfigurationOutput: def user_config_to_json(self) -> str: config = self._config.safe_config() - adapter = TypeAdapter(dict[str, Any]) + adapter = TypeAdapter(dict[ArchConfigType, Any]) python_dict = adapter.dump_python(config) return json.dumps(python_dict, indent=4, sort_keys=True) def user_credentials_to_json(self) -> str: - config = self._config.unsafe_config() + cfg = self._config.unsafe_config() - adapter = TypeAdapter(dict[str, Any]) - python_dict = adapter.dump_python(config) + adapter = TypeAdapter(dict[ArchConfigType, Any]) + python_dict = adapter.dump_python(cfg) return json.dumps(python_dict, indent=4, sort_keys=True) def write_debug(self) -> None: debug(' -- Chosen configuration --') debug(self.user_config_to_json()) - async def confirm_config(self) -> bool: + def as_summary(self) -> str: + """ + Render a concise two-column summary of the current configuration. + + Returns an empty string if nothing meaningful to show. + """ + cfg: dict[str, str | list[str] | bool] = {} + + for key, value in self._config.plain_cfg().items(): + cfg[key.text()] = value + + for config_type, obj in self._config.sub_cfg().items(): + if not hasattr(obj, 'summary'): + continue + + summary = obj.summary() + if summary: + cfg[config_type.text()] = summary + + simple_summary = as_key_value_pair(cfg, ignore_empty=True) + + return simple_summary + + async def confirm_config(self, show_install_warnings: bool = False) -> bool: header = f'{tr("The specified configuration will be applied")}. ' header += tr('Would you like to continue?') + '\n' + if show_install_warnings: + header += self._render_install_warnings() + group = MenuItemGroup.yes_no() group.set_preview_for_all(lambda x: self.user_config_to_json()) @@ -79,6 +107,22 @@ class ConfigurationOutput: return True + def get_install_warnings(self) -> list[str]: + warnings: list[str] = [] + + if not isinstance(self._config.network_config, NetworkConfiguration): + warnings.append(tr('Warning: no network configuration selected. Network will need to be set up manually on the installed system.')) + + return warnings + + def _render_install_warnings(self) -> str: + warnings = self.get_install_warnings() + + if not warnings: + return '' + + return '\n' + '\n'.join(f'[yellow]{w}[/]' for w in warnings) + '\n' + def _is_valid_path(self, dest_path: Path) -> bool: dest_path_ok = dest_path.exists() and dest_path.is_dir() if not dest_path_ok: diff --git a/archinstall/lib/crypt.py b/archinstall/lib/crypt.py index 99fa62d6..b7ad4edf 100644 --- a/archinstall/lib/crypt.py +++ b/archinstall/lib/crypt.py @@ -6,7 +6,7 @@ from pathlib import Path from cryptography.fernet import Fernet, InvalidToken from cryptography.hazmat.primitives.kdf.argon2 import Argon2id -from archinstall.lib.output import debug +from archinstall.lib.log import debug libcrypt = ctypes.CDLL('libcrypt.so') diff --git a/archinstall/lib/disk/device_handler.py b/archinstall/lib/disk/device_handler.py index 2e51d3d2..360cbfd1 100644 --- a/archinstall/lib/disk/device_handler.py +++ b/archinstall/lib/disk/device_handler.py @@ -15,6 +15,7 @@ from archinstall.lib.disk.utils import ( umount, ) from archinstall.lib.exceptions import DiskError, SysCallError, UnknownFilesystemFormat +from archinstall.lib.log import debug, error, info, log from archinstall.lib.models.device import ( DEFAULT_ITER_TIME, BDevice, @@ -35,7 +36,6 @@ from archinstall.lib.models.device import ( _PartitionInfo, ) from archinstall.lib.models.users import Password -from archinstall.lib.output import debug, error, info, log from archinstall.lib.pathnames import ARCHISO_MOUNTPOINT diff --git a/archinstall/lib/disk/disk_menu.py b/archinstall/lib/disk/disk_menu.py index 9743ee78..f8e8e2e3 100644 --- a/archinstall/lib/disk/disk_menu.py +++ b/archinstall/lib/disk/disk_menu.py @@ -5,6 +5,7 @@ from typing import override from archinstall.lib.disk.device_handler import device_handler from archinstall.lib.disk.encryption_menu import DiskEncryptionMenu from archinstall.lib.disk.partitioning_menu import manual_partitioning +from archinstall.lib.log import debug from archinstall.lib.menu.abstract_menu import AbstractSubMenu from archinstall.lib.menu.helpers import Confirmation, Notify, Selection, Table from archinstall.lib.menu.util import prompt_dir @@ -35,10 +36,10 @@ from archinstall.lib.models.device import ( Unit, _DeviceInfo, ) -from archinstall.lib.output import FormattedOutput, debug from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.lib.utils.format import as_table +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType @dataclass @@ -221,7 +222,7 @@ class DiskLayoutConfigurationMenu(AbstractSubMenu[DiskMenuConfig]): for mod in device_mods: # create partition table - partition_table = FormattedOutput.as_table(mod.partitions) + partition_table = as_table(mod.partitions) output_partition += f'{mod.device_path}: {mod.device.device_info.model}\n' output_partition += '{}: {}\n'.format(tr('Wipe'), mod.wipe) @@ -230,7 +231,7 @@ class DiskLayoutConfigurationMenu(AbstractSubMenu[DiskMenuConfig]): # create btrfs table btrfs_partitions = [p for p in mod.partitions if p.btrfs_subvols] for partition in btrfs_partitions: - output_btrfs += FormattedOutput.as_table(partition.btrfs_subvols) + '\n' + output_btrfs += as_table(partition.btrfs_subvols) + '\n' output = output_partition + output_btrfs return output.rstrip() @@ -246,12 +247,12 @@ class DiskLayoutConfigurationMenu(AbstractSubMenu[DiskMenuConfig]): output = '{}: {}\n'.format(tr('Configuration'), lvm_config.config_type.display_msg()) for vol_gp in lvm_config.vol_groups: - pv_table = FormattedOutput.as_table(vol_gp.pvs) + pv_table = as_table(vol_gp.pvs) output += '{}:\n{}'.format(tr('Physical volumes'), pv_table) output += f'\nVolume Group: {vol_gp.name}' - lvm_volumes = FormattedOutput.as_table(vol_gp.volumes) + lvm_volumes = as_table(vol_gp.volumes) output += '\n\n{}:\n{}'.format(tr('Volumes'), lvm_volumes) return output @@ -302,7 +303,7 @@ async def select_devices(preset: list[BDevice] | None = []) -> list[BDevice] | N dev = device_handler.get_device(device.path) if dev and dev.partition_infos: - return FormattedOutput.as_table(dev.partition_infos) + return as_table(dev.partition_infos) return None if preset is None: diff --git a/archinstall/lib/disk/encryption_menu.py b/archinstall/lib/disk/encryption_menu.py index 39c631cd..53aa73fe 100644 --- a/archinstall/lib/disk/encryption_menu.py +++ b/archinstall/lib/disk/encryption_menu.py @@ -17,10 +17,10 @@ from archinstall.lib.models.device import ( PartitionModification, ) from archinstall.lib.models.users import Password -from archinstall.lib.output import FormattedOutput from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.lib.utils.format import as_table +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class DiskEncryptionMenu(AbstractSubMenu[DiskEncryption]): @@ -199,7 +199,7 @@ class DiskEncryptionMenu(AbstractSubMenu[DiskEncryption]): def _prev_partitions(self, item: MenuItem) -> str | None: if item.value: output = tr('Partitions to be encrypted') + '\n' - output += FormattedOutput.as_table(item.value) + output += as_table(item.value) return output.rstrip() return None @@ -207,7 +207,7 @@ class DiskEncryptionMenu(AbstractSubMenu[DiskEncryption]): def _prev_lvm_vols(self, item: MenuItem) -> str | None: if item.value: output = tr('LVM volumes to be encrypted') + '\n' - output += FormattedOutput.as_table(item.value) + output += as_table(item.value) return output.rstrip() return None @@ -375,7 +375,7 @@ async def select_lvm_vols_to_encrypt( async def select_iteration_time(preset: int | None = None) -> int | None: header = tr('Enter iteration time for LUKS encryption (in milliseconds)') + '\n' header += tr('Higher values increase security but slow down boot time') + '\n' - header += tr(f'Default: {DEFAULT_ITER_TIME}ms, Recommended range: 1000-60000') + '\n' + header += tr('Default: {}ms, Recommended range: 1000-60000').format(DEFAULT_ITER_TIME) + '\n' def validate_iter_time(value: str) -> str | None: try: diff --git a/archinstall/lib/disk/fido.py b/archinstall/lib/disk/fido.py index 0538417f..6392b55c 100644 --- a/archinstall/lib/disk/fido.py +++ b/archinstall/lib/disk/fido.py @@ -4,9 +4,9 @@ from typing import ClassVar from archinstall.lib.command import SysCommand, SysCommandWorker from archinstall.lib.exceptions import SysCallError +from archinstall.lib.log import error, info from archinstall.lib.models.device import Fido2Device from archinstall.lib.models.users import Password -from archinstall.lib.output import error, info from archinstall.lib.utils.encoding import clear_vt100_escape_codes_from_str diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py index 1afa8c6e..2c51b09d 100644 --- a/archinstall/lib/disk/filesystem.py +++ b/archinstall/lib/disk/filesystem.py @@ -13,6 +13,7 @@ from archinstall.lib.disk.lvm import ( lvm_vol_reduce, ) from archinstall.lib.disk.utils import udev_sync +from archinstall.lib.log import debug, info from archinstall.lib.models.device import ( DiskEncryption, DiskLayoutConfiguration, @@ -27,7 +28,6 @@ from archinstall.lib.models.device import ( Size, Unit, ) -from archinstall.lib.output import debug, info class FilesystemHandler: diff --git a/archinstall/lib/disk/luks.py b/archinstall/lib/disk/luks.py index 275222f8..5d62abc8 100644 --- a/archinstall/lib/disk/luks.py +++ b/archinstall/lib/disk/luks.py @@ -7,9 +7,9 @@ from types import TracebackType from archinstall.lib.command import SysCommand, SysCommandWorker, run from archinstall.lib.disk.utils import get_lsblk_info, umount from archinstall.lib.exceptions import DiskError, SysCallError +from archinstall.lib.log import debug, info from archinstall.lib.models.device import DEFAULT_ITER_TIME from archinstall.lib.models.users import Password -from archinstall.lib.output import debug, info from archinstall.lib.utils.util import generate_password diff --git a/archinstall/lib/disk/lvm.py b/archinstall/lib/disk/lvm.py index 34ae9a26..c2c5b6a6 100644 --- a/archinstall/lib/disk/lvm.py +++ b/archinstall/lib/disk/lvm.py @@ -7,6 +7,7 @@ from typing import Literal, overload from archinstall.lib.command import SysCommand, SysCommandWorker from archinstall.lib.disk.utils import udev_sync from archinstall.lib.exceptions import SysCallError +from archinstall.lib.log import debug from archinstall.lib.models.device import ( LvmGroupInfo, LvmPVInfo, @@ -17,7 +18,6 @@ from archinstall.lib.models.device import ( Size, Unit, ) -from archinstall.lib.output import debug def _lvm_info( diff --git a/archinstall/lib/disk/partitioning_menu.py b/archinstall/lib/disk/partitioning_menu.py index 7e07d776..b8ddd231 100644 --- a/archinstall/lib/disk/partitioning_menu.py +++ b/archinstall/lib/disk/partitioning_menu.py @@ -19,10 +19,10 @@ from archinstall.lib.models.device import ( Size, Unit, ) -from archinstall.lib.output import FormattedOutput from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.lib.utils.format import as_table +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class FreeSpace: @@ -479,7 +479,7 @@ class PartitioningList(ListManager[DiskSegment]): sector_size = device_info.sector_size text = tr('Selected free space segment on device {}:').format(device_info.path) + '\n\n' - free_space_table = FormattedOutput.as_table([free_space]) + free_space_table = as_table([free_space]) prompt = text + free_space_table + '\n' max_sectors = free_space.length.format_size(Unit.sectors, sector_size) diff --git a/archinstall/lib/disk/subvolume_menu.py b/archinstall/lib/disk/subvolume_menu.py index 0f8da9e7..94854b3c 100644 --- a/archinstall/lib/disk/subvolume_menu.py +++ b/archinstall/lib/disk/subvolume_menu.py @@ -6,7 +6,7 @@ from archinstall.lib.menu.list_manager import ListManager from archinstall.lib.menu.util import prompt_dir from archinstall.lib.models.device import SubvolumeModification from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.result import ResultType +from archinstall.tui.result import ResultType class SubvolumeMenu(ListManager[SubvolumeModification]): diff --git a/archinstall/lib/disk/utils.py b/archinstall/lib/disk/utils.py index 808ff451..900445e1 100644 --- a/archinstall/lib/disk/utils.py +++ b/archinstall/lib/disk/utils.py @@ -4,8 +4,8 @@ from pydantic import BaseModel from archinstall.lib.command import SysCommand from archinstall.lib.exceptions import DiskError, SysCallError +from archinstall.lib.log import debug, info, warn from archinstall.lib.models.device import LsblkInfo -from archinstall.lib.output import debug, info, warn class LsblkOutput(BaseModel): diff --git a/archinstall/lib/general/general_menu.py b/archinstall/lib/general/general_menu.py index 257b61e5..dcf7d8aa 100644 --- a/archinstall/lib/general/general_menu.py +++ b/archinstall/lib/general/general_menu.py @@ -1,11 +1,11 @@ from enum import Enum from archinstall.lib.locale.utils import list_timezones +from archinstall.lib.log import warn from archinstall.lib.menu.helpers import Confirmation, Input, Selection -from archinstall.lib.output import warn from archinstall.lib.translationhandler import Language, tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class PostInstallationAction(Enum): diff --git a/archinstall/lib/general/system_menu.py b/archinstall/lib/general/system_menu.py index 5c4d4634..82dc4cdb 100644 --- a/archinstall/lib/general/system_menu.py +++ b/archinstall/lib/general/system_menu.py @@ -3,29 +3,24 @@ from typing import assert_never from archinstall.lib.hardware import GfxDriver, SysInfo from archinstall.lib.menu.helpers import Confirmation, Selection from archinstall.lib.models.application import ZramAlgorithm, ZramConfiguration +from archinstall.lib.models.package_types import DEFAULT_KERNEL, Kernel from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType -async def select_kernel(preset: list[str] = []) -> list[str]: +async def select_kernel(preset: list[Kernel] = []) -> list[Kernel]: """ Asks the user to select a kernel for system. :return: The string as a selected kernel :rtype: string """ - kernels = ['linux', 'linux-lts', 'linux-zen', 'linux-hardened'] - default_kernel = 'linux' + group = MenuItemGroup.from_enum(Kernel, sort_items=True, preset=preset) + group.set_default_by_value(DEFAULT_KERNEL) + group.set_focus_by_value(DEFAULT_KERNEL) - items = [MenuItem(k, value=k) for k in kernels] - - group = MenuItemGroup(items, sort_items=True) - group.set_default_by_value(default_kernel) - group.set_focus_by_value(default_kernel) - group.set_selected_by_value(preset) - - result = await Selection[str]( + result = await Selection[Kernel]( group, header=tr('Select which kernel(s) to install'), allow_skip=True, diff --git a/archinstall/lib/global_menu.py b/archinstall/lib/global_menu.py index 3d94f31e..45a0e3b4 100644 --- a/archinstall/lib/global_menu.py +++ b/archinstall/lib/global_menu.py @@ -6,7 +6,7 @@ from archinstall.lib.args import ArchConfig from archinstall.lib.authentication.authentication_menu import AuthenticationMenu from archinstall.lib.bootloader.bootloader_menu import BootloaderMenu from archinstall.lib.bootloader.utils import validate_bootloader_layout -from archinstall.lib.configuration import save_config +from archinstall.lib.configuration import ConfigurationOutput, save_config from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu from archinstall.lib.general.general_menu import select_hostname, select_ntp, select_timezone from archinstall.lib.general.system_menu import select_kernel, select_swap @@ -22,17 +22,18 @@ from archinstall.lib.models.device import DiskLayoutConfiguration, DiskLayoutTyp from archinstall.lib.models.locale import LocaleConfiguration from archinstall.lib.models.mirrors import MirrorConfiguration from archinstall.lib.models.network import NetworkConfiguration, NicType +from archinstall.lib.models.package_types import DEFAULT_KERNEL from archinstall.lib.models.packages import Repository from archinstall.lib.models.pacman import PacmanConfiguration from archinstall.lib.models.profile import ProfileConfiguration from archinstall.lib.network.network_menu import select_network -from archinstall.lib.output import FormattedOutput from archinstall.lib.packages.packages import list_available_packages, select_additional_packages from archinstall.lib.pacman.config import PacmanConfig from archinstall.lib.pacman.pacman_menu import PacmanMenu from archinstall.lib.translationhandler import Language, tr, translation_handler -from archinstall.tui.ui.components import tui -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup +from archinstall.lib.utils.format import as_table +from archinstall.tui.components import tui +from archinstall.tui.menu_item import MenuItem, MenuItemGroup class GlobalMenu(AbstractMenu[None]): @@ -103,7 +104,7 @@ class GlobalMenu(AbstractMenu[None]): ), MenuItem( text=tr('Kernels'), - value=['linux'], + value=[DEFAULT_KERNEL], action=select_kernel, preview_action=self._prev_kernel, mandatory=True, @@ -298,7 +299,7 @@ class GlobalMenu(AbstractMenu[None]): if item.value: network_config: NetworkConfiguration = item.value if network_config.type == NicType.MANUAL: - output = FormattedOutput.as_table(network_config.nics) + output = as_table(network_config.nics) else: output = f'{tr("Network configuration")}:\n{network_config.type.display_msg()}' @@ -320,7 +321,7 @@ class GlobalMenu(AbstractMenu[None]): output += f'{tr("Root password")}: {auth_config.root_enc_password.hidden()}\n' if auth_config.users: - output += FormattedOutput.as_table(auth_config.users) + '\n' + output += as_table(auth_config.users) + '\n' if auth_config.u2f_config: u2f_config = auth_config.u2f_config @@ -461,8 +462,6 @@ class GlobalMenu(AbstractMenu[None]): if not bootloader_config or bootloader_config.bootloader == Bootloader.NO_BOOTLOADER: return None - bootloader = bootloader_config.bootloader - if disk_config := self._item_group.find_by_key('disk_config').value: for layout in disk_config.device_modifications: if root_partition := layout.get_root_partition(): @@ -490,9 +489,6 @@ class GlobalMenu(AbstractMenu[None]): if efi_partition.fs_type is None or not efi_partition.fs_type.is_fat(): return 'ESP must be formatted as a FAT filesystem' - if bootloader == Bootloader.Refind and not self._uefi: - return 'rEFInd can only be used on UEFI systems' - if failure := validate_bootloader_layout(bootloader_config, disk_config): return failure.description @@ -506,9 +502,13 @@ class GlobalMenu(AbstractMenu[None]): return text[:-1] # remove last new line if error := self._validate_bootloader(): - return tr(f'Invalid configuration: {error}') + return tr('Invalid configuration: {}').format(error) - return None + self.sync_all_to_config() + summary = ConfigurationOutput(self._arch_config).as_summary() + if summary: + return f'{tr("Ready to install")}\n\n{summary}' + return tr('Ready to install') def _prev_profile(self, item: MenuItem) -> str | None: profile_config: ProfileConfiguration | None = item.value @@ -612,7 +612,7 @@ class GlobalMenu(AbstractMenu[None]): if mirror_config.custom_repositories: title = tr('Custom repositories') - table = FormattedOutput.as_table(mirror_config.custom_repositories) + table = as_table(mirror_config.custom_repositories) output += f'{title}:\n\n{table}' return output.strip() diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py index 09b3eb5f..f1587a3c 100644 --- a/archinstall/lib/hardware.py +++ b/archinstall/lib/hardware.py @@ -6,8 +6,8 @@ from typing import Self from archinstall.lib.command import SysCommand from archinstall.lib.exceptions import SysCallError +from archinstall.lib.log import debug from archinstall.lib.networking import enrich_iface_types, list_interfaces -from archinstall.lib.output import debug from archinstall.lib.translationhandler import tr @@ -68,6 +68,19 @@ class GfxDriver(Enum): case _: return False + def is_nvidia_proprietary(self) -> bool: + """ + True for Nvidia drivers that ship proprietary userspace components. + Currently only NvidiaOpenKernel (nvidia-open-dkms): open kernel module + paired with proprietary userspace. NvidiaOpenSource (nouveau) is fully + open and works with Sway, so it is excluded. + """ + match self: + case GfxDriver.NvidiaOpenKernel: + return True + case _: + return False + def packages_text(self) -> str: pkg_names = [p.value for p in self.gfx_packages()] text = tr('Installed packages') + ':\n' diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 19560d75..bf7d91ba 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -29,6 +29,7 @@ from archinstall.lib.exceptions import DiskError, HardwareIncompatibilityError, from archinstall.lib.hardware import SysInfo from archinstall.lib.linux_path import LPath from archinstall.lib.locale.utils import verify_keyboard_layout, verify_x11_keyboard_layout +from archinstall.lib.log import debug, error, info, log, logger, warn from archinstall.lib.mirror.mirror_handler import MirrorListHandler from archinstall.lib.models.application import ZramAlgorithm from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration @@ -48,10 +49,10 @@ from archinstall.lib.models.device import ( from archinstall.lib.models.locale import LocaleConfiguration from archinstall.lib.models.mirrors import MirrorConfiguration from archinstall.lib.models.network import Nic +from archinstall.lib.models.package_types import DEFAULT_KERNEL, Kernel from archinstall.lib.models.packages import Repository from archinstall.lib.models.pacman import PacmanConfiguration from archinstall.lib.models.users import User -from archinstall.lib.output import debug, error, info, log, logger, warn from archinstall.lib.packages.packages import installed_package from archinstall.lib.pacman.config import PacmanConfig from archinstall.lib.pacman.pacman import Pacman @@ -60,7 +61,12 @@ from archinstall.lib.plugins import plugins from archinstall.lib.translationhandler import tr # Any package that the Installer() is responsible for (optional and the default ones) -__packages__ = ['base', 'sudo', 'linux-firmware', 'linux', 'linux-lts', 'linux-zen', 'linux-hardened'] +# https://github.com/archlinux/archinstall/issues/4368 +# mkinitcpio is listed explicitly so pacstrap installs it deterministically. Otherwise +# pacman picks the first initramfs provider from the host's pacman.conf, which on non-Arch +# hosts (EndeavourOS prefers dracut, etc.) breaks the installer's mkinitcpio() and +# _config_uki() methods that assume mkinitcpio is present in the chroot. +__packages__ = ['base', 'sudo', 'linux-firmware', 'mkinitcpio'] + [k.value for k in Kernel] # Additional packages that are installed if the user is running the Live ISO with accessibility tools enabled __accessibility_packages__ = ['brltty', 'espeakup', 'alsa-utils'] @@ -79,8 +85,8 @@ class Installer: `Installer()` is the wrapper for most basic installation steps. It also wraps :py:func:`~archinstall.Installer.pacstrap` among other things. """ - self._base_packages = base_packages or __packages__[:3] - self.kernels = kernels or ['linux'] + self._base_packages = base_packages or __packages__[:4] + self.kernels = kernels or [DEFAULT_KERNEL.value] self._disk_config = disk_config self._disk_encryption = disk_config.disk_encryption or DiskEncryption(EncryptionType.NO_ENCRYPTION) @@ -183,10 +189,10 @@ class Installer: if not skip_ntp: info(tr('Waiting for time sync (timedatectl show) to complete.')) - started_wait = time.time() + started_wait = time.monotonic() notified = False while True: - if not notified and time.time() - started_wait > 5: + if not notified and time.monotonic() - started_wait > 5: notified = True warn(tr('Time synchronization not completing, while you wait - check the docs for workarounds: https://archinstall.readthedocs.io/')) @@ -369,7 +375,12 @@ class Installer: # it would be none if it's btrfs as the subvolumes will have the mountpoints defined if part_mod.mountpoint: target = self.target / part_mod.relative_mountpoint - mount(part_mod.dev_path, target, options=part_mod.mount_options) + options = part_mod.mount_options + + if part_mod.is_efi(): + options = list(dict.fromkeys(options + ['fmask=0077', 'dmask=0077'])) + + mount(part_mod.dev_path, target, options=options) elif part_mod.fs_type == FilesystemType.BTRFS: # Only mount BTRFS subvolumes that have mountpoints specified subvols_with_mountpoints = [sv for sv in part_mod.btrfs_subvols if sv.mountpoint is not None] @@ -396,7 +407,7 @@ class Installer: def _mount_luks_partition(self, part_mod: PartitionModification, luks_handler: Luks2) -> None: if not luks_handler.mapper_dev: - return None + return if part_mod.fs_type == FilesystemType.BTRFS and part_mod.btrfs_subvols: # Only mount BTRFS subvolumes that have mountpoints specified @@ -739,6 +750,9 @@ class Installer: return self.run_command(cmd, peek_output=peek_output) + def _chroot_argv(self, *args: str) -> list[str]: + return ['arch-chroot', '-S', str(self.target), *args] + def drop_to_shell(self) -> None: subprocess.check_call(f'arch-chroot {self.target}', shell=True) @@ -987,17 +1001,7 @@ class Installer: } for config_name, mountpoint in snapper.items(): - command = [ - 'arch-chroot', - '-S', - str(self.target), - 'snapper', - '--no-dbus', - '-c', - config_name, - 'create-config', - mountpoint, - ] + command = self._chroot_argv('snapper', '--no-dbus', '-c', config_name, 'create-config', mountpoint) try: SysCommand(command, peek_output=True) @@ -1336,13 +1340,7 @@ class Installer: boot_dir = Path('/boot') - command = [ - 'arch-chroot', - '-S', - str(self.target), - 'grub-install', - '--debug', - ] + command = self._chroot_argv('grub-install', '--debug') if SysInfo.has_uefi(): if not efi_partition: @@ -1761,6 +1759,7 @@ class Installer: self, root: PartitionModification | LvmVolume, efi_partition: PartitionModification | None, + keep_initramfs: bool = False, ) -> None: if not efi_partition or not efi_partition.mountpoint: raise ValueError(f'Could not detect ESP at mountpoint {self.target}') @@ -1784,11 +1783,11 @@ class Installer: config = preset.read_text().splitlines(True) for index, line in enumerate(config): - # Avoid storing redundant image file if m := image_re.match(line): - image = self.target / m.group(2) - image.unlink(missing_ok=True) - config[index] = '#' + m.group(1) + if not keep_initramfs: + image = self.target / m.group(2) + image.unlink(missing_ok=True) + config[index] = '#' + m.group(1) elif m := uki_re.match(line): if diff_mountpoint: config[index] = m.group(2) + diff_mountpoint + m.group(3) @@ -1807,7 +1806,12 @@ class Installer: if not self.mkinitcpio(['-P']): error('Error generating initramfs (continuing anyway)') - def add_bootloader(self, bootloader: Bootloader, uki_enabled: bool = False, bootloader_removable: bool = False) -> None: + def add_bootloader( + self, + bootloader: Bootloader, + uki_enabled: bool = False, + bootloader_removable: bool = False, + ) -> None: """ Adds a bootloader to the installation instance. Archinstall supports one of five types: @@ -1856,7 +1860,13 @@ class Installer: bootloader_removable = False if uki_enabled: - self._config_uki(root, efi_partition) + keep_initramfs = ( + bootloader == Bootloader.Grub + and self._disk_config.has_default_btrfs_vols() + and self._disk_config.btrfs_options is not None + and self._disk_config.btrfs_options.snapshot_config is not None + ) + self._config_uki(root, efi_partition, keep_initramfs) match bootloader: case Bootloader.Systemd: @@ -1922,16 +1932,17 @@ class Installer: if not handled_by_plugin: info(f'Creating user {user.username}') - cmd = 'useradd -m' + cmd = self._chroot_argv('useradd', '-m') if user.sudo: - cmd += ' -G wheel' + cmd += ['-G', 'wheel'] - cmd += f' {user.username}' + cmd += ['--', user.username] try: - self.arch_chroot(cmd) - except SysCallError as err: + run(cmd) + except CalledProcessError as err: + debug(f'Error creating user {user.username}: {err}') raise SystemError(f'Could not create user inside installation: {err}') for plugin in plugins.values(): @@ -1942,7 +1953,11 @@ class Installer: self.set_user_password(user) for group in user.groups: - self.arch_chroot(f'gpasswd -a {user.username} {group}') + cmd = self._chroot_argv('gpasswd', '-a', user.username, group) + try: + run(cmd) + except CalledProcessError as err: + warn(f'Failed to add {user.username} to group {group}: {err}') if user.sudo: self.enable_sudo(user) @@ -1957,7 +1972,7 @@ class Installer: return False input_data = f'{user.username}:{enc_password}'.encode() - cmd = ['arch-chroot', '-S', str(self.target), 'chpasswd', '--encrypted'] + cmd = self._chroot_argv('chpasswd', '--encrypted') try: run(cmd, input_data=input_data) @@ -1969,7 +1984,7 @@ class Installer: def user_set_shell(self, user: str, shell: str) -> bool: info(f'Setting shell for {user} to {shell}') - cmd = ['arch-chroot', '-S', str(self.target), 'chsh', '-s', shell, user] + cmd = self._chroot_argv('chsh', '-s', shell, user) try: run(cmd) return True @@ -1979,7 +1994,7 @@ class Installer: def chown(self, owner: str, path: str, options: list[str] | None = None) -> bool: options = options or [] - cmd = ['arch-chroot', '-S', str(self.target), 'chown', *options, owner, path] + cmd = self._chroot_argv('chown', *options, '--', owner, path) try: run(cmd) return True @@ -1990,12 +2005,10 @@ class Installer: def set_vconsole(self, locale_config: LocaleConfiguration) -> None: # use the already set kb layout kb_vconsole: str = locale_config.kb_layout - # this is the default used in ISO other option for hdpi screens TER16x32 - # can be checked using - # zgrep "CONFIG_FONT" /proc/config.gz - # https://wiki.archlinux.org/title/Linux_console#Fonts + font_vconsole = locale_config.console_font - font_vconsole = 'default8x16' + if font_vconsole.startswith('ter-'): + self.pacman.strap(['terminus-font']) # Ensure /etc exists vconsole_dir: Path = self.target / 'etc' diff --git a/archinstall/lib/locale/locale_menu.py b/archinstall/lib/locale/locale_menu.py index c03824a1..add9fc2d 100644 --- a/archinstall/lib/locale/locale_menu.py +++ b/archinstall/lib/locale/locale_menu.py @@ -1,12 +1,12 @@ from typing import override -from archinstall.lib.locale.utils import list_keyboard_languages, list_locales, set_kb_layout +from archinstall.lib.locale.utils import list_console_fonts, list_keyboard_languages, list_locales, set_kb_layout from archinstall.lib.menu.abstract_menu import AbstractSubMenu from archinstall.lib.menu.helpers import Selection from archinstall.lib.models.locale import LocaleConfiguration from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class LocaleMenu(AbstractSubMenu[LocaleConfiguration]): @@ -47,6 +47,13 @@ class LocaleMenu(AbstractSubMenu[LocaleConfiguration]): preview_action=lambda item: item.get_value(), key='sys_enc', ), + MenuItem( + text=tr('Console font'), + action=select_console_font, + value=self._locale_conf.console_font, + preview_action=lambda item: item.get_value(), + key='console_font', + ), ] @override @@ -140,3 +147,25 @@ async def select_kb_layout(preset: str | None = None) -> str | None: return preset case _: raise ValueError('Unhandled return type') + + +async def select_console_font(preset: str | None = None) -> str | None: + fonts = list_console_fonts() + + items = [MenuItem(f, value=f) for f in fonts] + group = MenuItemGroup(items, sort_items=False) + group.set_focus_by_value(preset) + + result = await Selection[str]( + header=tr('Console font'), + group=group, + enable_filter=True, + ).show() + + match result.type_: + case ResultType.Selection: + return result.get_value() + case ResultType.Skip: + return preset + case _: + raise ValueError('Unhandled return type') diff --git a/archinstall/lib/locale/utils.py b/archinstall/lib/locale/utils.py index e7229160..31946028 100644 --- a/archinstall/lib/locale/utils.py +++ b/archinstall/lib/locale/utils.py @@ -1,6 +1,9 @@ +from functools import lru_cache +from pathlib import Path + from archinstall.lib.command import SysCommand from archinstall.lib.exceptions import ServiceException, SysCallError -from archinstall.lib.output import error +from archinstall.lib.log import error from archinstall.lib.utils.util import running_from_iso @@ -26,6 +29,13 @@ def list_locales() -> list[str]: return locales +@lru_cache +def list_console_fonts() -> list[str]: + directory = Path('/usr/share/kbd/consolefonts') + fonts = {path.name.split('.')[0] for path in directory.glob('*.gz')} + return sorted(fonts) + + def list_x11_keyboard_languages() -> list[str]: return ( SysCommand( diff --git a/archinstall/lib/log.py b/archinstall/lib/log.py new file mode 100644 index 00000000..bd060e99 --- /dev/null +++ b/archinstall/lib/log.py @@ -0,0 +1,259 @@ +import logging +import os +import sys +import urllib.error +import urllib.request +from enum import Enum +from pathlib import Path + +from archinstall.lib.utils.util import timestamp + + +class Logger: + def __init__(self, path: Path | None = None) -> None: + if path is None: + path = Path('/var/log/archinstall') + + self._path: Path = path + + @property + def path(self) -> Path: + return self._path / 'install.log' + + @path.setter + def path(self, value: Path) -> None: + self._path = value + + @property + def directory(self) -> Path: + return self._path + + def _check_permissions(self) -> None: + log_file = self.path + + try: + self._path.mkdir(exist_ok=True, parents=True) + log_file.touch(exist_ok=True) + + with log_file.open('a') as f: + f.write('') + except PermissionError: + # Fallback to creating the log file in the current folder + logger._path = Path('./').absolute() + + warn(f'Not enough permission to place log file at {log_file}, creating it in {logger.path} instead') + + def log(self, level: int, content: str) -> None: + self._check_permissions() + + with self.path.open('a') as f: + ts = timestamp() + level_name = logging.getLevelName(level) + f.write(f'[{ts}] - {level_name} - {content}\n') + + def get_content(self, max_bytes: int | None = None) -> bytes: + content = self.path.read_bytes() + + if max_bytes is not None: + size = self.path.stat().st_size + + if size > max_bytes: + content = content[-max_bytes:] + + return content + + +logger = Logger() + + +def _supports_color() -> bool: + """ + Found first reference here: + https://stackoverflow.com/questions/7445658/how-to-detect-if-the-console-does-support-ansi-escape-codes-in-python + And re-used this: + https://github.com/django/django/blob/master/django/core/management/color.py#L12 + + Return True if the running system's terminal supports color, + and False otherwise. + """ + supported_platform = sys.platform != 'win32' or 'ANSICON' in os.environ + + # isatty is not always implemented, #6223. + is_a_tty = hasattr(sys.stdout, 'isatty') and sys.stdout.isatty() + return supported_platform and is_a_tty + + +class Font(Enum): + bold = '1' + italic = '3' + underscore = '4' + blink = '5' + reverse = '7' + conceal = '8' + + +def _stylize_output( + text: str, + fg: str, + bg: str | None, + reset: bool, + font: list[Font] = [], +) -> str: + """ + Heavily influenced by: + https://github.com/django/django/blob/ae8338daf34fd746771e0678081999b656177bae/django/utils/termcolors.py#L13 + Color options here: + https://askubuntu.com/questions/528928/how-to-do-underline-bold-italic-strikethrough-color-background-and-size-i + + Adds styling to a text given a set of color arguments. + """ + colors = { + 'black': '0', + 'red': '1', + 'green': '2', + 'yellow': '3', + 'blue': '4', + 'magenta': '5', + 'cyan': '6', + 'white': '7', + 'teal': '8;5;109', # Extended 256-bit colors (not always supported) + 'orange': '8;5;208', # https://www.lihaoyi.com/post/BuildyourownCommandLinewithANSIescapecodes.html#256-colors + 'darkorange': '8;5;202', + 'gray': '8;5;246', + 'grey': '8;5;246', + 'darkgray': '8;5;240', + 'lightgray': '8;5;256', + } + + foreground = {key: f'3{colors[key]}' for key in colors} + background = {key: f'4{colors[key]}' for key in colors} + code_list = [] + + if text == '' and reset: + return '\x1b[0m' + + code_list.append(foreground[str(fg)]) + + if bg: + code_list.append(background[str(bg)]) + + for o in font: + code_list.append(o.value) + + ansi = ';'.join(code_list) + + return f'\033[{ansi}m{text}\033[0m' + + +def journal_log(message: str, level: int = logging.DEBUG) -> None: + try: + import systemd.journal # type: ignore[import-not-found] + except ModuleNotFoundError: + return + + log_adapter = logging.getLogger('archinstall') + log_fmt = logging.Formatter('[%(levelname)s]: %(message)s') + log_ch = systemd.journal.JournalHandler() + log_ch.setFormatter(log_fmt) + log_adapter.addHandler(log_ch) + log_adapter.setLevel(logging.DEBUG) + + log_adapter.log(level, message) + + +def info( + *msgs: str, + level: int = logging.INFO, + fg: str = 'white', + bg: str | None = None, + reset: bool = False, + font: list[Font] = [], +) -> None: + log(*msgs, level=level, fg=fg, bg=bg, reset=reset, font=font) + + +def debug( + *msgs: str, + level: int = logging.DEBUG, + fg: str = 'white', + bg: str | None = None, + reset: bool = False, + font: list[Font] = [], +) -> None: + log(*msgs, level=level, fg=fg, bg=bg, reset=reset, font=font) + + +def error( + *msgs: str, + level: int = logging.ERROR, + fg: str = 'red', + bg: str | None = None, + reset: bool = False, + font: list[Font] = [], +) -> None: + log(*msgs, level=level, fg=fg, bg=bg, reset=reset, font=font) + + +def warn( + *msgs: str, + level: int = logging.WARNING, + fg: str = 'yellow', + bg: str | None = None, + reset: bool = False, + font: list[Font] = [], +) -> None: + log(*msgs, level=level, fg=fg, bg=bg, reset=reset, font=font) + + +def log( + *msgs: str, + level: int = logging.INFO, + fg: str = 'white', + bg: str | None = None, + reset: bool = False, + font: list[Font] = [], +) -> None: + text = ' '.join(str(x) for x in msgs) + + logger.log(level, text) + + # Attempt to colorize the output if supported + # Insert default colors and override with **kwargs + if _supports_color(): + text = _stylize_output(text, fg, bg, reset, font) + + journal_log(text, level=level) + + if level != logging.DEBUG: + print(text) + + +def share_install_log( + paste_url: str, + max_bytes: int | None = None, +) -> str | None: + log_path = logger.path + + if not log_path.exists(): + info(f'Log file not found: {log_path}') + return None + + content = logger.get_content(max_bytes=max_bytes) + + if len(content) == 0: + info(f'Log file is empty: {log_path}') + return None + + try: + req = urllib.request.Request(paste_url, data=content) + with urllib.request.urlopen(req) as response: + url = response.read().decode().strip() + except urllib.error.URLError as e: + info(f'Upload failed: {e}') + return None + + if not url.startswith('http'): + info(f'Unexpected response from {paste_url}: {url[:200]!r}') + return None + + return url diff --git a/archinstall/lib/menu/abstract_menu.py b/archinstall/lib/menu/abstract_menu.py index 084c6e4f..c37f5657 100644 --- a/archinstall/lib/menu/abstract_menu.py +++ b/archinstall/lib/menu/abstract_menu.py @@ -2,13 +2,12 @@ from enum import Enum from types import TracebackType from typing import Any, Self, override +from archinstall.lib.log import error from archinstall.lib.menu.helpers import Selection -from archinstall.lib.output import error from archinstall.lib.translationhandler import tr -from archinstall.tui.types import Chars -from archinstall.tui.ui.components import InstanceRunnable -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.components import InstanceRunnable +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType CONFIG_KEY = '__config__' @@ -154,7 +153,7 @@ class AbstractSubMenu[ValueT](AbstractMenu[ValueT]): auto_cursor: bool = True, allow_reset: bool = False, ): - back_text = f'{Chars.Right_arrow} ' + tr('Back') + back_text = '← ' + tr('Back') item_group.add_item(MenuItem(text=back_text)) super().__init__( diff --git a/archinstall/lib/menu/helpers.py b/archinstall/lib/menu/helpers.py index 96361765..947f3c55 100644 --- a/archinstall/lib/menu/helpers.py +++ b/archinstall/lib/menu/helpers.py @@ -4,9 +4,9 @@ from typing import Any, Literal, override from textual.validation import ValidationResult, Validator from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.components import InputInfo, InputScreen, LoadingScreen, NotifyScreen, OptionListScreen, SelectListScreen, TableSelectionScreen -from archinstall.tui.ui.menu_item import MenuItemGroup -from archinstall.tui.ui.result import Result, ResultType +from archinstall.tui.components import InputInfo, InputScreen, LoadingScreen, NotifyScreen, OptionListScreen, SelectListScreen, TableSelectionScreen +from archinstall.tui.menu_item import MenuItemGroup +from archinstall.tui.result import Result, ResultType class Selection[ValueT]: @@ -20,6 +20,7 @@ class Selection[ValueT]: preview_location: Literal['right', 'bottom'] | None = None, multi: bool = False, enable_filter: bool = False, + wrap_preview: bool = False, ): self._header = header self._title = title @@ -29,6 +30,7 @@ class Selection[ValueT]: self._preview_location = preview_location self._multi = multi self._enable_filter = enable_filter + self._wrap_preview = wrap_preview async def show(self) -> Result[ValueT]: if self._multi: @@ -39,6 +41,7 @@ class Selection[ValueT]: allow_reset=self._allow_reset, preview_location=self._preview_location, enable_filter=self._enable_filter, + wrap_preview=self._wrap_preview, ).run() else: result = await OptionListScreen[ValueT]( @@ -49,6 +52,7 @@ class Selection[ValueT]: allow_reset=self._allow_reset, preview_location=self._preview_location, enable_filter=self._enable_filter, + wrap_preview=self._wrap_preview, ).run() if result.type_ == ResultType.Reset: diff --git a/archinstall/lib/menu/list_manager.py b/archinstall/lib/menu/list_manager.py index 54683f54..3b612162 100644 --- a/archinstall/lib/menu/list_manager.py +++ b/archinstall/lib/menu/list_manager.py @@ -4,8 +4,8 @@ from typing import cast from archinstall.lib.menu.helpers import Selection from archinstall.lib.menu.menu_helper import MenuHelper from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class ListManager[ValueT]: diff --git a/archinstall/lib/menu/menu_helper.py b/archinstall/lib/menu/menu_helper.py index 47e04fb8..0d9a4032 100644 --- a/archinstall/lib/menu/menu_helper.py +++ b/archinstall/lib/menu/menu_helper.py @@ -1,5 +1,5 @@ -from archinstall.lib.output import FormattedOutput -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup +from archinstall.lib.utils.format import as_table +from archinstall.tui.menu_item import MenuItem, MenuItemGroup class MenuHelper[ValueT]: @@ -32,7 +32,7 @@ class MenuHelper[ValueT]: display_data: dict[str, ValueT | str | None] = {} if data: - table = FormattedOutput.as_table(data) + table = as_table(data) rows = table.split('\n') # these are the header rows of the table diff --git a/archinstall/lib/menu/util.py b/archinstall/lib/menu/util.py index ff3dea47..10edfd49 100644 --- a/archinstall/lib/menu/util.py +++ b/archinstall/lib/menu/util.py @@ -5,8 +5,8 @@ from pathlib import Path from archinstall.lib.menu.helpers import Confirmation, Input from archinstall.lib.models.users import Password, PasswordStrength from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.components import InputInfo, InputInfoType, tui -from archinstall.tui.ui.result import ResultType +from archinstall.tui.components import InputInfo, InputInfoType, tui +from archinstall.tui.result import ResultType async def get_password( diff --git a/archinstall/lib/mirror/mirror_handler.py b/archinstall/lib/mirror/mirror_handler.py index ef0ba1a9..8117605d 100644 --- a/archinstall/lib/mirror/mirror_handler.py +++ b/archinstall/lib/mirror/mirror_handler.py @@ -2,10 +2,10 @@ import time import urllib.parse from pathlib import Path +from archinstall.lib.log import debug, info from archinstall.lib.models import MirrorRegion from archinstall.lib.models.mirrors import MirrorStatusEntryV3, MirrorStatusListV3 from archinstall.lib.networking import fetch_data_from_url -from archinstall.lib.output import debug, info from archinstall.lib.pathnames import MIRRORLIST diff --git a/archinstall/lib/mirror/mirror_menu.py b/archinstall/lib/mirror/mirror_menu.py index 3e899cca..6c5de14a 100644 --- a/archinstall/lib/mirror/mirror_menu.py +++ b/archinstall/lib/mirror/mirror_menu.py @@ -13,10 +13,10 @@ from archinstall.lib.models.mirrors import ( SignOption, ) from archinstall.lib.models.packages import Repository -from archinstall.lib.output import FormattedOutput from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.lib.utils.format import as_table +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class CustomMirrorRepositoriesList(ListManager[CustomRepository]): @@ -65,7 +65,7 @@ class CustomMirrorRepositoriesList(ListManager[CustomRepository]): async def _add_custom_repository(self, preset: CustomRepository | None = None) -> CustomRepository | None: edit_result = await Input( - header=tr('Enter a respository name'), + header=tr('Enter a repository name'), allow_skip=True, default_value=preset.name if preset else None, ).show() @@ -281,7 +281,7 @@ class MirrorMenu(AbstractSubMenu[MirrorConfiguration]): return None custom_mirrors: list[CustomRepository] = item.value - output = FormattedOutput.as_table(custom_mirrors) + output = as_table(custom_mirrors) return output.strip() def _prev_custom_servers(self, item: MenuItem) -> str | None: diff --git a/archinstall/lib/models/application.py b/archinstall/lib/models/application.py index 04d1a342..1e97a784 100644 --- a/archinstall/lib/models/application.py +++ b/archinstall/lib/models/application.py @@ -1,7 +1,8 @@ from dataclasses import dataclass from enum import StrEnum, auto -from typing import Any, NotRequired, Self, TypedDict +from typing import Any, NotRequired, Self, TypedDict, override +from archinstall.lib.models.config import SubConfig from archinstall.lib.translationhandler import tr @@ -168,7 +169,7 @@ class FontsConfiguration: @dataclass(frozen=True) -class ZramConfiguration: +class ZramConfiguration(SubConfig): enabled: bool algorithm: ZramAlgorithm = ZramAlgorithm.ZSTD @@ -181,9 +182,28 @@ class ZramConfiguration: algo = arg.get('algorithm', arg.get('algo', ZramAlgorithm.ZSTD.value)) return cls(enabled=enabled, algorithm=ZramAlgorithm(algo)) + @override + def json(self) -> dict[str, bool | str]: + return { + 'enabled': self.enabled, + 'algorithm': self.algorithm.value, + } + + @override + def summary(self) -> list[str] | None: + out: list[str] = [] + + if self.enabled: + out.append(tr('Zram enabled')) + + out.append(tr('Zram algorithm {}').format(self.algorithm)) + return out + + return None + @dataclass -class ApplicationConfiguration: +class ApplicationConfiguration(SubConfig): bluetooth_config: BluetoothConfiguration | None = None audio_config: AudioConfiguration | None = None power_management_config: PowerManagementConfiguration | None = None @@ -223,6 +243,7 @@ class ApplicationConfiguration: return app_config + @override def json(self) -> ApplicationSerialization: config: ApplicationSerialization = {} @@ -245,3 +266,28 @@ class ApplicationConfiguration: config['fonts_config'] = self.fonts_config.json() return config + + @override + def summary(self) -> list[str]: + out: list[str] = [] + + if self.bluetooth_config and self.bluetooth_config.enabled: + out.append(tr('Bluetooth enabled')) + + if self.audio_config: + out.append(tr('Audio server "{}"').format(self.audio_config.audio)) + + if self.power_management_config: + out.append(tr('Power management "{}"').format(self.power_management_config.power_management)) + + if self.print_service_config and self.print_service_config.enabled: + out.append(tr('Print service enabled')) + + if self.firewall_config: + out.append(tr('Firewall "{}"').format(self.firewall_config.firewall)) + + if self.fonts_config and self.fonts_config.fonts: + fonts = ', '.join(f.value for f in self.fonts_config.fonts) + out.append(tr('Extra fonts "{}"').format(fonts)) + + return out diff --git a/archinstall/lib/models/authentication.py b/archinstall/lib/models/authentication.py index 51120479..37261e7c 100644 --- a/archinstall/lib/models/authentication.py +++ b/archinstall/lib/models/authentication.py @@ -1,7 +1,8 @@ from dataclasses import dataclass, field from enum import Enum -from typing import Any, NotRequired, Self, TypedDict +from typing import Any, NotRequired, Self, TypedDict, override +from archinstall.lib.models.config import SubConfig from archinstall.lib.models.users import Password, User from archinstall.lib.translationhandler import tr @@ -58,7 +59,7 @@ class U2FLoginConfiguration: @dataclass -class AuthenticationConfiguration: +class AuthenticationConfiguration(SubConfig): root_enc_password: Password | None = None users: list[User] = field(default_factory=list) u2f_config: U2FLoginConfiguration | None = None @@ -75,6 +76,7 @@ class AuthenticationConfiguration: return auth_config + @override def json(self) -> AuthenticationSerialization: config: AuthenticationSerialization = {} @@ -83,6 +85,21 @@ class AuthenticationConfiguration: return config + @override + def summary(self) -> list[str]: + out: list[str] = [] + + if self.root_enc_password: + out.append(tr('Root password set')) + + if self.users: + out.append(tr('Configured {} user(s)').format(len(self.users))) + + if self.u2f_config: + out.append(tr('U2F set up')) + + return out + def has_superuser(self) -> bool: return any(u.sudo for u in self.users) diff --git a/archinstall/lib/models/bootloader.py b/archinstall/lib/models/bootloader.py index 68c0bf98..bd6bce7e 100644 --- a/archinstall/lib/models/bootloader.py +++ b/archinstall/lib/models/bootloader.py @@ -1,9 +1,10 @@ import sys from dataclasses import dataclass from enum import Enum -from typing import Any, Self +from typing import Any, Self, override -from archinstall.lib.output import warn +from archinstall.lib.log import warn +from archinstall.lib.models.config import SubConfig from archinstall.lib.translationhandler import tr @@ -25,6 +26,13 @@ class Bootloader(Enum): case _: return False + def is_uefi_only(self) -> bool: + match self: + case Bootloader.Systemd | Bootloader.Efistub | Bootloader.Refind: + return True + case _: + return False + def json(self) -> str: return self.value @@ -53,14 +61,26 @@ class Bootloader(Enum): @dataclass -class BootloaderConfiguration: +class BootloaderConfiguration(SubConfig): bootloader: Bootloader uki: bool = False removable: bool = True + @override def json(self) -> dict[str, Any]: return {'bootloader': self.bootloader.json(), 'uki': self.uki, 'removable': self.removable} + @override + def summary(self) -> list[str]: + out = [tr('Bootloader "{}"').format(self.bootloader.value)] + + if self.uki: + out.append(tr('UKI enabled')) + if self.removable: + out.append(tr('Removable')) + + return out + @classmethod def parse_arg(cls, config: dict[str, Any], skip_boot: bool) -> Self: bootloader = Bootloader.from_arg(config.get('bootloader', ''), skip_boot) diff --git a/archinstall/lib/models/config.py b/archinstall/lib/models/config.py new file mode 100644 index 00000000..45835bc0 --- /dev/null +++ b/archinstall/lib/models/config.py @@ -0,0 +1,12 @@ +from abc import ABC, abstractmethod +from typing import Any + + +class SubConfig(ABC): + @abstractmethod + def json(self) -> Any: + pass + + @abstractmethod + def summary(self) -> str | list[str] | None: + pass diff --git a/archinstall/lib/models/device.py b/archinstall/lib/models/device.py index 7fa05407..a50f7d8e 100644 --- a/archinstall/lib/models/device.py +++ b/archinstall/lib/models/device.py @@ -12,8 +12,9 @@ from parted import Disk, Geometry, Partition from pydantic import BaseModel, Field, ValidationInfo, field_serializer, field_validator from archinstall.lib.hardware import SysInfo +from archinstall.lib.log import debug +from archinstall.lib.models.config import SubConfig from archinstall.lib.models.users import Password -from archinstall.lib.output import debug from archinstall.lib.translationhandler import tr ENC_IDENTIFIER = 'ainst' @@ -34,6 +35,15 @@ class DiskLayoutType(Enum): case DiskLayoutType.Pre_mount: return tr('Pre-mounted configuration') + def short_msg(self) -> str: + match self: + case DiskLayoutType.Default: + return tr('Default') + case DiskLayoutType.Manual: + return tr('Manual') + case DiskLayoutType.Pre_mount: + return tr('Pre-mount') + class _DiskLayoutConfigurationSerialization(TypedDict): config_type: str @@ -45,7 +55,7 @@ class _DiskLayoutConfigurationSerialization(TypedDict): @dataclass -class DiskLayoutConfiguration: +class DiskLayoutConfiguration(SubConfig): config_type: DiskLayoutType device_modifications: list[DeviceModification] = field(default_factory=list) lvm_config: LvmConfiguration | None = None @@ -55,6 +65,7 @@ class DiskLayoutConfiguration: # used for pre-mounted config mountpoint: Path | None = None + @override def json(self) -> _DiskLayoutConfigurationSerialization: if self.config_type == DiskLayoutType.Pre_mount: return { @@ -78,6 +89,28 @@ class DiskLayoutConfiguration: return config + @override + def summary(self) -> list[str]: + out = [tr('{} layout').format(self.config_type.short_msg())] + + devices = set(mod.device_path for mod in self.device_modifications) + + if devices: + dev_str = ', '.join(str(d) for d in devices) + out.append(tr('Devices {}').format(dev_str)) + + if self.lvm_config is not None: + out.append(tr('LVM set up')) + + if self.disk_encryption is not None: + out.append(tr('{} encryption').format(self.disk_encryption.encryption_type.type_to_text())) + + if self.btrfs_options is not None: + if self.btrfs_options.snapshot_config: + out.append(tr('Btrfs snapshot "{}"').format(self.btrfs_options.snapshot_config.snapshot_type)) + + return out + @classmethod def parse_arg( cls, @@ -1321,7 +1354,7 @@ class _SnapshotConfigSerialization(TypedDict): type: str -class SnapshotType(Enum): +class SnapshotType(StrEnum): Snapper = 'Snapper' Timeshift = 'Timeshift' diff --git a/archinstall/lib/models/locale.py b/archinstall/lib/models/locale.py index 15dee2f6..26ab3cc0 100644 --- a/archinstall/lib/models/locale.py +++ b/archinstall/lib/models/locale.py @@ -1,15 +1,21 @@ from dataclasses import dataclass -from typing import Any, Self +from typing import Any, Self, override from archinstall.lib.locale.utils import get_kb_layout +from archinstall.lib.models.config import SubConfig from archinstall.lib.translationhandler import tr @dataclass -class LocaleConfiguration: +class LocaleConfiguration(SubConfig): kb_layout: str sys_lang: str sys_enc: str + # this is the default used in ISO other option for hdpi screens TER16x32 + # can be checked using + # zgrep "CONFIG_FONT" /proc/config.gz + # https://wiki.archlinux.org/title/Linux_console#Font + console_font: str = 'default8x16' @classmethod def default(cls) -> Self: @@ -18,17 +24,29 @@ class LocaleConfiguration: layout = 'us' return cls(layout, 'en_US.UTF-8', 'UTF-8') + @override def json(self) -> dict[str, str]: return { 'kb_layout': self.kb_layout, 'sys_lang': self.sys_lang, 'sys_enc': self.sys_enc, + 'console_font': self.console_font, } + @override + def summary(self) -> list[str]: + return [ + tr('Keyboard layout "{}"').format(self.kb_layout), + tr('Locale language "{}"').format(self.sys_lang), + tr('Locale encoding "{}"').format(self.sys_enc), + tr('Console font "{}"').format(self.console_font), + ] + def preview(self) -> str: output = '{}: {}\n'.format(tr('Keyboard layout'), self.kb_layout) output += '{}: {}\n'.format(tr('Locale language'), self.sys_lang) - output += '{}: {}'.format(tr('Locale encoding'), self.sys_enc) + output += '{}: {}\n'.format(tr('Locale encoding'), self.sys_enc) + output += '{}: {}'.format(tr('Console font'), self.console_font) return output def _load_config(self, args: dict[str, str]) -> None: @@ -38,6 +56,8 @@ class LocaleConfiguration: self.sys_enc = args['sys_enc'] if 'kb_layout' in args: self.kb_layout = args['kb_layout'] + if 'console_font' in args: + self.console_font = args['console_font'] @classmethod def parse_arg(cls, args: dict[str, Any]) -> Self: diff --git a/archinstall/lib/models/mirrors.py b/archinstall/lib/models/mirrors.py index 0a596c13..1d678328 100644 --- a/archinstall/lib/models/mirrors.py +++ b/archinstall/lib/models/mirrors.py @@ -9,9 +9,11 @@ from typing import TYPE_CHECKING, Any, Self, TypedDict, override from pydantic import BaseModel, ValidationInfo, field_validator, model_validator +from archinstall.lib.log import debug +from archinstall.lib.models.config import SubConfig from archinstall.lib.models.packages import Repository from archinstall.lib.networking import DownloadTimer, ping -from archinstall.lib.output import debug +from archinstall.lib.translationhandler import tr if TYPE_CHECKING: from archinstall.lib.mirror.mirror_handler import MirrorListHandler @@ -236,7 +238,7 @@ class _MirrorConfigurationSerialization(TypedDict): @dataclass -class MirrorConfiguration: +class MirrorConfiguration(SubConfig): mirror_regions: list[MirrorRegion] = field(default_factory=list) custom_servers: list[CustomServer] = field(default_factory=list) optional_repositories: list[Repository] = field(default_factory=list) @@ -250,6 +252,7 @@ class MirrorConfiguration: def custom_server_urls(self) -> str: return '\n'.join(s.url for s in self.custom_servers) + @override def json(self) -> _MirrorConfigurationSerialization: regions = {} for m in self.mirror_regions: @@ -262,6 +265,24 @@ class MirrorConfiguration: 'custom_repositories': [c.json() for c in self.custom_repositories], } + @override + def summary(self) -> list[str]: + out: list[str] = [] + + if self.mirror_regions: + out.append(tr('Mirror regions "{}"').format(', '.join(m.name for m in self.mirror_regions))) + + if self.optional_repositories: + out.append(tr('Optional repositories "{}"').format(', '.join(r.value for r in self.optional_repositories))) + + if self.custom_servers: + out.append(tr('Custom servers set up')) + + if self.custom_repositories: + out.append(tr('Custom repositories set up')) + + return out + def custom_servers_config(self) -> str: config = '' diff --git a/archinstall/lib/models/network.py b/archinstall/lib/models/network.py index 71f3dca2..bcbd288a 100644 --- a/archinstall/lib/models/network.py +++ b/archinstall/lib/models/network.py @@ -3,7 +3,8 @@ from dataclasses import dataclass, field from enum import Enum from typing import NotRequired, Self, TypedDict, override -from archinstall.lib.output import debug +from archinstall.lib.log import debug +from archinstall.lib.models.config import SubConfig from archinstall.lib.translationhandler import tr @@ -11,6 +12,7 @@ class NicType(Enum): ISO = 'iso' NM = 'nm' NM_IWD = 'nm_iwd' + IWD = 'iwd' MANUAL = 'manual' def display_msg(self) -> str: @@ -21,6 +23,8 @@ class NicType(Enum): return tr('Use Network Manager (default backend)') case NicType.NM_IWD: return tr('Use Network Manager (iwd backend)') + case NicType.IWD: + return tr('Use standalone iwd') case NicType.MANUAL: return tr('Manual configuration') @@ -103,10 +107,11 @@ class _NetworkConfigurationSerialization(TypedDict): @dataclass -class NetworkConfiguration: +class NetworkConfiguration(SubConfig): type: NicType nics: list[Nic] = field(default_factory=list) + @override def json(self) -> _NetworkConfigurationSerialization: config: _NetworkConfigurationSerialization = {'type': self.type.value} if self.nics: @@ -114,6 +119,10 @@ class NetworkConfiguration: return config + @override + def summary(self) -> str: + return self.type.display_msg() + @classmethod def parse_arg(cls, config: _NetworkConfigurationSerialization) -> Self | None: nic_type = config.get('type', None) @@ -125,6 +134,10 @@ class NetworkConfiguration: return cls(NicType.ISO) case NicType.NM: return cls(NicType.NM) + case NicType.NM_IWD: + return cls(NicType.NM_IWD) + case NicType.IWD: + return cls(NicType.IWD) case NicType.MANUAL: nics_arg = config.get('nics', []) if nics_arg: diff --git a/archinstall/lib/models/package_types.py b/archinstall/lib/models/package_types.py new file mode 100644 index 00000000..e314c30a --- /dev/null +++ b/archinstall/lib/models/package_types.py @@ -0,0 +1,12 @@ +from enum import StrEnum, auto +from typing import Final + + +class Kernel(StrEnum): + LINUX = auto() + LINUX_LTS = 'linux-lts' + LINUX_ZEN = 'linux-zen' + LINUX_HARDENED = 'linux-hardened' + + +DEFAULT_KERNEL: Final = Kernel.LINUX diff --git a/archinstall/lib/models/packages.py b/archinstall/lib/models/packages.py index 6ba6e134..205d653e 100644 --- a/archinstall/lib/models/packages.py +++ b/archinstall/lib/models/packages.py @@ -132,7 +132,6 @@ class AvailablePackage(BaseModel): def longest_key(self) -> int: return max(len(key) for key in self.model_dump().keys()) - # return all package info line by line def info(self) -> str: output = '' for key, value in self.model_dump().items(): diff --git a/archinstall/lib/models/pacman.py b/archinstall/lib/models/pacman.py index 5d271ea9..004dfbc3 100644 --- a/archinstall/lib/models/pacman.py +++ b/archinstall/lib/models/pacman.py @@ -1,6 +1,7 @@ from dataclasses import dataclass -from typing import Self, TypedDict +from typing import Self, TypedDict, override +from archinstall.lib.models.config import SubConfig from archinstall.lib.translationhandler import tr @@ -10,7 +11,7 @@ class PacmanConfigSerialization(TypedDict): @dataclass -class PacmanConfiguration: +class PacmanConfiguration(SubConfig): parallel_downloads: int = 5 color: bool = True @@ -18,12 +19,19 @@ class PacmanConfiguration: def default(cls) -> Self: return cls() + @override def json(self) -> PacmanConfigSerialization: return { 'parallel_downloads': self.parallel_downloads, 'color': self.color, } + @override + def summary(self) -> str | None: + if self.color: + return tr('Color enabled') + return None + def preview(self) -> str: color_str = str(self.color) output = '{}: {}\n'.format(tr('Parallel Downloads'), self.parallel_downloads) diff --git a/archinstall/lib/models/profile.py b/archinstall/lib/models/profile.py index e7ae8c8c..fa890a1e 100644 --- a/archinstall/lib/models/profile.py +++ b/archinstall/lib/models/profile.py @@ -1,8 +1,10 @@ from dataclasses import dataclass -from typing import TYPE_CHECKING, Self, TypedDict +from typing import TYPE_CHECKING, Self, TypedDict, override from archinstall.default_profiles.profile import GreeterType, Profile from archinstall.lib.hardware import GfxDriver +from archinstall.lib.models.config import SubConfig +from archinstall.lib.translationhandler import tr if TYPE_CHECKING: from archinstall.lib.profile.profiles_handler import ProfileSerialization @@ -15,11 +17,12 @@ class _ProfileConfigurationSerialization(TypedDict): @dataclass -class ProfileConfiguration: +class ProfileConfiguration(SubConfig): profile: Profile | None = None gfx_driver: GfxDriver | None = None greeter: GreeterType | None = None + @override def json(self) -> _ProfileConfigurationSerialization: from archinstall.lib.profile.profiles_handler import profile_handler @@ -29,6 +32,23 @@ class ProfileConfiguration: 'greeter': self.greeter.value if self.greeter else None, } + @override + def summary(self) -> list[str] | None: + out: list[str] = [] + + if self.profile: + out.append(self.profile.name) + + if self.gfx_driver: + out.append(tr('{} grphics driver').format(self.gfx_driver.value)) + + if self.greeter: + out.append(tr('{} greeter').format(self.greeter.value)) + + return out + + return None + @classmethod def parse_arg(cls, arg: _ProfileConfigurationSerialization) -> Self: from archinstall.lib.profile.profiles_handler import profile_handler diff --git a/archinstall/lib/network/network_handler.py b/archinstall/lib/network/network_handler.py index 13548584..09d2750c 100644 --- a/archinstall/lib/network/network_handler.py +++ b/archinstall/lib/network/network_handler.py @@ -1,3 +1,5 @@ +import textwrap + from archinstall.lib.installer import Installer from archinstall.lib.models.network import NetworkConfiguration, NicType from archinstall.lib.models.profile import ProfileConfiguration @@ -32,6 +34,13 @@ def install_network_config( _configure_nm_iwd(installation) installation.disable_service('iwd.service') + case NicType.IWD: + installation.add_additional_packages(['iwd']) + _configure_iwd_standalone(installation) + installation.enable_service('iwd.service') + installation.enable_service('systemd-networkd.service') + installation.enable_service('systemd-resolved.service') + case NicType.MANUAL: for nic in network_config.nics: installation.configure_nic(nic) @@ -45,3 +54,36 @@ def _configure_nm_iwd(installation: Installer) -> None: iwd_backend_conf = nm_conf_dir / 'wifi_backend.conf' _ = iwd_backend_conf.write_text('[device]\nwifi.backend=iwd\n') + + +def _configure_iwd_standalone(installation: Installer) -> None: + # iwd manages wireless only; systemd-networkd handles wired DHCP. + iwd_conf_dir = installation.target / 'etc/iwd' + iwd_conf_dir.mkdir(parents=True, exist_ok=True) + + main_conf = iwd_conf_dir / 'main.conf' + main_conf_content = textwrap.dedent("""\ + [General] + EnableNetworkConfiguration=true + + [Network] + NameResolvingService=systemd + """) + _ = main_conf.write_text(main_conf_content) + + networkd_dir = installation.target / 'etc/systemd/network' + networkd_dir.mkdir(parents=True, exist_ok=True) + wired_conf = networkd_dir / '20-wired.network' + wired_conf_content = textwrap.dedent("""\ + [Match] + Type=ether + Kind=!* + + [Network] + DHCP=yes + """) + _ = wired_conf.write_text(wired_conf_content) + + resolv = installation.target / 'etc/resolv.conf' + resolv.unlink(missing_ok=True) + resolv.symlink_to('/run/systemd/resolve/stub-resolv.conf') diff --git a/archinstall/lib/network/network_menu.py b/archinstall/lib/network/network_menu.py index bcf54698..88c26dba 100644 --- a/archinstall/lib/network/network_menu.py +++ b/archinstall/lib/network/network_menu.py @@ -6,8 +6,8 @@ from archinstall.lib.menu.list_manager import ListManager from archinstall.lib.models.network import NetworkConfiguration, Nic, NicType from archinstall.lib.networking import list_interfaces from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class ManualNetworkConfig(ListManager[Nic]): @@ -172,14 +172,17 @@ async def select_network(preset: NetworkConfiguration | None) -> NetworkConfigur """ items = [MenuItem(n.display_msg(), value=n) for n in NicType] - group = MenuItemGroup(items, sort_items=True) + group = MenuItemGroup(items, sort_items=False) if preset: group.set_selected_by_value(preset.type) + header = tr('Choose network configuration') + '\n' + header += tr('Recommended: Network Manager for desktop, Manual for server') + '\n' + result = await Selection[NicType]( group, - header=tr('Choose network configuration'), + header=header, allow_reset=True, allow_skip=True, ).show() @@ -199,6 +202,8 @@ async def select_network(preset: NetworkConfiguration | None) -> NetworkConfigur return NetworkConfiguration(NicType.NM) case NicType.NM_IWD: return NetworkConfiguration(NicType.NM_IWD) + case NicType.IWD: + return NetworkConfiguration(NicType.IWD) case NicType.MANUAL: preset_nics = preset.nics if preset else [] nics = await ManualNetworkConfig(tr('Configure interfaces'), preset_nics).show() diff --git a/archinstall/lib/network/wifi_handler.py b/archinstall/lib/network/wifi_handler.py index 0546310b..b5590343 100644 --- a/archinstall/lib/network/wifi_handler.py +++ b/archinstall/lib/network/wifi_handler.py @@ -5,13 +5,13 @@ from typing import assert_never, override from archinstall.lib.command import SysCommand from archinstall.lib.exceptions import SysCallError +from archinstall.lib.log import debug from archinstall.lib.models.network import WifiConfiguredNetwork, WifiNetwork from archinstall.lib.network.wpa_supplicant import WpaSupplicantConfig -from archinstall.lib.output import debug from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.components import ConfirmationScreen, InputScreen, InstanceRunnable, LoadingScreen, NotifyScreen, TableSelectionScreen, tui -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import Result, ResultType +from archinstall.tui.components import ConfirmationScreen, InputScreen, InstanceRunnable, LoadingScreen, NotifyScreen, TableSelectionScreen, tui +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import Result, ResultType @dataclass diff --git a/archinstall/lib/network/wpa_supplicant.py b/archinstall/lib/network/wpa_supplicant.py index 935e9b4d..17ed3227 100644 --- a/archinstall/lib/network/wpa_supplicant.py +++ b/archinstall/lib/network/wpa_supplicant.py @@ -1,8 +1,8 @@ from dataclasses import dataclass, field from pathlib import Path +from archinstall.lib.log import debug from archinstall.lib.models.network import WifiNetwork -from archinstall.lib.output import debug @dataclass diff --git a/archinstall/lib/networking.py b/archinstall/lib/networking.py index ebf59990..97701e89 100644 --- a/archinstall/lib/networking.py +++ b/archinstall/lib/networking.py @@ -13,7 +13,7 @@ from urllib.parse import urlencode from urllib.request import urlopen from archinstall.lib.exceptions import DownloadTimeout, SysCallError -from archinstall.lib.output import debug, error, info +from archinstall.lib.log import debug, error, info from archinstall.lib.pacman.pacman import Pacman @@ -46,12 +46,12 @@ class DownloadTimer: self.previous_handler = signal.signal(signal.SIGALRM, self.raise_timeout) # type: ignore[assignment] self.previous_timer = signal.alarm(self.timeout) - self.start_time = time.time() + self.start_time = time.monotonic() return self def __exit__(self, exc_type: type[BaseException] | None, exc_value: BaseException | None, traceback: TracebackType | None) -> None: if self.start_time: - time_delta = time.time() - self.start_time + time_delta = time.monotonic() - self.start_time signal.alarm(0) self.time = time_delta if self.timeout > 0: @@ -165,7 +165,7 @@ def build_icmp(payload: bytes) -> bytes: def ping(hostname: str, timeout: int = 5) -> int: watchdog = select.epoll() - started = time.time() + started = time.monotonic() random_identifier = f'archinstall-{random.randint(1000, 9999)}'.encode() # Create a raw socket (requires root, which should be fine on archiso) @@ -180,7 +180,7 @@ def ping(hostname: str, timeout: int = 5) -> int: # Gracefully wait for X amount of time # for a ICMP response or exit with no latency - while latency == -1 and time.time() - started < timeout: + while latency == -1 and time.monotonic() - started < timeout: try: for _fileno, _event in watchdog.poll(0.1): response, _ = icmp_socket.recvfrom(1024) @@ -188,7 +188,7 @@ def ping(hostname: str, timeout: int = 5) -> int: # Check if it's an Echo Reply (ICMP type 0) if icmp_type == 0 and response[-len(random_identifier) :] == random_identifier: - latency = round((time.time() - started) * 1000) + latency = round((time.monotonic() - started) * 1000) break except OSError as e: debug(f'Error: {e}') diff --git a/archinstall/lib/output.py b/archinstall/lib/output.py deleted file mode 100644 index e01da3eb..00000000 --- a/archinstall/lib/output.py +++ /dev/null @@ -1,335 +0,0 @@ -import logging -import os -import sys -from collections.abc import Callable -from dataclasses import asdict, is_dataclass -from datetime import UTC, datetime -from enum import Enum -from pathlib import Path -from typing import TYPE_CHECKING, Any - -from archinstall.lib.utils.encoding import unicode_ljust, unicode_rjust - -if TYPE_CHECKING: - from _typeshed import DataclassInstance - - -class FormattedOutput: - @staticmethod - def _get_values( - o: DataclassInstance, - class_formatter: str | Callable | None = None, # type: ignore[type-arg] - filter_list: list[str] = [], - ) -> dict[str, Any]: - """ - the original values returned a dataclass as dict thru the call to some specific methods - this version allows thru the parameter class_formatter to call a dynamically selected formatting method. - Can transmit a filter list to the class_formatter, - """ - if class_formatter: - # if invoked per reference it has to be a standard function or a classmethod. - # A method of an instance does not make sense - if callable(class_formatter): - return class_formatter(o, filter_list) - # if is invoked by name we restrict it to a method of the class. No need to mess more - elif hasattr(o, class_formatter) and callable(getattr(o, class_formatter)): - func = getattr(o, class_formatter) - return func(filter_list) - - raise ValueError('Unsupported formatting call') - elif hasattr(o, 'table_data'): - return o.table_data() - elif hasattr(o, 'json'): - return o.json() - elif is_dataclass(o): - return asdict(o) - else: - return o.__dict__ # type: ignore[unreachable] - - @classmethod - def as_table( - cls, - obj: list[Any], - class_formatter: str | Callable | None = None, # type: ignore[type-arg] - filter_list: list[str] = [], - capitalize: bool = False, - ) -> str: - """variant of as_table (subtly different code) which has two additional parameters - filter which is a list of fields which will be shown - class_formatter a special method to format the outgoing data - - A general comment, the format selected for the output (a string where every data record is separated by newline) - is for compatibility with a print statement - As_table_filter can be a drop in replacement for as_table - """ - raw_data = [cls._get_values(o, class_formatter, filter_list) for o in obj] - - # determine the maximum column size - column_width: dict[str, int] = {} - for o in raw_data: - for k, v in o.items(): - if not filter_list or k in filter_list: - column_width.setdefault(k, 0) - column_width[k] = max([column_width[k], len(str(v)), len(k)]) - - if not filter_list: - filter_list = list(column_width.keys()) - - # create the header lines - output = '' - key_list = [] - for key in filter_list: - width = column_width[key] - key = key.replace('!', '').replace('_', ' ') - - if capitalize: - key = key.capitalize() - - key_list.append(unicode_ljust(key, width)) - - output += ' | '.join(key_list) + '\n' - output += '-' * len(output) + '\n' - - # create the data lines - for record in raw_data: - obj_data = [] - for key in filter_list: - width = column_width.get(key, len(key)) - value = record.get(key, '') - - if '!' in key: - value = '*' * len(value) - - if isinstance(value, (int, float)) or (isinstance(value, str) and value.isnumeric()): - obj_data.append(unicode_rjust(str(value), width)) - else: - obj_data.append(unicode_ljust(str(value), width)) - - output += ' | '.join(obj_data) + '\n' - - return output - - @staticmethod - def as_columns(entries: list[str], cols: int) -> str: - """ - Will format a list into a given number of columns - """ - chunks = [] - output = '' - - for i in range(0, len(entries), cols): - chunks.append(entries[i : i + cols]) - - for row in chunks: - out_fmt = '{: <30} ' * len(row) - output += out_fmt.format(*row) + '\n' - - return output - - -class Journald: - @staticmethod - def log(message: str, level: int = logging.DEBUG) -> None: - try: - import systemd.journal # type: ignore[import-not-found] - except ModuleNotFoundError: - return None - - log_adapter = logging.getLogger('archinstall') - log_fmt = logging.Formatter('[%(levelname)s]: %(message)s') - log_ch = systemd.journal.JournalHandler() - log_ch.setFormatter(log_fmt) - log_adapter.addHandler(log_ch) - log_adapter.setLevel(logging.DEBUG) - - log_adapter.log(level, message) - - -class Logger: - def __init__(self, path: Path = Path('/var/log/archinstall')) -> None: - self._path = path - - @property - def path(self) -> Path: - return self._path / 'install.log' - - @property - def directory(self) -> Path: - return self._path - - def _check_permissions(self) -> None: - log_file = self.path - - try: - self._path.mkdir(exist_ok=True, parents=True) - log_file.touch(exist_ok=True) - - with log_file.open('a') as f: - f.write('') - except PermissionError: - # Fallback to creating the log file in the current folder - logger._path = Path('./').absolute() - - warn(f'Not enough permission to place log file at {log_file}, creating it in {logger.path} instead') - - def log(self, level: int, content: str) -> None: - self._check_permissions() - - with self.path.open('a') as f: - ts = _timestamp() - level_name = logging.getLevelName(level) - f.write(f'[{ts}] - {level_name} - {content}\n') - - -logger = Logger() - - -def _supports_color() -> bool: - """ - Found first reference here: - https://stackoverflow.com/questions/7445658/how-to-detect-if-the-console-does-support-ansi-escape-codes-in-python - And re-used this: - https://github.com/django/django/blob/master/django/core/management/color.py#L12 - - Return True if the running system's terminal supports color, - and False otherwise. - """ - supported_platform = sys.platform != 'win32' or 'ANSICON' in os.environ - - # isatty is not always implemented, #6223. - is_a_tty = hasattr(sys.stdout, 'isatty') and sys.stdout.isatty() - return supported_platform and is_a_tty - - -class Font(Enum): - bold = '1' - italic = '3' - underscore = '4' - blink = '5' - reverse = '7' - conceal = '8' - - -def _stylize_output( - text: str, - fg: str, - bg: str | None, - reset: bool, - font: list[Font] = [], -) -> str: - """ - Heavily influenced by: - https://github.com/django/django/blob/ae8338daf34fd746771e0678081999b656177bae/django/utils/termcolors.py#L13 - Color options here: - https://askubuntu.com/questions/528928/how-to-do-underline-bold-italic-strikethrough-color-background-and-size-i - - Adds styling to a text given a set of color arguments. - """ - colors = { - 'black': '0', - 'red': '1', - 'green': '2', - 'yellow': '3', - 'blue': '4', - 'magenta': '5', - 'cyan': '6', - 'white': '7', - 'teal': '8;5;109', # Extended 256-bit colors (not always supported) - 'orange': '8;5;208', # https://www.lihaoyi.com/post/BuildyourownCommandLinewithANSIescapecodes.html#256-colors - 'darkorange': '8;5;202', - 'gray': '8;5;246', - 'grey': '8;5;246', - 'darkgray': '8;5;240', - 'lightgray': '8;5;256', - } - - foreground = {key: f'3{colors[key]}' for key in colors} - background = {key: f'4{colors[key]}' for key in colors} - code_list = [] - - if text == '' and reset: - return '\x1b[0m' - - code_list.append(foreground[str(fg)]) - - if bg: - code_list.append(background[str(bg)]) - - for o in font: - code_list.append(o.value) - - ansi = ';'.join(code_list) - - return f'\033[{ansi}m{text}\033[0m' - - -def info( - *msgs: str, - level: int = logging.INFO, - fg: str = 'white', - bg: str | None = None, - reset: bool = False, - font: list[Font] = [], -) -> None: - log(*msgs, level=level, fg=fg, bg=bg, reset=reset, font=font) - - -def _timestamp() -> str: - now = datetime.now(tz=UTC) - return now.strftime('%Y-%m-%d %H:%M:%S') - - -def debug( - *msgs: str, - level: int = logging.DEBUG, - fg: str = 'white', - bg: str | None = None, - reset: bool = False, - font: list[Font] = [], -) -> None: - log(*msgs, level=level, fg=fg, bg=bg, reset=reset, font=font) - - -def error( - *msgs: str, - level: int = logging.ERROR, - fg: str = 'red', - bg: str | None = None, - reset: bool = False, - font: list[Font] = [], -) -> None: - log(*msgs, level=level, fg=fg, bg=bg, reset=reset, font=font) - - -def warn( - *msgs: str, - level: int = logging.WARNING, - fg: str = 'yellow', - bg: str | None = None, - reset: bool = False, - font: list[Font] = [], -) -> None: - log(*msgs, level=level, fg=fg, bg=bg, reset=reset, font=font) - - -def log( - *msgs: str, - level: int = logging.INFO, - fg: str = 'white', - bg: str | None = None, - reset: bool = False, - font: list[Font] = [], -) -> None: - text = ' '.join(str(x) for x in msgs) - - logger.log(level, text) - - # Attempt to colorize the output if supported - # Insert default colors and override with **kwargs - if _supports_color(): - text = _stylize_output(text, fg, bg, reset, font) - - Journald.log(text, level=level) - - if level != logging.DEBUG: - print(text) diff --git a/archinstall/lib/packages/packages.py b/archinstall/lib/packages/packages.py index 3572c6c4..5b276f76 100644 --- a/archinstall/lib/packages/packages.py +++ b/archinstall/lib/packages/packages.py @@ -1,20 +1,20 @@ from functools import lru_cache from archinstall.lib.exceptions import SysCallError +from archinstall.lib.log import debug from archinstall.lib.menu.helpers import Loading, Notify, Selection from archinstall.lib.models.packages import AvailablePackage, LocalPackage, PackageGroup, Repository -from archinstall.lib.output import debug from archinstall.lib.pacman.pacman import Pacman from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType def installed_package(package: str) -> LocalPackage | None: try: package_info = [] for line in Pacman.run(f'-Q --info {package}'): - package_info.append(line.decode().strip()) + package_info.append(line.decode().rstrip()) return _parse_package_output(package_info, LocalPackage) except SysCallError: @@ -53,7 +53,7 @@ def available_package(package: str) -> AvailablePackage | None: try: package_info: list[str] = [] for line in Pacman.run(f'-S --info {package}'): - package_info.append(line.decode().strip()) + package_info.append(line.decode().rstrip()) return _parse_package_output(package_info, AvailablePackage) except SysCallError: @@ -79,7 +79,7 @@ def list_available_packages( debug(f'Failed to sync Arch Linux package database: {e}') for line in Pacman.run('-S --info'): - dec_line = line.decode().strip() + dec_line = line.decode().rstrip() current_package.append(dec_line) if dec_line.startswith('Validated'): @@ -187,6 +187,7 @@ async def select_additional_packages( multi=True, preview_location='right', enable_filter=True, + wrap_preview=True, ).show() match pck_result.type_: diff --git a/archinstall/lib/packages/util.py b/archinstall/lib/packages/util.py index 335d312e..134592bb 100644 --- a/archinstall/lib/packages/util.py +++ b/archinstall/lib/packages/util.py @@ -1,6 +1,6 @@ from functools import lru_cache -from archinstall.lib.output import debug +from archinstall.lib.log import debug from archinstall.lib.packages.packages import check_package_upgrade diff --git a/archinstall/lib/pacman/pacman.py b/archinstall/lib/pacman/pacman.py index 5427214c..c78f6145 100644 --- a/archinstall/lib/pacman/pacman.py +++ b/archinstall/lib/pacman/pacman.py @@ -5,7 +5,7 @@ from pathlib import Path from archinstall.lib.command import SysCommand from archinstall.lib.exceptions import RequirementError -from archinstall.lib.output import error, info, warn +from archinstall.lib.log import error, info, warn from archinstall.lib.pathnames import PACMAN_CONF from archinstall.lib.plugins import plugins from archinstall.lib.translationhandler import tr @@ -29,11 +29,11 @@ class Pacman: if pacman_db_lock.exists(): warn(tr('Pacman is already running, waiting maximum 10 minutes for it to terminate.')) - started = time.time() + started = time.monotonic() while pacman_db_lock.exists(): time.sleep(0.25) - if time.time() - started > (60 * 10): + if time.monotonic() - started > (60 * 10): error(tr('Pre-existing pacman lock never exited. Please clean up any existing pacman sessions before using archinstall.')) sys.exit(1) diff --git a/archinstall/lib/pacman/pacman_menu.py b/archinstall/lib/pacman/pacman_menu.py index 010c3f6d..16ad6d2b 100644 --- a/archinstall/lib/pacman/pacman_menu.py +++ b/archinstall/lib/pacman/pacman_menu.py @@ -5,8 +5,8 @@ from archinstall.lib.menu.helpers import Confirmation, Input from archinstall.lib.models.pacman import PacmanConfiguration from archinstall.lib.pathnames import PACMAN_CONF from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class PacmanMenu(AbstractSubMenu[PacmanConfiguration]): diff --git a/archinstall/lib/plugins.py b/archinstall/lib/plugins.py index 919fcf23..ac8383b1 100644 --- a/archinstall/lib/plugins.py +++ b/archinstall/lib/plugins.py @@ -7,7 +7,7 @@ import urllib.request from importlib import metadata from pathlib import Path -from archinstall.lib.output import error, info, warn +from archinstall.lib.log import error, info, warn from archinstall.lib.version import get_version plugins = {} diff --git a/archinstall/lib/profile/profile_menu.py b/archinstall/lib/profile/profile_menu.py index cb560c27..d3b35c82 100644 --- a/archinstall/lib/profile/profile_menu.py +++ b/archinstall/lib/profile/profile_menu.py @@ -7,8 +7,8 @@ from archinstall.lib.menu.abstract_menu import AbstractSubMenu from archinstall.lib.menu.helpers import Confirmation, Selection from archinstall.lib.models.profile import ProfileConfiguration from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import ResultType class ProfileMenu(AbstractSubMenu[ProfileConfiguration]): @@ -95,7 +95,7 @@ class ProfileMenu(AbstractSubMenu[ProfileConfiguration]): driver = await select_driver(preset=preset) if driver and 'Sway' in profile.current_selection_names(): - if driver.is_nvidia(): + if driver.is_nvidia_proprietary(): header = tr('The proprietary Nvidia driver is not supported by Sway.') + '\n' header += tr('It is likely that you will run into issues, are you okay with that?') + '\n' @@ -105,8 +105,7 @@ class ProfileMenu(AbstractSubMenu[ProfileConfiguration]): preset=False, ).show() - if result.get_value(): - return preset + return driver if result.get_value() else preset return driver @@ -114,7 +113,7 @@ class ProfileMenu(AbstractSubMenu[ProfileConfiguration]): if item.value: driver = item.get_value().value packages = item.get_value().packages_text() - return f'Driver: {driver}\n{packages}' + return f'{tr("Graphics driver")}: {driver}\n{packages}' return None def _prev_greeter(self, item: MenuItem) -> str | None: diff --git a/archinstall/lib/profile/profiles_handler.py b/archinstall/lib/profile/profiles_handler.py index c75f95c0..1e770de5 100644 --- a/archinstall/lib/profile/profiles_handler.py +++ b/archinstall/lib/profile/profiles_handler.py @@ -9,9 +9,9 @@ from typing import TYPE_CHECKING, NotRequired, TypedDict from archinstall.default_profiles.profile import CustomSetting, GreeterType, Profile from archinstall.lib.hardware import GfxDriver, GfxPackage +from archinstall.lib.log import debug, error, info from archinstall.lib.models.profile import ProfileConfiguration from archinstall.lib.networking import fetch_data_from_url -from archinstall.lib.output import debug, error, info from archinstall.lib.translationhandler import tr if TYPE_CHECKING: @@ -175,6 +175,9 @@ class ProfileHandler: case GreeterType.PlasmaLoginManager: packages = ['plasma-login-manager'] service = ['plasmalogin'] + case GreeterType.GreetdDms: + packages = ['greetd'] + service = ['greetd'] if packages: install_session.add_additional_packages(packages) @@ -194,6 +197,26 @@ class ProfileHandler: with open(path, 'w') as file: file.write(filedata) + if greeter == GreeterType.GreetdDms: + greetd_config = install_session.target / 'etc/greetd/config.toml' + greetd_config.parent.mkdir(parents=True, exist_ok=True) + greetd_config.write_text( + '[terminal]\n' + 'vt = 1\n' + '\n' + '[default_session]\n' + 'user = "greeter"\n' + 'command = "/usr/share/quickshell/dms/Modules/Greetd/assets/dms-greeter --command niri -p /usr/share/quickshell/dms"\n', + ) + + tmpfiles = install_session.target / 'etc/tmpfiles.d/dms-greeter.conf' + tmpfiles.parent.mkdir(parents=True, exist_ok=True) + tmpfiles.write_text( + '# Path Mode User Group Age Argument\n' + 'd /var/cache/dms-greeter 0750 greeter greeter -\n' + 'd /var/lib/greeter 0755 greeter greeter -\n', + ) + def install_gfx_driver(self, install_session: Installer, driver: GfxDriver) -> None: debug(f'Installing GFX driver: {driver.value}') diff --git a/archinstall/lib/translationhandler.py b/archinstall/lib/translationhandler.py index 093ca6de..c2736f35 100644 --- a/archinstall/lib/translationhandler.py +++ b/archinstall/lib/translationhandler.py @@ -9,7 +9,7 @@ from typing import override from archinstall.lib.command import SysCommand from archinstall.lib.exceptions import SysCallError -from archinstall.lib.output import debug +from archinstall.lib.log import debug from archinstall.lib.utils.util import running_from_iso diff --git a/archinstall/lib/user/user_menu.py b/archinstall/lib/user/user_menu.py index e7d77aab..8e6e48fd 100644 --- a/archinstall/lib/user/user_menu.py +++ b/archinstall/lib/user/user_menu.py @@ -6,8 +6,8 @@ from archinstall.lib.menu.list_manager import ListManager from archinstall.lib.menu.util import get_password from archinstall.lib.models.users import User from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem -from archinstall.tui.ui.result import ResultType +from archinstall.tui.menu_item import MenuItem +from archinstall.tui.result import ResultType class UserList(ListManager[User]): diff --git a/archinstall/lib/utils/format.py b/archinstall/lib/utils/format.py new file mode 100644 index 00000000..2ac8c377 --- /dev/null +++ b/archinstall/lib/utils/format.py @@ -0,0 +1,148 @@ +from collections.abc import Callable +from dataclasses import asdict, is_dataclass +from typing import TYPE_CHECKING, Any + +from archinstall.lib.utils.encoding import unicode_ljust, unicode_rjust +from archinstall.tui.rich import BaseRichTable + +if TYPE_CHECKING: + from _typeshed import DataclassInstance + + +def as_key_value_pair( + entries: dict[str, str | list[str] | bool], + ignore_empty: bool = True, +) -> str: + """ + Formats key-values as a Rich Table: + key1 : value1 + key2 : value2 + ... + """ + table = BaseRichTable() + table.add_column('key', style='bold', no_wrap=True) + table.add_column('value', style='white', max_width=70) + + for label, value in entries.items(): + if ignore_empty and not value: + continue + + if isinstance(value, bool): + value = 'Yes' if value else 'No' + + if isinstance(value, list): + value = '\n '.join(str(val) for val in value) + + table.add_row(label.title(), f': {value}') + + return table.stringify() + + +def as_columns(entries: list[str], cols: int) -> str: + """ + Will format a list into a given number of columns + """ + chunks: list[list[str]] = [] + output = '' + + for i in range(0, len(entries), cols): + chunks.append(entries[i : i + cols]) + + for row in chunks: + out_fmt = '{: <30} ' * len(row) + output += out_fmt.format(*row) + '\n' + + return output + + +def _get_values( + o: DataclassInstance, + class_formatter: str | Callable | None = None, # type: ignore[type-arg] # pyright: ignore[reportMissingTypeArgument] + filter_list: list[str] = [], +) -> dict[str, Any]: + """ + the original values returned a dataclass as dict thru the call to some specific methods + this version allows thru the parameter class_formatter to call a dynamically selected formatting method. + Can transmit a filter list to the class_formatter, + """ + if class_formatter: + # if invoked per reference it has to be a standard function or a classmethod. + # A method of an instance does not make sense + if callable(class_formatter): + return class_formatter(o, filter_list) + # if is invoked by name we restrict it to a method of the class. No need to mess more + elif hasattr(o, class_formatter) and callable(getattr(o, class_formatter)): + func = getattr(o, class_formatter) + return func(filter_list) + + raise ValueError('Unsupported formatting call') + elif hasattr(o, 'table_data'): + return o.table_data() + elif hasattr(o, 'json'): + return o.json() + elif is_dataclass(o): + return asdict(o) + else: + return o.__dict__ # type: ignore[unreachable] + + +def as_table( + obj: list[Any], + class_formatter: str | Callable | None = None, # type: ignore[type-arg] + filter_list: list[str] = [], + capitalize: bool = False, +) -> str: + """variant of as_table (subtly different code) which has two additional parameters + filter which is a list of fields which will be shown + class_formatter a special method to format the outgoing data + + A general comment, the format selected for the output (a string where every data record is separated by newline) + is for compatibility with a print statement + As_table_filter can be a drop in replacement for as_table + """ + raw_data = [_get_values(o, class_formatter, filter_list) for o in obj] + + # determine the maximum column size + column_width: dict[str, int] = {} + for o in raw_data: + for k, v in o.items(): + if not filter_list or k in filter_list: + column_width.setdefault(k, 0) + column_width[k] = max([column_width[k], len(str(v)), len(k)]) + + if not filter_list: + filter_list = list(column_width.keys()) + + # create the header lines + output = '' + key_list = [] + for key in filter_list: + width = column_width[key] + key = key.replace('!', '').replace('_', ' ') + + if capitalize: + key = key.capitalize() + + key_list.append(unicode_ljust(key, width)) + + output += ' | '.join(key_list) + '\n' + output += '-' * len(output) + '\n' + + # create the data lines + for record in raw_data: + obj_data = [] + for key in filter_list: + width = column_width.get(key, len(key)) + value = record.get(key, '') + + if '!' in key: + value = '*' * len(value) + + if isinstance(value, (int, float)) or (isinstance(value, str) and value.isnumeric()): + obj_data.append(unicode_rjust(str(value), width)) + else: + obj_data.append(unicode_ljust(str(value), width)) + + output += ' | '.join(obj_data) + '\n' + + return output diff --git a/archinstall/lib/utils/util.py b/archinstall/lib/utils/util.py index 574cc8d5..f94ca18c 100644 --- a/archinstall/lib/utils/util.py +++ b/archinstall/lib/utils/util.py @@ -1,8 +1,14 @@ import secrets import string +from datetime import UTC, datetime -from archinstall.lib.output import FormattedOutput from archinstall.lib.pathnames import ARCHISO_MOUNTPOINT +from archinstall.lib.utils.format import as_columns + + +def timestamp() -> str: + now = datetime.now(tz=UTC) + return now.strftime('%Y-%m-%d %H:%M:%S') def running_from_iso() -> bool: @@ -36,7 +42,7 @@ def format_cols(items: list[str], header: str | None = None) -> str: else: col = 4 - text += FormattedOutput.as_columns(items, col) + text += as_columns(items, col) # remove whitespaces on each row text = '\n'.join(t.strip() for t in text.split('\n')) return text diff --git a/archinstall/locales/base.pot b/archinstall/locales/base.pot index f707ec7a..4db4554c 100644 --- a/archinstall/locales/base.pot +++ b/archinstall/locales/base.pot @@ -252,6 +252,9 @@ msgstr "" msgid "Locale encoding" msgstr "" +msgid "Console font" +msgstr "" + msgid "Drive(s)" msgstr "" @@ -641,8 +644,8 @@ msgid "" msgstr "" msgid "" -"Provides a selection of desktop environments and tiling window managers, e." -"g. gnome, kde, sway" +"Provides a selection of desktop environments and tiling window managers, " +"e.g. gnome, kde, sway" msgstr "" msgid "Select your desired desktop environment" @@ -1242,7 +1245,22 @@ msgid "Product" msgstr "" #, python-brace-format -msgid "Invalid configuration: {error}" +msgid "Invalid configuration: {}" +msgstr "" + +msgid "Ready to install" +msgstr "" + +msgid "Disks" +msgstr "" + +msgid "Packages" +msgstr "" + +msgid "Network" +msgstr "" + +msgid "Locale" msgstr "" msgid "Type" @@ -1331,8 +1349,8 @@ msgid "Disable Copy-on-Write" msgstr "" msgid "" -"Provides a selection of desktop environments and tiling window managers, e." -"g. GNOME, KDE Plasma, Sway" +"Provides a selection of desktop environments and tiling window managers, " +"e.g. GNOME, KDE Plasma, Sway" msgstr "" #, python-brace-format @@ -2174,6 +2192,14 @@ msgstr "" msgid "Choose network configuration" msgstr "" +msgid "Recommended: Network Manager for desktop, Manual for server" +msgstr "" + +msgid "" +"Warning: no network configuration selected. Network will need to be set up " +"manually on the installed system." +msgstr "" + msgid "No packages found" msgstr "" @@ -2259,3 +2285,181 @@ msgstr "" #, python-brace-format msgid "Default: {DEFAULT_ITER_TIME}ms, Recommended range: 1000-60000" msgstr "" + +#, python-brace-format +msgid "Setting up U2F login: {}" +msgstr "" + +#, python-brace-format +msgid "Default: {}ms, Recommended range: 1000-60000" +msgstr "" + +#, python-brace-format +msgid "{} needs access to your seat" +msgstr "" + +msgid "collection of hardware devices i.e. keyboard, mouse" +msgstr "" + +#, python-brace-format +msgid "Choose an option how to give {} access to your hardware" +msgstr "" + +#, python-brace-format +msgid "About to upload \"{}\" to the publicly accessible {}" +msgstr "" + +msgid "Do you want to continue?" +msgstr "" + +#, python-brace-format +msgid "Log uploaded successfully. URL: {}" +msgstr "" + +msgid "Failed to upload log." +msgstr "" + +msgid "ArchInstall Language" +msgstr "" + +msgid "Version" +msgstr "" + +msgid "Installation Script" +msgstr "" + +msgid "Application" +msgstr "" + +msgid "Services" +msgstr "" + +msgid "Custom commands" +msgstr "" + +msgid "Users" +msgstr "" + +msgid "Root encrypted password" +msgstr "" + +msgid "Zram enabled" +msgstr "" + +#, python-brace-format +msgid "Zram algorithm {}" +msgstr "" + +msgid "Bluetooth enabled" +msgstr "" + +#, python-brace-format +msgid "Audio server \"{}\"" +msgstr "" + +#, python-brace-format +msgid "Power management \"{}\"" +msgstr "" + +msgid "Print service enabled" +msgstr "" + +#, python-brace-format +msgid "Firewall \"{}\"" +msgstr "" + +#, python-brace-format +msgid "Extra fonts \"{}\"" +msgstr "" + +msgid "Root password set" +msgstr "" + +#, python-brace-format +msgid "Configured {} user(s)" +msgstr "" + +msgid "U2F set up" +msgstr "" + +#, python-brace-format +msgid "Bootloader \"{}\"" +msgstr "" + +msgid "UKI enabled" +msgstr "" + +msgid "Default" +msgstr "" + +msgid "Manual" +msgstr "" + +msgid "Pre-mount" +msgstr "" + +#, python-brace-format +msgid "{} layout" +msgstr "" + +#, python-brace-format +msgid "Devices {}" +msgstr "" + +msgid "LVM set up" +msgstr "" + +#, python-brace-format +msgid "{} encryption" +msgstr "" + +#, python-brace-format +msgid "Btrfs snapshot \"{}\"" +msgstr "" + +#, python-brace-format +msgid "Keyboard layout \"{}\"" +msgstr "" + +#, python-brace-format +msgid "Locale language \"{}\"" +msgstr "" + +#, python-brace-format +msgid "Locale encoding \"{}\"" +msgstr "" + +#, python-brace-format +msgid "Console font \"{}\"" +msgstr "" + +#, python-brace-format +msgid "Mirror regions \"{}\"" +msgstr "" + +#, python-brace-format +msgid "Optional repositories \"{}\"" +msgstr "" + +msgid "Custom servers set up" +msgstr "" + +msgid "Custom repositories set up" +msgstr "" + +msgid "Use standalone iwd" +msgstr "" + +msgid "Color enabled" +msgstr "" + +#, python-brace-format +msgid "{} grphics driver" +msgstr "" + +#, python-brace-format +msgid "{} greeter" +msgstr "" + +msgid "Enter a repository name" +msgstr "" diff --git a/archinstall/locales/da/LC_MESSAGES/base.mo b/archinstall/locales/da/LC_MESSAGES/base.mo new file mode 100644 index 00000000..b0cb0718 Binary files /dev/null and b/archinstall/locales/da/LC_MESSAGES/base.mo differ diff --git a/archinstall/locales/da/LC_MESSAGES/base.po b/archinstall/locales/da/LC_MESSAGES/base.po new file mode 100644 index 00000000..cc54891d --- /dev/null +++ b/archinstall/locales/da/LC_MESSAGES/base.po @@ -0,0 +1,2224 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "[!] A log file has been created here: {} {}" +msgstr "[!] En logfil er blevet oprettet her: {} {}" + +msgid " Please submit this issue (and file) to https://github.com/archlinux/archinstall/issues" +msgstr " Indsend venligst denne fejl (og filen) til https://github.com/archlinux/archinstall/issues" + +msgid "Do you really want to abort?" +msgstr "Vil du virkelig afbryde?" + +msgid "And one more time for verification: " +msgstr "Og én gang til for bekræftelse: " + +msgid "Would you like to use swap on zram?" +msgstr "Vil du bruge swap på zram?" + +msgid "Desired hostname for the installation: " +msgstr "Ønsket værtsnavn for installationen: " + +msgid "Username for required superuser with sudo privileges: " +msgstr "Brugernavn til den påkrævede superbruger med sudo-rettigheder: " + +msgid "Any additional users to install (leave blank for no users): " +msgstr "Eventuelle yderligere brugere der skal oprettes (lad feltet være tomt for ingen): " + +msgid "Should this user be a superuser (sudoer)?" +msgstr "Skal denne bruger være superbruger (sudoer)?" + +msgid "Select a timezone" +msgstr "Vælg en tidszone" + +msgid "Would you like to use GRUB as a bootloader instead of systemd-boot?" +msgstr "Vil du bruge GRUB som bootloader i stedet for systemd-boot?" + +msgid "Choose a bootloader" +msgstr "Vælg en bootloader" + +msgid "Choose an audio server" +msgstr "Vælg en lydserver" + +msgid "Only packages such as base, base-devel, linux, linux-firmware, efibootmgr and optional profile packages are installed." +msgstr "Kun pakker som base, base-devel, linux, linux-firmware, efibootmgr og valgfrie profilpakker installeres." + +msgid "Note: base-devel is no longer installed by default. Add it here if you need build tools." +msgstr "Bemærk: base-devel installeres ikke længere som standard. Tilføj den her, hvis du har brug for byggeværktøjer." + +msgid "If you desire a web browser, such as firefox or chromium, you may specify it in the following prompt." +msgstr "Hvis du ønsker en webbrowser, f.eks. firefox eller chromium, kan du angive den i næste prompt." + +msgid "Write additional packages to install (space separated, leave blank to skip): " +msgstr "Skriv yderligere pakker der skal installeres (adskilt med mellemrum, lad feltet være tomt for at springe over): " + +msgid "Copy ISO network configuration to installation" +msgstr "Kopiér ISO-netværkskonfigurationen til installationen" + +msgid "Use NetworkManager (necessary for configuring internet graphically in GNOME and KDE)" +msgstr "Brug NetworkManager (nødvendigt for grafisk internetkonfiguration i GNOME og KDE)" + +msgid "Select one network interface to configure" +msgstr "Vælg én netværksgrænseflade der skal konfigureres" + +msgid "Select which mode to configure for \"{}\" or skip to use default mode \"{}\"" +msgstr "Vælg hvilken tilstand der skal konfigureres for \"{}\", eller spring over for at bruge standardtilstanden \"{}\"" + +#, python-brace-format +msgid "Enter the IP and subnet for {} (example: 192.168.0.5/24): " +msgstr "Indtast IP og subnet for {} (eksempel: 192.168.0.5/24): " + +msgid "Enter your gateway (router) IP address or leave blank for none: " +msgstr "Indtast IP-adressen på din gateway (router), eller lad feltet være tomt for ingen: " + +msgid "Enter your DNS servers (space separated, blank for none): " +msgstr "Indtast dine DNS-servere (adskilt med mellemrum, tomt for ingen): " + +msgid "Select which filesystem your main partition should use" +msgstr "Vælg hvilket filsystem din hovedpartition skal bruge" + +msgid "Current partition layout" +msgstr "Nuværende partitionslayout" + +msgid "" +"Select what to do with\n" +"{}" +msgstr "" +"Vælg hvad der skal gøres med\n" +"{}" + +msgid "Enter a desired filesystem type for the partition" +msgstr "Indtast den ønskede filsystemtype for partitionen" + +msgid "Enter the start location (in parted units: s, GB, %, etc. ; default: {}): " +msgstr "Indtast startplaceringen (i parted-enheder: s, GB, %, osv.; standard: {}): " + +msgid "Enter the end location (in parted units: s, GB, %, etc. ; ex: {}): " +msgstr "Indtast slutplaceringen (i parted-enheder: s, GB, %, osv.; f.eks.: {}): " + +msgid "{} contains queued partitions, this will remove those, are you sure?" +msgstr "{} indeholder planlagte partitioner. Dette vil fjerne dem. Er du sikker?" + +msgid "" +"{}\n" +"\n" +"Select by index which partitions to delete" +msgstr "" +"{}\n" +"\n" +"Vælg efter indeks hvilke partitioner der skal slettes" + +msgid "" +"{}\n" +"\n" +"Select by index which partition to mount where" +msgstr "" +"{}\n" +"\n" +"Vælg efter indeks hvilken partition der skal monteres hveller" + +msgid " * Partition mount-points are relative to inside the installation, the boot would be /boot as an example." +msgstr " * Partitionens monteringspunkter er relative inde i installationen; boot vil f.eks. være /boot." + +msgid "Select where to mount partition (leave blank to remove mountpoint): " +msgstr "Vælg hvor partitionen skal monteres (lad feltet være tomt for at fjerne monteringspunktet): " + +msgid "" +"{}\n" +"\n" +"Select which partition to mask for formatting" +msgstr "" +"{}\n" +"\n" +"Vælg hvilken partition der skal markeres til formatering" + +msgid "" +"{}\n" +"\n" +"Select which partition to mark as encrypted" +msgstr "" +"{}\n" +"\n" +"Vælg hvilken partition der skal mark som krypteret" + +msgid "" +"{}\n" +"\n" +"Select which partition to mark as bootable" +msgstr "" +"{}\n" +"\n" +"Vælg hvilken partition der skal mark som bootbar" + +msgid "" +"{}\n" +"\n" +"Select which partition to set a filesystem on" +msgstr "" +"{}\n" +"\n" +"Vælg hvilken partition der skal set en filsystem on" + +msgid "Enter a desired filesystem type for the partition: " +msgstr "Indtast den ønskede filsystemtype for partitionen: " + +msgid "Archinstall language" +msgstr "Archinstall-sprog" + +msgid "Wipe all selected drives and use a best-effort default partition layout" +msgstr "Slet alle valgte drev og brug et bedst muligt standardpartitionslayout" + +msgid "Select what to do with each individual drive (followed by partition usage)" +msgstr "Vælg hvad der skal gøres med hvert enkelt drev (efterfulgt af partitionsbrug)" + +msgid "Select what you wish to do with the selected block devices" +msgstr "Vælg hvad du vil gøre med de valgte blokenheder" + +msgid "This is a list of pre-programmed profiles, they might make it easier to install things like desktop environments" +msgstr "Dette er en liste over forudprogrammerede profiler, som kan gøre det lettere at installere ting som skrivebordsmiljøer" + +msgid "Select keyboard layout" +msgstr "Vælg tastaturlayout" + +msgid "Select one of the regions to download packages from" +msgstr "Vælg en af regionerne som pakker skal hentes fra" + +msgid "Select one or more hard drives to use and configure" +msgstr "Vælg en eller flere harddiske der skal bruges og konfigureres" + +msgid "For the best compatibility with your AMD hardware, you may want to use either the all open-source or AMD / ATI options." +msgstr "For bedst kompatibilitet med din AMD-hardware kan du bruge enten alle open source-drivere eller AMD/ATI-valgene." + +msgid "For the best compatibility with your Intel hardware, you may want to use either the all open-source or Intel options.\n" +msgstr "For bedst kompatibilitet med din Intel-hardware kan du bruge enten alle open source-drivere eller Intel-valgene.\n" + +msgid "For the best compatibility with your Nvidia hardware, you may want to use the Nvidia proprietary driver.\n" +msgstr "For bedst kompatibilitet med din Nvidia-hardware kan du bruge Nvidias proprietære driver.\n" + +msgid "" +"\n" +"\n" +"Select a graphics driver or leave blank to install all open-source drivers" +msgstr "" +"\n" +"\n" +"Vælg en grafikdriver, eller lad feltet være tomt for at installere alle open source-drivere" + +msgid "All open-source (default)" +msgstr "Alle open source-drivere (standard)" + +msgid "Choose which kernels to use or leave blank for default \"{}\"" +msgstr "Vælg hvilke kerner der skal bruges, eller lad feltet være tomt for standard \"{}\"" + +msgid "Choose which locale language to use" +msgstr "Vælg hvilket lokaliseringssprog der skal bruges" + +msgid "Choose which locale encoding to use" +msgstr "Vælg hvilken lokaliseringskodning der skal bruges" + +msgid "Select one of the values shown below: " +msgstr "Vælg en af værdierne nedenfor: " + +msgid "Select one or more of the options below: " +msgstr "Vælg en eller flere af mulighederne nedenfor: " + +msgid "Adding partition...." +msgstr "Tilføjer partition...." + +msgid "You need to enter a valid fs-type in order to continue. See `man parted` for valid fs-type's." +msgstr "Du skal indtaste en gyldig fs-type for at fortsætte. Se `man parted` for gyldige fs-typer." + +msgid "Error: Listing profiles on URL \"{}\" resulted in:" +msgstr "Fejl: Liste over profiler fra URL \"{}\" gav:" + +msgid "Error: Could not decode \"{}\" result as JSON:" +msgstr "Fejl: Kunne ikke afkode resultatet \"{}\" som JSON:" + +msgid "Keyboard layout" +msgstr "Tastaturlayout" + +msgid "Mirror region" +msgstr "Spejlregion" + +msgid "Locale language" +msgstr "Lokaliseringssprog" + +msgid "Locale encoding" +msgstr "Lokaliseringskodning" + +msgid "Console font" +msgstr "Konsolskrifttype" + +msgid "Drive(s)" +msgstr "Drev" + +msgid "Disk layout" +msgstr "Disklayout" + +msgid "Encryption password" +msgstr "Krypteringsadgangskode" + +msgid "Swap" +msgstr "Swap" + +msgid "Bootloader" +msgstr "Bootloader" + +msgid "Root password" +msgstr "Root-adgangskode" + +msgid "Superuser account" +msgstr "Superbrugerkonto" + +msgid "User account" +msgstr "Brugerkonto" + +msgid "Profile" +msgstr "Profil" + +msgid "Audio" +msgstr "Lyd" + +msgid "Kernels" +msgstr "Kerner" + +msgid "Additional packages" +msgstr "Yderligere pakker" + +msgid "Network configuration" +msgstr "Netværkskonfiguration" + +msgid "Automatic time sync (NTP)" +msgstr "Automatisk tidssynkronisering (NTP)" + +msgid "Install ({} config(s) missing)" +msgstr "Installer ({} konfiguration(er) mangler)" + +msgid "" +"You decided to skip harddrive selection\n" +"and will use whatever drive-setup is mounted at {} (experimental)\n" +"WARNING: Archinstall won't check the suitability of this setup\n" +"Do you wish to continue?" +msgstr "" +"Du valgte at springe harddiskvalg over\n" +"og vil bruge den drevopsætning der er monteret på {} (eksperimentelt)\n" +"ADVARSEL: Archinstall kontrollerer ikke om denne opsætning er egnet\n" +"Vil du fortsætte?" + +msgid "Re-using partition instance: {}" +msgstr "Genbruger partitionsinstans: {}" + +msgid "Create a new partition" +msgstr "Create en new partition" + +msgid "Delete a partition" +msgstr "Slet en partition" + +msgid "Clear/Delete all partitions" +msgstr "Clear/Slet all partitioner" + +msgid "Assign mount-point for a partition" +msgstr "Tildel monteringspunkt til en partition" + +msgid "Mark/Unmark a partition to be formatted (wipes data)" +msgstr "Markér/fjern markering en partition skal være fellermateret (wipes data)" + +msgid "Mark/Unmark a partition as encrypted" +msgstr "Markér/fjern markering en partition som krypteret" + +msgid "Mark/Unmark a partition as bootable (automatic for /boot)" +msgstr "Markér/fjern markering af en partition som bootbar (automatisk for /boot)" + +msgid "Set desired filesystem for a partition" +msgstr "Angiv ønsket filsystem for en partition" + +msgid "Abort" +msgstr "Afbryd" + +msgid "Hostname" +msgstr "Værtsnavn" + +msgid "Not configured, unavailable unless setup manually" +msgstr "Ikke konfigureret, utilgængelig medmindre det sættes op manuelt" + +msgid "Timezone" +msgstr "Tidszone" + +msgid "Set/Modify the below options" +msgstr "Angiv/ændr indstillingerne nedenfor" + +msgid "Install" +msgstr "Installer" + +msgid "" +"Use ESC to skip\n" +"\n" +msgstr "" +"Brug ESC for at springe over\n" +"\n" + +msgid "Suggest partition layout" +msgstr "Foreslå partitionslayout" + +msgid "Enter a password: " +msgstr "Indtast en adgangskode: " + +msgid "Enter a encryption password for {}" +msgstr "Indtast en krypteringsadgangskode for {}" + +msgid "Enter disk encryption password (leave blank for no encryption): " +msgstr "Indtast adgangskode til diskkryptering (lad feltet være tomt for ingen kryptering): " + +msgid "Create a required super-user with sudo privileges: " +msgstr "Create en required super-bruger med sudo-rettigheder: " + +msgid "Enter root password (leave blank to disable root): " +msgstr "Indtast root-adgangskode (lad feltet være tomt for at deaktivere root): " + +msgid "Password for user \"{}\": " +msgstr "Adgangskode for brugeren \"{}\": " + +msgid "Verifying that additional packages exist (this might take a few seconds)" +msgstr "Kontrollerer at de yderligere pakker findes (det kan tage et par sekunder)" + +msgid "Would you like to use automatic time synchronization (NTP) with the default time servers?\n" +msgstr "Vil du bruge automatisk tidssynkronisering (NTP) med standardtidserverne?\n" + +msgid "" +"Hardware time and other post-configuration steps might be required in order for NTP to work.\n" +"For more information, please check the Arch wiki" +msgstr "" +"Hardwaretid og andre efterkonfigurationstrin kan være nødvendige for at NTP virker.\n" +"Se Arch-wikien for mere information" + +msgid "Enter a username to create an additional user (leave blank to skip): " +msgstr "Indtast et brugernavn for at oprette en ekstra bruger (lad feltet være tomt for at springe over): " + +msgid "Use ESC to skip\n" +msgstr "Brug ESC for at springe over\n" + +msgid "" +"\n" +" Choose an object from the list, and select one of the available actions for it to execute" +msgstr "" +"\n" +" Vælg et objekt fra listen, og vælg en af de tilgængelige handlinger der skal udføres" + +msgid "Cancel" +msgstr "Annuller" + +msgid "Confirm and exit" +msgstr "Bekræft og afslut" + +msgid "Add" +msgstr "Tilføj" + +msgid "Copy" +msgstr "Kopiér" + +msgid "Edit" +msgstr "Redigér" + +msgid "Delete" +msgstr "Slet" + +msgid "Select an action for '{}'" +msgstr "Vælg en handling for '{}'" + +msgid "Copy to new key:" +msgstr "Kopiér til ny nøgle:" + +msgid "Unknown nic type: {}. Possible values are {}" +msgstr "Ukendt NIC-type: {}. Mulige værdier er {}" + +msgid "" +"\n" +"This is your chosen configuration:" +msgstr "" +"\n" +"Dette er din valgte konfiguration:" + +msgid "Pacman is already running, waiting maximum 10 minutes for it to terminate." +msgstr "Pacman kører allerede. Venter højst 10 minutter på at den afsluttes." + +msgid "Pre-existing pacman lock never exited. Please clean up any existing pacman sessions before using archinstall." +msgstr "En eksisterende pacman-lås blev aldrig afsluttet. Ryd op i eventuelle eksisterende pacman-sessioner før du bruger archinstall." + +msgid "Choose which optional additional repositories to enable" +msgstr "Vælg hvilke valgfrie ekstra pakkearkiver der skal aktiveres" + +msgid "Add a user" +msgstr "Tilføj en bruger" + +msgid "Change password" +msgstr "Skift adgangskode" + +msgid "Promote/Demote user" +msgstr "Forfrem/degrader bruger" + +msgid "Delete User" +msgstr "Slet bruger" + +msgid "" +"\n" +"Define a new user\n" +msgstr "" +"\n" +"Definér en ny bruger\n" + +msgid "User Name : " +msgstr "Brugernavn: " + +msgid "Should {} be a superuser (sudoer)?" +msgstr "Skal {} være superbruger (sudoer)?" + +msgid "Define users with sudo privilege: " +msgstr "Definér brugere med sudo-rettigheder: " + +msgid "No network configuration" +msgstr "Ingen netværkskonfiguration" + +msgid "Set desired subvolumes on a btrfs partition" +msgstr "Set desired underenheds on en btrfs partition" + +msgid "" +"{}\n" +"\n" +"Select which partition to set subvolumes on" +msgstr "" +"{}\n" +"\n" +"Vælg hvilken partition der skal set underenheds on" + +msgid "Manage btrfs subvolumes for current partition" +msgstr "Administrér btrfs-underenheder for den aktuelle partition" + +msgid "No configuration" +msgstr "Ingen konfiguration" + +msgid "Save user configuration" +msgstr "Gem brugerkonfiguration" + +msgid "Save user credentials" +msgstr "Gem brugerlegitimationsoplysninger" + +msgid "Save disk layout" +msgstr "Gem disklayout" + +msgid "Save all" +msgstr "Gem alt" + +msgid "Choose which configuration to save" +msgstr "Vælg hvilken konfiguration der skal gemmes" + +msgid "Enter a directory for the configuration(s) to be saved: " +msgstr "Indtast en mappe hvor konfigurationen/konfigurationerne skal gemmes: " + +msgid "Not a valid directory: {}" +msgstr "Ikke en gyldig mappe: {}" + +msgid "The password you are using seems to be weak," +msgstr "Adgangskoden du bruger ser ud til at være svag," + +msgid "are you sure you want to use it?" +msgstr "er du sikker på at du vil bruge den?" + +msgid "Optional repositories" +msgstr "Valgfrie pakkearkiver" + +msgid "Save configuration" +msgstr "Gem konfiguration" + +msgid "Missing configurations:\n" +msgstr "Manglende konfigurationer:\n" + +msgid "Either root-password or at least 1 superuser must be specified" +msgstr "Enten root-adgangskode eller mindst 1 superbruger skal angives" + +msgid "Manage superuser accounts: " +msgstr "Administrér superbrugerkonti: " + +msgid "Manage ordinary user accounts: " +msgstr "Administrér almindelige brugerkonti: " + +msgid " Subvolume :{:16}" +msgstr " Underenhed :{:16}" + +msgid " mounted at {:16}" +msgstr " montereed at {:16}" + +msgid " with option {}" +msgstr " med mulighed {}" + +msgid "" +"\n" +" Fill the desired values for a new subvolume \n" +msgstr "" +"\n" +" Udfyld de ønskede værdier for en ny underenhed \n" + +msgid "Subvolume name " +msgstr "Subvolume navn " + +msgid "Subvolume mountpoint" +msgstr "Subvolume monteringspunkt" + +msgid "Subvolume options" +msgstr "Subvolume muligheds" + +msgid "Save" +msgstr "Gem" + +msgid "Subvolume name :" +msgstr "Subvolume navn :" + +msgid "Select a mount point :" +msgstr "Vælg en montere point :" + +msgid "Select the desired subvolume options " +msgstr "Vælg desired underenhed muligheds " + +msgid "Define users with sudo privilege, by username: " +msgstr "Define brugers med sudo privilege, by brugernavn: " + +#, python-brace-format +msgid "[!] A log file has been created here: {}" +msgstr "[!] A log fil has been created here: {}" + +msgid "Would you like to use BTRFS subvolumes with a default structure?" +msgstr "Vil du bruge BTRFS-underenheder med en standardstruktur?" + +msgid "Would you like to use BTRFS compression?" +msgstr "Vil du bruge BTRFS-komprimering?" + +msgid "Would you like to create a separate partition for /home?" +msgstr "Vil du oprette en separat partition til /home?" + +msgid "The selected drives do not have the minimum capacity required for an automatic suggestion\n" +msgstr "De valgte drev har ikke den minimumskapacitet der kræves for et automatisk forslag\n" + +msgid "Minimum capacity for /home partition: {}GB\n" +msgstr "Minimumskapacitet for /home-partition: {} GB\n" + +msgid "Minimum capacity for Arch Linux partition: {}GB" +msgstr "Minimumskapacitet for Arch Linux-partition: {} GB" + +msgid "Continue" +msgstr "Fortsæt" + +msgid "yes" +msgstr "ja" + +msgid "no" +msgstr "nej" + +msgid "set: {}" +msgstr "angivet: {}" + +msgid "Manual configuration setting must be a list" +msgstr "Manuel konfigurationsindstilling skal være en liste" + +msgid "No iface specified for manual configuration" +msgstr "Ingen grænseflade angivet til manuel konfiguration" + +msgid "Manual nic configuration with no auto DHCP requires an IP address" +msgstr "Manuel NIC-konfiguration uden automatisk DHCP kræver en IP-adresse" + +msgid "Add interface" +msgstr "Tilføj grænseflade" + +msgid "Edit interface" +msgstr "Redigér grænseflade" + +msgid "Delete interface" +msgstr "Slet grænseflade" + +msgid "Select interface to add" +msgstr "Vælg grænseflade der skal tilføjes" + +msgid "Manual configuration" +msgstr "Manuel konfiguration" + +msgid "Mark/Unmark a partition as compressed (btrfs only)" +msgstr "Markér/fjern markering en partition som komprimeret (btrfs only)" + +msgid "The password you are using seems to be weak, are you sure you want to use it?" +msgstr "Adgangskoden du bruger ser ud til at være svag. Er du sikker på at du vil bruge den?" + +msgid "Provides a selection of desktop environments and tiling window managers, e.g. gnome, kde, sway" +msgstr "Giver et udvalg af skrivebordsmiljøer og flisebaserede vindueshåndterere, f.eks. gnome, kde, sway" + +msgid "Select your desired desktop environment" +msgstr "Vælg dit ønskede skrivebordsmiljø" + +msgid "A very basic installation that allows you to customize Arch Linux as you see fit." +msgstr "En meget grundlæggende installation, der lader dig tilpasse Arch Linux som du ønsker." + +msgid "Provides a selection of various server packages to install and enable, e.g. httpd, nginx, mariadb" +msgstr "Giver et udvalg af forskellige serverpakker der kan installeres og aktiveres, f.eks. httpd, nginx, mariadb" + +msgid "Choose which servers to install, if none then a minimal installation will be done" +msgstr "Vælg hvilke servere der skal installeres. Hvis ingen vælges, udføres en minimal installation" + +msgid "Installs a minimal system as well as xorg and graphics drivers." +msgstr "Installerer et minimalt system samt xorg og grafikdrivere." + +msgid "Press Enter to continue." +msgstr "Tryk Enter for at fortsætte." + +msgid "Would you like to chroot into the newly created installation and perform post-installation configuration?" +msgstr "Vil du chroote ind i den nyoprettede installation og udføre efterkonfiguration?" + +msgid "Are you sure you want to reset this setting?" +msgstr "Er du sikker på at du vil nulstille denne indstilling?" + +msgid "Select one or more hard drives to use and configure\n" +msgstr "Vælg en eller flere harddiske der skal bruges og konfigureres\n" + +msgid "Any modifications to the existing setting will reset the disk layout!" +msgstr "Enhver ændring af den eksisterende indstilling vil nulstille disklayoutet!" + +msgid "If you reset the harddrive selection this will also reset the current disk layout. Are you sure?" +msgstr "Hvis du nulstiller harddiskvalget, nulstilles det nuværende disklayout også. Er du sikker?" + +msgid "Save and exit" +msgstr "Gem og afslut" + +msgid "" +"{}\n" +"contains queued partitions, this will remove those, are you sure?" +msgstr "" +"{}\n" +"indeholder planlagte partitioner. Dette vil fjerne dem. Er du sikker?" + +msgid "No audio server" +msgstr "Ingen lydserver" + +msgid "(default)" +msgstr "(standard)" + +msgid "Use ESC to skip" +msgstr "Brug ESC for at springe over" + +msgid "" +"Use CTRL+C to reset current selection\n" +"\n" +msgstr "" +"Brug CTRL+C for at nulstille det aktuelle valg\n" +"\n" + +msgid "Copy to: " +msgstr "Kopiér til: " + +msgid "Edit: " +msgstr "Redigér: " + +msgid "Key: " +msgstr "Nøgle: " + +msgid "Edit {}: " +msgstr "Redigér {}: " + +msgid "Add: " +msgstr "Tilføj: " + +msgid "Value: " +msgstr "Værdi: " + +msgid "You can skip selecting a drive and partitioning and use whatever drive-setup is mounted at /mnt (experimental)" +msgstr "You can springe over selecting en drev og partitioning og use whatever drev-setup is montereed at /mnt (experimental)" + +msgid "Select one of the disks or skip and use /mnt as default" +msgstr "Vælg en af diskene, eller spring over og brug /mnt som standard" + +msgid "Select which partitions to mark for formatting:" +msgstr "Vælg hvilke partitioner der skal markeres til formatering:" + +msgid "Use HSM to unlock encrypted drive" +msgstr "Brug HSM til at låse krypteret drev op" + +msgid "Device" +msgstr "Enhed" + +msgid "Size" +msgstr "Størrelse" + +msgid "Free space" +msgstr "Ledig plads" + +msgid "Bus-type" +msgstr "Bustype" + +msgid "Either root-password or at least 1 user with sudo privileges must be specified" +msgstr "Enten root-adgangskode eller mindst 1 bruger med sudo-rettigheder skal angives" + +msgid "Enter username (leave blank to skip): " +msgstr "Indtast brugernavn (lad feltet være tomt for at springe over): " + +msgid "The username you entered is invalid. Try again" +msgstr "The brugernavn you entered is ingyldig. Try again" + +msgid "Should \"{}\" be a superuser (sudo)?" +msgstr "Skal \"{}\" være superbruger (sudo)?" + +msgid "Select which partitions to encrypt" +msgstr "Vælg hvilke partitioner der skal krypteres" + +msgid "very weak" +msgstr "meget svag" + +msgid "weak" +msgstr "svag" + +msgid "moderate" +msgstr "moderat" + +msgid "strong" +msgstr "stærk" + +msgid "Add subvolume" +msgstr "Tilføj underenhed" + +msgid "Edit subvolume" +msgstr "Redigér underenhed" + +msgid "Delete subvolume" +msgstr "Slet underenhed" + +msgid "Configured {} interfaces" +msgstr "Configured {} grænseflades" + +msgid "This option enables the number of parallel downloads that can occur during installation" +msgstr "Denne indstilling aktiverer antallet af parallelle downloads under installationen" + +msgid "" +"Enter the number of parallel downloads to be enabled.\n" +" (Enter a value between 1 to {})\n" +"Note:" +msgstr "" +"Indtast antallet af parallelle downloads der skal aktiveres.\n" +" (Indtast en værdi mellem 1 og {})\n" +"Bemærk:" + +msgid " - Maximum value : {} ( Allows {} parallel downloads, allows {} downloads at a time )" +msgstr " - Maksimumsværdi : {} (tillader {} parallelle downloads, {} downloads ad gangen)" + +msgid " - Minimum value : 1 ( Allows 1 parallel download, allows 2 downloads at a time )" +msgstr " - Minimumsværdi : 1 (tillader 1 parallel download, 2 downloads ad gangen)" + +msgid " - Disable/Default : 0 ( Disables parallel downloading, allows only 1 download at a time )" +msgstr " - Deaktiver/standard : 0 (deaktiverer parallel download og tillader kun 1 download ad gangen)" + +#, python-brace-format +msgid "Invalid input! Try again with a valid input [1 to {max_downloads}, or 0 to disable]" +msgstr "Ugyldigt input! Prøv igen med et gyldigt input [1 til {max_downloads}, eller 0 for at deaktivere]" + +msgid "Parallel Downloads" +msgstr "Parallelle downloads" + +msgid "Pacman" +msgstr "Pacman" + +msgid "Color" +msgstr "Farve" + +#, python-brace-format +msgid "Enter the number of parallel downloads (1-{})" +msgstr "Indtast antallet af parallelle downloads (1-{})" + +msgid "Enable colored output for pacman" +msgstr "Aktivér farvet output for pacman" + +msgid "ESC to skip" +msgstr "ESC for at springe over" + +msgid "CTRL+C to reset" +msgstr "CTRL+C for at nulstille" + +msgid "TAB to select" +msgstr "TAB for at vælge" + +msgid "[Default value: 0] > " +msgstr "[Standard værdi: 0] > " + +msgid "To be able to use this translation, please install a font manually that supports the language." +msgstr "For at kunne bruge denne oversættelse skal du manuelt installere en skrifttype der understøtter sproget." + +msgid "The font should be stored as {}" +msgstr "Skrifttypen skal gemmes som {}" + +msgid "Archinstall requires root privileges to run. See --help for more." +msgstr "Archinstall kræver root-rettigheder for at køre. Se --help for mere information." + +msgid "Select an execution mode" +msgstr "Vælg en execution tilstand" + +#, python-brace-format +msgid "Unable to fetch profile from specified url: {}" +msgstr "Kan ikke hente profil fra den angivne URL: {}" + +#, python-brace-format +msgid "Profiles must have unique name, but profile definitions with duplicate name found: {}" +msgstr "Profils must have unique navn, but profil definitions med duplicate navn found: {}" + +msgid "Select one or more devices to use and configure" +msgstr "Vælg en eller flere enheder der skal bruges og konfigureres" + +msgid "If you reset the device selection this will also reset the current disk layout. Are you sure?" +msgstr "Hvis du nulstiller enhedsvalget, nulstilles det aktuelle disklayout også. Er du sikker?" + +msgid "Existing Partitions" +msgstr "Existing Partitioner" + +msgid "Select a partitioning option" +msgstr "Vælg en partitioning mulighed" + +msgid "Enter the root directory of the mounted devices: " +msgstr "Indtast root-mappen for de monterede enheder: " + +#, python-brace-format +msgid "Minimum capacity for /home partition: {}GiB\n" +msgstr "Minimumskapacitet for /home-partition: {} GiB\n" + +#, python-brace-format +msgid "Minimum capacity for Arch Linux partition: {}GiB" +msgstr "Minimumskapacitet for Arch Linux-partition: {} GiB" + +msgid "This is a list of pre-programmed profiles_bck, they might make it easier to install things like desktop environments" +msgstr "Dette er en liste over forudprogrammerede profiles_bck, som kan gøre det lettere at installere ting som skrivebordsmiljøer" + +msgid "Current profile selection" +msgstr "Nuværende profil selection" + +msgid "Remove all newly added partitions" +msgstr "Remove all newly tilføjed partitioner" + +msgid "Assign mountpoint" +msgstr "Assign monteringspunkt" + +msgid "Mark/Unmark to be formatted (wipes data)" +msgstr "Markér/fjern markering skal være fellermateret (wipes data)" + +msgid "Mark/Unmark as bootable" +msgstr "Markér/fjern markering som bootbar" + +msgid "Change filesystem" +msgstr "Ændr filsystem" + +msgid "Mark/Unmark as compressed" +msgstr "Markér/fjern markering som komprimeret" + +msgid "Set subvolumes" +msgstr "Set underenheds" + +msgid "Delete partition" +msgstr "Slet partition" + +msgid "Partition" +msgstr "Partition" + +msgid "This partition is currently encrypted, to format it a filesystem has to be specified" +msgstr "Denne partition er i øjeblikket krypteret. For at formatere den skal der angives et filsystem." + +msgid "Partition mount-points are relative to inside the installation, the boot would be /boot as an example." +msgstr "Partitionens monteringspunkter er relative inde i installationen; boot vil f.eks. være /boot." + +msgid "If mountpoint /boot is set, then the partition will also be marked as bootable." +msgstr "Hvis monteringspunktet /boot angives, markeres partitionen også som bootbar." + +msgid "Mountpoint: " +msgstr "Monteringspunkt: " + +msgid "Current free sectors on device {}:" +msgstr "Nuværende free sectellers on enhed {}:" + +msgid "Total sectors: {}" +msgstr "Total sectellers: {}" + +msgid "Enter the start sector (default: {}): " +msgstr "Indtast start secteller (standard: {}): " + +msgid "Enter the end sector of the partition (percentage or block number, default: {}): " +msgstr "Indtast partitionens slutsektor (procent eller bloknummer, standard: {}): " + +msgid "This will remove all newly added partitions, continue?" +msgstr "Dette vil fjerne alle nyligt tilføjede partitioner. Fortsæt?" + +#, python-brace-format +msgid "Partition management: {}" +msgstr "Partitionshåndtering: {}" + +#, python-brace-format +msgid "Total length: {}" +msgstr "Samlet længde: {}" + +msgid "Encryption type" +msgstr "Krypteringstype" + +msgid "Iteration time" +msgstr "Iterationstid" + +msgid "Enter iteration time for LUKS encryption (in milliseconds)" +msgstr "Indtast iterationstid for LUKS-kryptering (i millisekunder)" + +msgid "Higher values increase security but slow down boot time" +msgstr "Higher værdis increase security but slow down boot time" + +msgid "Default: 10000ms, Recommended range: 1000-60000" +msgstr "Standard: 10000 ms, anbefalet område: 1000-60000" + +msgid "Iteration time cannot be empty" +msgstr "Iterationstid må ikke være tom" + +msgid "Iteration time must be at least 100ms" +msgstr "Iterationstid skal være mindst 100 ms" + +msgid "Iteration time must be at most 120000ms" +msgstr "Iterationstid må højst være 120000 ms" + +msgid "Please enter a valid number" +msgstr "Indtast venligst et gyldigt tal" + +msgid "Partitions" +msgstr "Partitioner" + +msgid "No HSM devices available" +msgstr "No HSM enheds available" + +msgid "Partitions to be encrypted" +msgstr "Partitioner skal være krypteret" + +msgid "Select disk encryption option" +msgstr "Vælg disk kryptering mulighed" + +msgid "Select a FIDO2 device to use for HSM" +msgstr "Vælg en FIDO2-enhed der skal bruges til HSM" + +msgid "Use a best-effort default partition layout" +msgstr "Use en best-effellert standard partition layout" + +msgid "Manual Partitioning" +msgstr "Manuel partitionering" + +msgid "Pre-mounted configuration" +msgstr "Pre-montereed konfiguration" + +msgid "Unknown" +msgstr "Ukendt" + +msgid "Partition encryption" +msgstr "Partition kryptering" + +#, python-brace-format +msgid " ! Formatting {} in " +msgstr " ! Fellermatting {} in " + +#, fuzzy +msgid "← Back" +msgstr " Tilbage" + +msgid "Disk encryption" +msgstr "Disk kryptering" + +msgid "Configuration" +msgstr "Konfiguration" + +msgid "Password" +msgstr "Adgangskode" + +msgid "All settings will be reset, are you sure?" +msgstr "Alle indstillinger nulstilles. Er du sikker?" + +msgid "Back" +msgstr "Tilbage" + +msgid "Please chose which greeter to install for the chosen profiles: {}" +msgstr "Vælg hvilken login-skærm der skal installeres for de valgte profiler: {}" + +#, python-brace-format +msgid "Environment type: {}" +msgstr "Miljøtype: {}" + +msgid "The proprietary Nvidia driver is not supported by Sway. It is likely that you will run into issues, are you okay with that?" +msgstr "Den proprietære Nvidia-driver understøttes ikke af Sway. Du vil sandsynligvis støde på problemer. Er det i orden?" + +msgid "Installed packages" +msgstr "Installered pakker" + +msgid "Add profile" +msgstr "Tilføj profil" + +msgid "Edit profile" +msgstr "Redigér profil" + +msgid "Delete profile" +msgstr "Slet profil" + +msgid "Profile name: " +msgstr "Profil navn: " + +msgid "The profile name you entered is already in use. Try again" +msgstr "The profil navn you entered is already in use. Try again" + +msgid "Packages to be install with this profile (space separated, leave blank to skip): " +msgstr "Pakker der skal installeres med denne profil (adskilt med mellemrum, lad feltet være tomt for at springe over): " + +msgid "Services to be enabled with this profile (space separated, leave blank to skip): " +msgstr "Tjenester der skal aktiveres med denne profil (adskilt med mellemrum, lad feltet være tomt for at springe over): " + +msgid "Should this profile be enabled for installation?" +msgstr "Skal denne profil aktiveres til installation?" + +msgid "Create your own" +msgstr "Opret din egen" + +msgid "" +"\n" +"Select a graphics driver or leave blank to install all open-source drivers" +msgstr "" +"\n" +"Vælg en grafikdriver, eller lad feltet være tomt for at installere alle open source-drivere" + +msgid "Sway needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" +msgstr "Sway skal have adgang til dit seat (samling af hardwareenheder, dvs. tastatur, mus osv.)" + +msgid "" +"\n" +"\n" +"Choose an option to give Sway access to your hardware" +msgstr "" +"\n" +"\n" +"Vælg en mulighed for at give Sway adgang til din hardware" + +msgid "Graphics driver" +msgstr "Grafikdriver" + +msgid "Greeter" +msgstr "Login-skærm" + +msgid "Please chose which greeter to install" +msgstr "Vælg hvilken login-skærm der skal installeres" + +msgid "This is a list of pre-programmed default_profiles" +msgstr "Dette er en liste over forudprogrammerede default_profiles" + +msgid "Disk configuration" +msgstr "Diskkonfiguration" + +msgid "Profiles" +msgstr "Profiler" + +msgid "Finding possible directories to save configuration files ..." +msgstr "Finder mulige mapper til at gemme konfigurationsfiler ..." + +msgid "Select directory (or directories) for saving configuration files" +msgstr "Vælg mappe (eller mapper) til lagring af konfigurationsfiler" + +msgid "Add a custom mirror" +msgstr "Tilføj en brugerdefineret spejl" + +msgid "Change custom mirror" +msgstr "Ændr brugerdefineret spejl" + +msgid "Delete custom mirror" +msgstr "Slet brugerdefineret spejl" + +msgid "Enter name (leave blank to skip): " +msgstr "Indtast navn (lad feltet være tomt for at springe over): " + +msgid "Enter url (leave blank to skip): " +msgstr "Indtast URL (lad feltet være tomt for at springe over): " + +msgid "Select signature check option" +msgstr "Vælg signatur kontrol mulighed" + +msgid "Select signature option" +msgstr "Vælg signatur mulighed" + +msgid "Custom mirrors" +msgstr "Brugerdefinerede spejle" + +msgid "Defined" +msgstr "Defineret" + +msgid "Save user configuration (including disk layout)" +msgstr "Gem bruger konfiguration (including disk layout)" + +msgid "" +"Enter a directory for the configuration(s) to be saved (tab completion enabled)\n" +"Save directory: " +msgstr "" +"Indtast en mappe hvor konfigurationen/konfigurationerne skal gemmes (tab-fuldførelse aktiveret)\n" +"Gemmemappe: " + +msgid "" +"Do you want to save {} configuration file(s) in the following location?\n" +"\n" +"{}" +msgstr "" +"Vil du gemme {} konfigurationsfil(er) på følgende placering?\n" +"\n" +"{}" + +msgid "Saving {} configuration files to {}" +msgstr "Gemmer {} konfigurationsfiler til {}" + +msgid "Mirrors" +msgstr "Spejle" + +msgid "Mirror regions" +msgstr "Mirreller regioner" + +msgid " - Maximum value : {} ( Allows {} parallel downloads, allows {max_downloads+1} downloads at a time )" +msgstr " - Maksimumsværdi : {} (tillader {} parallelle downloads, {max_downloads+1} downloads ad gangen)" + +msgid "Invalid input! Try again with a valid input [1 to {}, or 0 to disable]" +msgstr "Ugyldigt input! Prøv igen med et gyldigt input [1 til {}, eller 0 for at deaktivere]" + +msgid "Locales" +msgstr "Lokaliseringer" + +msgid "Use NetworkManager (necessary to configure internet graphically in GNOME and KDE)" +msgstr "Brug NetworkManager (nødvendigt for at konfigurere internet grafisk i GNOME og KDE)" + +msgid "Total: {} / {}" +msgstr "I alt: {} / {}" + +msgid "All entered values can be suffixed with a unit: B, KB, KiB, MB, MiB..." +msgstr "Alle indtastede værdier kan afsluttes med en enhed: B, KB, KiB, MB, MiB..." + +msgid "If no unit is provided, the value is interpreted as sectors" +msgstr "If no unit is provided, værdi is interpreted som sectellers" + +msgid "Enter start (default: sector {}): " +msgstr "Indtast start (standard: secteller {}): " + +msgid "Enter end (default: {}): " +msgstr "Indtast end (standard: {}): " + +msgid "Unable to determine fido2 devices. Is libfido2 installed?" +msgstr "Kan ikke registrere fido2-enheder. Er libfido2 installeret?" + +msgid "Path" +msgstr "Sti" + +msgid "Manufacturer" +msgstr "Producent" + +msgid "Product" +msgstr "Produkt" + +#, python-brace-format +msgid "Invalid configuration: {error}" +msgstr "Ugyldig konfiguration: {error}" + +msgid "Ready to install" +msgstr "Klar til installation" + +msgid "Disks" +msgstr "Diske" + +msgid "Packages" +msgstr "Pakker" + +msgid "Network" +msgstr "Netværk" + +msgid "Locale" +msgstr "Lokalisering" + +msgid "Type" +msgstr "Type" + +msgid "This option enables the number of parallel downloads that can occur during package downloads" +msgstr "Denne indstilling aktiverer antallet af parallelle downloads under pakkehentning" + +msgid "" +"Enter the number of parallel downloads to be enabled.\n" +"\n" +"Note:\n" +msgstr "" +"Indtast antallet af parallelle downloads der skal aktiveres.\n" +"\n" +"Bemærk:\n" + +#, python-brace-format +msgid " - Maximum recommended value : {} ( Allows {} parallel downloads at a time )" +msgstr " - Maksimal anbefalet værdi : {} (tillader {} parallelle downloads ad gangen)" + +msgid " - Disable/Default : 0 ( Disables parallel downloading, allows only 1 download at a time )\n" +msgstr " - Deaktiver/standard : 0 (deaktiverer parallel download og tillader kun 1 download ad gangen)\n" + +msgid "Invalid input! Try again with a valid input [or 0 to disable]" +msgstr "Ugyldigt input! Prøv igen med et gyldigt input [eller 0 for at deaktivere]" + +msgid "Hyprland needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" +msgstr "Hyprland skal have adgang til dit seat (samling af hardwareenheder, dvs. tastatur, mus osv.)" + +msgid "" +"\n" +"\n" +"Choose an option to give Hyprland access to your hardware" +msgstr "" +"\n" +"\n" +"Vælg en mulighed for at give Hyprland adgang til din hardware" + +msgid "All entered values can be suffixed with a unit: %, B, KB, KiB, MB, MiB..." +msgstr "Alle indtastede værdier kan afsluttes med en enhed: %, B, KB, KiB, MB, MiB..." + +msgid "Would you like to use unified kernel images?" +msgstr "Vil du use unified kerne images?" + +msgid "Unified kernel images" +msgstr "Unified kerne images" + +msgid "Waiting for time sync (timedatectl show) to complete." +msgstr "Venter på at tidssynkronisering (timedatectl show) bliver fuldført." + +msgid "Time syncronization not completing, while you wait - check the docs for workarounds: https://archinstall.readthedocs.io/" +msgstr "Tidssynkronisering fuldføres ikke. Mens du venter, kan du se dokumentationen for løsninger: https://archinstall.readthedocs.io/" + +msgid "Skipping waiting for automatic time sync (this can cause issues if time is out of sync during installation)" +msgstr "Springer ventetid på automatisk tidssynkronisering over (det kan give problemer, hvis tiden ikke er synkroniseret under installationen)" + +msgid "Waiting for Arch Linux keyring sync (archlinux-keyring-wkd-sync) to complete." +msgstr "Venter på at Arch Linux-nøgleringssynkronisering (archlinux-keyring-wkd-sync) bliver fuldført." + +msgid "Selected profiles: " +msgstr "Vælged profils: " + +msgid "Time synchronization not completing, while you wait - check the docs for workarounds: https://archinstall.readthedocs.io/" +msgstr "Tidssynkronisering fuldføres ikke. Mens du venter, kan du se dokumentationen for løsninger: https://archinstall.readthedocs.io/" + +msgid "Mark/Unmark as nodatacow" +msgstr "Markér/fjern markering som nodatacow" + +msgid "Would you like to use compression or disable CoW?" +msgstr "Vil du use komprimering eller deaktivere CoW?" + +msgid "Use compression" +msgstr "Use komprimering" + +msgid "Disable Copy-on-Write" +msgstr "Deaktiver Copy-on-Write" + +msgid "Provides a selection of desktop environments and tiling window managers, e.g. GNOME, KDE Plasma, Sway" +msgstr "Giver et udvalg af skrivebordsmiljøer og flisebaserede vindueshåndterere, f.eks. GNOME, KDE Plasma, Sway" + +#, python-brace-format +msgid "Configuration type: {}" +msgstr "Konfiguration type: {}" + +msgid "LVM configuration type" +msgstr "LVM konfiguration type" + +msgid "LVM disk encryption with more than 2 partitions is currently not supported" +msgstr "LVM disk kryptering med mellere than 2 partitioner is aktuellely not suppellerted" + +msgid "Use NetworkManager (necessary to configure internet graphically in GNOME and KDE Plasma)" +msgstr "Brug NetworkManager (nødvendigt for at konfigurere internet grafisk i GNOME og KDE Plasma)" + +msgid "Select a LVM option" +msgstr "Vælg en LVM mulighed" + +msgid "Partitioning" +msgstr "Partitionering" + +msgid "Logical Volume Management (LVM)" +msgstr "Logisk diskenhedshåndtering (LVM)" + +msgid "Physical volumes" +msgstr "Fysiske diskenheder" + +msgid "Volumes" +msgstr "Diskenheder" + +msgid "LVM volumes" +msgstr "LVM-diskenheder" + +msgid "LVM volumes to be encrypted" +msgstr "LVM volumes skal være krypteret" + +msgid "Select which LVM volumes to encrypt" +msgstr "Vælg hvilke LVM-diskenheder der skal krypteres" + +msgid "Default layout" +msgstr "Standard layout" + +msgid "No Encryption" +msgstr "Ingen kryptering" + +msgid "LUKS" +msgstr "LUKS" + +msgid "LVM on LUKS" +msgstr "LVM på LUKS" + +msgid "LUKS on LVM" +msgstr "LUKS på LVM" + +msgid "Yes" +msgstr "Ja" + +msgid "No" +msgstr "Nej" + +msgid "Archinstall help" +msgstr "Archinstallere help" + +msgid " (default)" +msgstr " (standard)" + +msgid "Press Ctrl+h for help" +msgstr "Tryk Ctrl+h for hjælp" + +msgid "Choose an option to give Sway access to your hardware" +msgstr "Vælg en mulighed for at give Sway adgang til din hardware" + +msgid "Seat access" +msgstr "Seat-adgang" + +msgid "Mountpoint" +msgstr "Monteringspunkt" + +msgid "HSM" +msgstr "HSM" + +msgid "Enter disk encryption password (leave blank for no encryption)" +msgstr "Indtast adgangskode til diskkryptering (lad feltet være tomt for ingen kryptering)" + +msgid "Disk encryption password" +msgstr "Disk kryptering adgangskode" + +msgid "Partition - New" +msgstr "Partition - ny" + +msgid "Filesystem" +msgstr "Filsystem" + +msgid "Invalid size" +msgstr "Ugyldig størrelse" + +msgid "Start (default: sector {}): " +msgstr "Start (standard: secteller {}): " + +msgid "End (default: {}): " +msgstr "End (standard: {}): " + +msgid "Subvolume name" +msgstr "Subvolume navn" + +msgid "Disk configuration type" +msgstr "Disk konfiguration type" + +msgid "Root mount directory" +msgstr "Root-monteringsmappe" + +msgid "Select language" +msgstr "Vælg sprog" + +msgid "Write additional packages to install (space separated, leave blank to skip)" +msgstr "Skriv yderligere pakker der skal installeres (adskilt med mellemrum, lad feltet være tomt for at springe over)" + +msgid "Invalid download number" +msgstr "Ugyldigt downloadantal" + +msgid "Number downloads" +msgstr "Antal downloads" + +msgid "The username you entered is invalid" +msgstr "The brugernavn you entered is ingyldig" + +msgid "Username" +msgstr "Brugernavn" + +#, python-brace-format +msgid "Should \"{}\" be a superuser (sudo)?\n" +msgstr "Skal \"{}\" være superbruger (sudo)?\n" + +msgid "Interfaces" +msgstr "Grænseflader" + +msgid "You need to enter a valid IP in IP-config mode" +msgstr "Du skal indtaste en gyldig IP i IP-konfigurationstilstand" + +msgid "Modes" +msgstr "Tilstande" + +msgid "IP address" +msgstr "IP-adresse" + +msgid "Enter your gateway (router) IP address (leave blank for none)" +msgstr "Indtast IP-adressen på din gateway (router) (lad feltet være tomt for ingen)" + +msgid "Gateway address" +msgstr "Gateway-adresse" + +msgid "Enter your DNS servers with space separated (leave blank for none)" +msgstr "Indtast dine DNS-servere adskilt med mellemrum (lad feltet være tomt for ingen)" + +msgid "DNS servers" +msgstr "DNS-servere" + +msgid "Configure interfaces" +msgstr "Configure grænseflades" + +msgid "Kernel" +msgstr "Kerne" + +msgid "UEFI is not detected and some options are disabled" +msgstr "UEFI is not detected og some muligheds are deaktiveret" + +msgid "Info" +msgstr "Info" + +msgid "The proprietary Nvidia driver is not supported by Sway." +msgstr "The proprietary Nvidia drevr is not suppellerted by Sway." + +msgid "It is likely that you will run into issues, are you okay with that?" +msgstr "Du vil sandsynligvis støde på problemer. Er det i orden?" + +msgid "Main profile" +msgstr "Main profil" + +msgid "Confirm password" +msgstr "Confirm adgangskode" + +msgid "The confirmation password did not match, please try again" +msgstr "The confirmation adgangskode did not match, please try again" + +msgid "Not a valid directory" +msgstr "Not en gyldig mappe" + +msgid "Would you like to continue?" +msgstr "Vil du fellertsætte?" + +msgid "Directory" +msgstr "Mappe" + +msgid "Enter a directory for the configuration(s) to be saved (tab completion enabled)" +msgstr "Indtast en mappe hvor konfigurationen/konfigurationerne skal gemmes (tab-fuldførelse aktiveret)" + +#, python-brace-format +msgid "Do you want to save the configuration file(s) to {}?" +msgstr "Vil du gem konfiguration fil(s) to {}?" + +msgid "Enabled" +msgstr "Aktiveret" + +msgid "Disabled" +msgstr "Deaktiveret" + +msgid "Please submit this issue (and file) to https://github.com/archlinux/archinstall/issues" +msgstr "Indsend venligst denne fejl (og filen) til https://github.com/archlinux/archinstall/issues" + +msgid "Mirror name" +msgstr "Spejlnavn" + +msgid "Url" +msgstr "URL" + +msgid "Select signature check" +msgstr "Vælg signatur kontrol" + +msgid "Select execution mode" +msgstr "Vælg execution tilstand" + +msgid "Press ? for help" +msgstr "Tryk ? for hjælp" + +msgid "Choose an option to give Hyprland access to your hardware" +msgstr "Vælg en mulighed for at give Hyprland adgang til din hardware" + +msgid "Additional repositories" +msgstr "Yderligere pakkearkiver" + +msgid "NTP" +msgstr "NTP" + +msgid "Swap on zram" +msgstr "Swap på zram" + +msgid "Name" +msgstr "Navn" + +msgid "Signature check" +msgstr "Signaturkontrol" + +#, python-brace-format +msgid "Selected free space segment on device {}:" +msgstr "Vælged ledig plads segment on enhed {}:" + +#, python-brace-format +msgid "Size: {} / {}" +msgstr "Størrelse: {} / {}" + +#, python-brace-format +msgid "Size (default: {}): " +msgstr "Størrelse (standard: {}): " + +msgid "HSM device" +msgstr "HSM-enhed" + +msgid "Some packages could not be found in the repository" +msgstr "Nogle pakker kunne ikke findes i pakkearkivet" + +msgid "User" +msgstr "Bruger" + +msgid "The specified configuration will be applied" +msgstr "Den angivne konfiguration vil blive anvendt" + +msgid "Wipe" +msgstr "Slet" + +msgid "Mark/Unmark as XBOOTLDR" +msgstr "Markér/fjern markering som XBOOTLDR" + +msgid "Loading packages..." +msgstr "Indlæser pakker..." + +msgid "Select any packages from the below list that should be installed additionally" +msgstr "Vælg eventuelle pakker fra listen nedenfor som også skal installeres" + +msgid "Add a custom repository" +msgstr "Tilføj en brugerdefineret pakkearkiv" + +msgid "Change custom repository" +msgstr "Ændr brugerdefineret pakkearkiv" + +msgid "Delete custom repository" +msgstr "Slet brugerdefineret pakkearkiv" + +msgid "Repository name" +msgstr "Arkivnavn" + +msgid "Add a custom server" +msgstr "Tilføj en brugerdefineret server" + +msgid "Change custom server" +msgstr "Ændr brugerdefineret server" + +msgid "Delete custom server" +msgstr "Slet brugerdefineret server" + +msgid "Server url" +msgstr "Server-URL" + +msgid "Select regions" +msgstr "Vælg regioner" + +msgid "Add custom servers" +msgstr "Tilføj brugerdefineret servers" + +msgid "Add custom repository" +msgstr "Tilføj brugerdefineret pakkearkiv" + +msgid "Loading mirror regions..." +msgstr "Loading spejl regioner..." + +msgid "Mirrors and repositories" +msgstr "Mirrellers og pakkearkiver" + +msgid "Selected mirror regions" +msgstr "Vælged spejl regioner" + +msgid "Custom servers" +msgstr "Brugerdefinerede servere" + +msgid "Custom repositories" +msgstr "Brugerdefinerede pakkearkiver" + +msgid "Only ASCII characters are supported" +msgstr "Only ASCII characters are suppellerted" + +msgid "Show help" +msgstr "Vis hjælp" + +msgid "Exit help" +msgstr "Afslut hjælp" + +msgid "Preview scroll up" +msgstr "Forhåndsvisning rul op" + +msgid "Preview scroll down" +msgstr "Forhåndsvisning rul ned" + +msgid "Move up" +msgstr "Flyt op" + +msgid "Move down" +msgstr "Flyt ned" + +msgid "Move right" +msgstr "Flyt til højre" + +msgid "Move left" +msgstr "Flyt til venstre" + +msgid "Jump to entry" +msgstr "Hop til post" + +msgid "Skip selection (if available)" +msgstr "Spring over selection (if available)" + +msgid "Reset selection (if available)" +msgstr "Nulstil valg (hvis tilgængeligt)" + +msgid "Select on single select" +msgstr "Vælg on single select" + +msgid "Select on multi select" +msgstr "Vælg on multi select" + +msgid "Reset" +msgstr "Nulstil" + +msgid "Skip selection menu" +msgstr "Spring over selection menu" + +msgid "Start search mode" +msgstr "Start search tilstand" + +msgid "Exit search mode" +msgstr "Exit search tilstand" + +msgid "General" +msgstr "Generelt" + +msgid "Navigation" +msgstr "Navigation" + +msgid "Selection" +msgstr "Valg" + +msgid "Search" +msgstr "Søg" + +msgid "Down" +msgstr "Ned" + +msgid "Up" +msgstr "Op" + +msgid "Confirm" +msgstr "Bekræft" + +msgid "Focus right" +msgstr "Fokus til højre" + +msgid "Focus left" +msgstr "Fokus til venstre" + +msgid "Toggle" +msgstr "Slå til/fra" + +msgid "Show/Hide help" +msgstr "Vis/skjul hjælp" + +msgid "Quit" +msgstr "Afslut" + +msgid "First" +msgstr "Første" + +msgid "Last" +msgstr "Sidste" + +msgid "Select" +msgstr "Vælg" + +msgid "Page Up" +msgstr "Side op" + +msgid "Page Down" +msgstr "Side ned" + +msgid "Page up" +msgstr "Side op" + +msgid "Page down" +msgstr "Side ned" + +msgid "Page Left" +msgstr "Side venstre" + +msgid "Page Right" +msgstr "Side højre" + +msgid "Cursor up" +msgstr "Markør op" + +msgid "Cursor down" +msgstr "Markør ned" + +msgid "Cursor right" +msgstr "Markør højre" + +msgid "Cursor left" +msgstr "Markør venstre" + +msgid "Top" +msgstr "Top" + +msgid "Bottom" +msgstr "Bund" + +msgid "Home" +msgstr "Hjem" + +msgid "End" +msgstr "Slut" + +msgid "Toggle option" +msgstr "Toggle mulighed" + +msgid "Scroll Up" +msgstr "Rul op" + +msgid "Scroll Down" +msgstr "Rul ned" + +msgid "Scroll Left" +msgstr "Rul til venstre" + +msgid "Scroll Right" +msgstr "Rul til højre" + +msgid "Scroll Home" +msgstr "Rul til start" + +msgid "Scroll End" +msgstr "Rul til slut" + +msgid "Focus Next" +msgstr "Fokusér næste" + +msgid "Focus Previous" +msgstr "Fokusér forrige" + +msgid "Copy selected text" +msgstr "Kopiér markeret tekst" + +msgid "labwc needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" +msgstr "labwc skal have adgang til dit seat (samling af hardwareenheder, dvs. tastatur, mus osv.)" + +msgid "Choose an option to give labwc access to your hardware" +msgstr "Vælg en mulighed for at give labwc adgang til din hardware" + +msgid "niri needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" +msgstr "niri skal have adgang til dit seat (samling af hardwareenheder, dvs. tastatur, mus osv.)" + +msgid "Choose an option to give niri access to your hardware" +msgstr "Vælg en mulighed for at give niri adgang til din hardware" + +msgid "Mark/Unmark as ESP" +msgstr "Markér/fjern markering som ESP" + +msgid "Package group:" +msgstr "Pakkegruppe:" + +msgid "Exit archinstall" +msgstr "Afslut archinstall" + +msgid "Reboot system" +msgstr "Genstart systemet" + +msgid "chroot into installation for post-installation configurations" +msgstr "chroot ind i installationen for efterinstallationskonfiguration" + +msgid "Installation completed" +msgstr "Installationen er fuldført" + +msgid "What would you like to do next?" +msgstr "Hvad vil du gøre nu?" + +#, python-brace-format +msgid "Select which mode to configure for \"{}\"" +msgstr "Vælg hvilken tilstand der skal konfigureres for \"{}\"" + +msgid "Incorrect credentials file decryption password" +msgstr "Incellerrect credentials fil decryption adgangskode" + +msgid "Incorrect password" +msgstr "Incellerrect adgangskode" + +msgid "Credentials file decryption password" +msgstr "Credentials fil decryption adgangskode" + +msgid "Do you want to encrypt the user_credentials.json file?" +msgstr "Vil du encrypt bruger_credentials.json fil?" + +msgid "Credentials file encryption password" +msgstr "Credentials fil kryptering adgangskode" + +#, python-brace-format +msgid "Repositories: {}" +msgstr "Repositelleries: {}" + +msgid "New version available" +msgstr "Ny version tilgængelig" + +msgid "Passwordless login" +msgstr "Adgangskodeless login" + +msgid "Second factor login" +msgstr "Second facteller login" + +msgid "Bluetooth" +msgstr "Bluetooth" + +msgid "Would you like to configure Bluetooth?" +msgstr "Vil du configure Bluetooth?" + +msgid "Print service" +msgstr "Udskriftstjeneste" + +msgid "Would you like to configure the print service?" +msgstr "Vil du configure udskriftstjeneste?" + +msgid "Power management" +msgstr "Strømstyring" + +msgid "Authentication" +msgstr "Godkendelse" + +msgid "Applications" +msgstr "Programmer" + +msgid "U2F login method: " +msgstr "U2F-loginmetode: " + +msgid "Passwordless sudo: " +msgstr "Adgangskodeless sudo: " + +#, python-brace-format +msgid "Btrfs snapshot type: {}" +msgstr "Btrfs-snapshot-type: {}" + +msgid "Syncing the system..." +msgstr "Syncing system..." + +msgid "Value cannot be empty" +msgstr "Værdien må ikke være tom" + +msgid "Snapshot type" +msgstr "Snapshot-type" + +#, python-brace-format +msgid "Snapshot type: {}" +msgstr "Snapshot-type: {}" + +msgid "U2F login setup" +msgstr "Opsætning af U2F-login" + +msgid "No U2F devices found" +msgstr "No U2F enheds found" + +msgid "U2F Login Method" +msgstr "U2F-loginmetode" + +msgid "Enable passwordless sudo?" +msgstr "Enable adgangskodeless sudo?" + +#, python-brace-format +msgid "Setting up U2F device for user: {}" +msgstr "Sætter U2F-enhed op for bruger: {}" + +msgid "You may need to enter the PIN and then touch your U2F device to register it" +msgstr "Du skal muligvis indtaste PIN-koden og derefter røre ved din U2F-enhed for at registrere den" + +msgid "Starting device modifications in " +msgstr "Starting enhed modifications in " + +msgid "No network connection found" +msgstr "No netværk connection found" + +msgid "Would you like to connect to a Wifi?" +msgstr "Vil du oprette forbindelse til Wi-Fi?" + +msgid "No wifi interface found" +msgstr "No wifi grænseflade found" + +msgid "Select wifi network to connect to" +msgstr "Vælg det Wi-Fi-netværk der skal oprettes forbindelse til" + +msgid "Scanning wifi networks..." +msgstr "Scanning wifi netværks..." + +msgid "No wifi networks found" +msgstr "No wifi netværks found" + +msgid "Failed setting up wifi" +msgstr "Kunne ikke sætte wifi op" + +msgid "Enter wifi password" +msgstr "Indtast wifi adgangskode" + +msgid "Ok" +msgstr "OK" + +msgid "Removable" +msgstr "Flytbar" + +msgid "Install to removable location" +msgstr "Installer til flytbar placering" + +msgid "Will install to /EFI/BOOT/ (removable location)" +msgstr "Installerer til /EFI/BOOT/ (flytbar placering)" + +msgid "Will install to standard location with NVRAM entry" +msgstr "Installerer til standardplacering med NVRAM-post" + +msgid "Would you like to install the bootloader to the default removable media search location?" +msgstr "Vil du installere bootloaderen på standardplaceringen for søgning efter flytbare medier?" + +msgid "This installs the bootloader to /EFI/BOOT/BOOTX64.EFI (or similar) which is useful for:" +msgstr "Dette installerer bootloaderen til /EFI/BOOT/BOOTX64.EFI (eller tilsvarende), hvilket er nyttigt for:" + +msgid "USB drives or other portable external media." +msgstr "USB drevs eller other pellertable external media." + +msgid "Systems where you want the disk to be bootable on any computer." +msgstr "Systems where you want disk skal være bootbar on any computer." + +msgid "Firmware that does not properly support NVRAM boot entries." +msgstr "Firmware der ikke korrekt understøtter NVRAM-bootposter." + +msgid "Will install to /EFI/BOOT/ (removable location, safe default)" +msgstr "Installerer til /EFI/BOOT/ (flytbar placering, sikker standard)" + +msgid "Will install to custom location with NVRAM entry" +msgstr "Installerer til brugerdefineret placering med NVRAM-post" + +msgid "Firmware that does not properly support NVRAM boot entries like most MSI motherboards," +msgstr "Firmware der ikke korrekt understøtter NVRAM-bootposter, som de fleste MSI-bundkort," + +msgid "most Apple Macs, many laptops..." +msgstr "de fleste Apple Mac-computere, mange bærbare..." + +msgid "Language" +msgstr "Sprog" + +msgid "Compression algorithm" +msgstr "Komprimeringsalgoritme" + +msgid "Only packages such as base, sudo, linux, linux-firmware, efibootmgr and optional profile packages are installed." +msgstr "Only pakker such som base, sudo, linux, linux-firmware, efibootmgr og mulighedal profil pakker are installereed." + +msgid "Select zram compression algorithm:" +msgstr "Vælg zram komprimering algellerithm:" + +msgid "Use Network Manager (default backend)" +msgstr "Use Netværk Manager (standard backend)" + +msgid "Use Network Manager (iwd backend)" +msgstr "Use Netværk Manager (iwd backend)" + +msgid "Firewall" +msgstr "Firewall" + +msgid "Additional fonts" +msgstr "Yderligere skrifttyper" + +msgid "Select font packages to install" +msgstr "Vælg skrifttypepakker der skal installeres" + +msgid "Unicode font coverage for most languages" +msgstr "Unicode-skrifttypedækning for de fleste sprog" + +msgid "color emoji for browsers and apps" +msgstr "farveemoji til browsere og apps" + +msgid "Chinese, Japanese, Korean characters" +msgstr "Chinese, Japanese, Kellerean characters" + +msgid "Select audio configuration" +msgstr "Vælg lyd konfiguration" + +msgid "Enter credentials file decryption password" +msgstr "Indtast credentials fil decryption adgangskode" + +msgid "Enter root password" +msgstr "Indtast root-adgangskode" + +msgid "Select bootloader to install" +msgstr "Vælg bootloader der skal installeres" + +msgid "Configuration preview" +msgstr "Konfigurationsforhåndsvisning" + +msgid "Enter a directory for the configuration(s) to be saved" +msgstr "Indtast en mappe hvor konfigurationen/konfigurationerne skal gemmes" + +msgid "Select encryption type" +msgstr "Vælg kryptering type" + +msgid "Select disks for the installation" +msgstr "Vælg diske til installationen" + +msgid "Enter a mountpoint" +msgstr "Indtast en monteringspunkt" + +#, python-brace-format +msgid "Enter a size (default: {}): " +msgstr "Indtast en størrelse (standard: {}): " + +msgid "Enter subvolume name" +msgstr "Indtast underenhed navn" + +msgid "Enter subvolume mountpoint" +msgstr "Indtast underenhed monteringspunkt" + +msgid "Select a disk configuration" +msgstr "Vælg en disk konfiguration" + +msgid "Enter root mount directory" +msgstr "Indtast root montere mappe" + +msgid "You will use whatever drive-setup is mounted at the specified directory" +msgstr "You will use whatever drev-setup is montereed at specified mappe" + +msgid "WARNING: Archinstall won't check the suitability of this setup" +msgstr "ADVARSEL: Archinstall kontrollerer ikke om denne opsætning er egnet" + +msgid "Select main filesystem" +msgstr "Vælg main filsystem" + +msgid "Enter a hostname" +msgstr "Indtast en hostnavn" + +msgid "Select timezone" +msgstr "Vælg timezone" + +msgid "Enter the number of parallel downloads to be enabled" +msgstr "Indtast antallet af parallelle downloads der skal aktiveres" + +#, python-brace-format +msgid "Value must be between 1 and {}" +msgstr "Værdien skal være mellem 1 og {}" + +msgid "Select which kernel(s) to install" +msgstr "Vælg hvilke kerner der skal installeres" + +msgid "Enter a respository name" +msgstr "Indtast en respositellery navn" + +msgid "Enter the repository url" +msgstr "Indtast pakkearkiv url" + +msgid "Enter server url" +msgstr "Indtast server url" + +msgid "Select mirror regions to be enabled" +msgstr "Vælg spejl regioner skal være aktiveret" + +msgid "Select optional repositories to be enabled" +msgstr "Vælg mulighedal pakkearkiver skal være aktiveret" + +msgid "Select an interface" +msgstr "Vælg en grænseflade" + +msgid "Choose network configuration" +msgstr "Vælg netværk konfiguration" + +msgid "Recommended: Network Manager for desktop, Manual for server" +msgstr "Anbefalet: Network Manager til desktop, manuel til server" + +msgid "Warning: no network configuration selected. Network will need to be set up manually on the installed system." +msgstr "Advarsel: ingen netværkskonfiguration valgt. Netværket skal sættes op manuelt på det installerede system." + +msgid "No packages found" +msgstr "Ingen pakker fundet" + +msgid "Select which greeter to install" +msgstr "Vælg hvilken login-skærm der skal installeres" + +msgid "Select a profile type" +msgstr "Vælg en profil type" + +msgid "Enter new password" +msgstr "Indtast ny adgangskode" + +msgid "Enter a username" +msgstr "Indtast et brugernavn" + +msgid "Enter a password" +msgstr "Indtast en adgangskode" + +msgid "The password did not match, please try again" +msgstr "The adgangskode did not match, please try again" + +msgid "Password strength: Weak" +msgstr "Adgangskodestyrke: Svag" + +msgid "Password strength: Moderate" +msgstr "Adgangskodestyrke: Moderat" + +msgid "Password strength: Strong" +msgstr "Adgangskodestyrke: Stærk" + +msgid "The selected desktop profile requires a regular user to log in via the greeter" +msgstr "Den valgte skrivebordsprofil kræver en almindelig bruger for at logge ind via login-skærmen" + +#, python-brace-format +msgid "Environment type: {} {}" +msgstr "Miljøtype: {} {}" + +msgid "Input cannot be empty" +msgstr "Input må ikke være tomt" + +msgid "Recommended" +msgstr "Anbefalet" + +msgid "Package" +msgstr "Pakke" + +msgid "Curated selection of KDE Plasma packages" +msgstr "Kurateret udvalg af KDE Plasma-pakker" + +msgid "Dependencies" +msgstr "Afhængigheder" + +msgid "Package group" +msgstr "Pakkegruppe" + +msgid "Extensive KDE Plasma installation" +msgstr "Extensive KDE Plasma installereation" + +msgid "Packages in group" +msgstr "Pakker i gruppen" + +msgid "Minimal KDE Plasma installation" +msgstr "Minimal KDE Plasma installereation" + +msgid "Description" +msgstr "Beskrivelse" + +msgid "Select a flavor of KDE Plasma to install" +msgstr "Vælg hvilken variant af KDE Plasma der skal installeres" + +msgid "Arial/Times/Courier replacement, Cyrillic support for Steam/games" +msgstr "Erstatning for Arial/Times/Courier, kyrillisk understøttelse til Steam/spil" + +msgid "wide Unicode coverage, good fallback font" +msgstr "wide Unicode coverage, good fallback skrifttype" + +#, python-brace-format +msgid "Setting up U2F login: {u2f_config.u2f_login_method.value}" +msgstr "Sætter U2F-login op: {u2f_config.u2f_login_method.value}" + +#, python-brace-format +msgid "Default: {DEFAULT_ITER_TIME}ms, Recommended range: 1000-60000" +msgstr "Standard: {DEFAULT_ITER_TIME} ms, anbefalet område: 1000-60000" diff --git a/archinstall/locales/es/LC_MESSAGES/base.mo b/archinstall/locales/es/LC_MESSAGES/base.mo index 14e916ef..5701d454 100644 Binary files a/archinstall/locales/es/LC_MESSAGES/base.mo and b/archinstall/locales/es/LC_MESSAGES/base.mo differ diff --git a/archinstall/locales/es/LC_MESSAGES/base.po b/archinstall/locales/es/LC_MESSAGES/base.po index 1b52b4c0..d4300a4f 100644 --- a/archinstall/locales/es/LC_MESSAGES/base.po +++ b/archinstall/locales/es/LC_MESSAGES/base.po @@ -54,7 +54,7 @@ msgid "Only packages such as base, base-devel, linux, linux-firmware, efibootmgr msgstr "Solo paquetes como base, base-devel, linux, linux-firmware, efibootmgr y paquetes opcionales de perfil se instalan." msgid "Note: base-devel is no longer installed by default. Add it here if you need build tools." -msgstr "Nota: base-devel ya no viene instalado por defecto. Agreguelo aquí si necesita herramientas de build." +msgstr "Nota: base-devel ya no viene instalado por defecto. Agreguelo aquí si necesita herramientas de compilación." msgid "If you desire a web browser, such as firefox or chromium, you may specify it in the following prompt." msgstr "Si desea un navegador web, como firefox o chromium, puede especificarlo en el siguiente mensaje." @@ -173,7 +173,7 @@ msgid "Enter a desired filesystem type for the partition: " msgstr "Ingrese un tipo de sistema de archivos deseado para la partición: " msgid "Archinstall language" -msgstr "Idioma de Archinstall" +msgstr "Idioma de archinstall" msgid "Wipe all selected drives and use a best-effort default partition layout" msgstr "Borrar todas las unidades seleccionadas y usar un diseño de partición predeterminado de mejor esfuerzo" @@ -197,7 +197,7 @@ msgid "Select one or more hard drives to use and configure" msgstr "Seleccione uno o más discos duros para usar y configurar" msgid "For the best compatibility with your AMD hardware, you may want to use either the all open-source or AMD / ATI options." -msgstr "Para obtener la mejor compatibilidad con su hardware AMD, es posible que desee utilizar las opciones de código abierto o AMD / ATI." +msgstr "Para obtener la mejor compatibilidad con su hardware AMD, es posible que desee utilizar las opciones de código abierto o AMD/ATI." msgid "For the best compatibility with your Intel hardware, you may want to use either the all open-source or Intel options.\n" msgstr "Para obtener la mejor compatibilidad con su hardware Intel, es posible que desee utilizar las opciones de código abierto o de Intel.\n" @@ -218,7 +218,7 @@ msgid "All open-source (default)" msgstr "Todos de código abierto (predeterminado)" msgid "Choose which kernels to use or leave blank for default \"{}\"" -msgstr "Elija qué kernel usar o déjelo en blanco para usar el kernel \"{}\" predeterminado" +msgstr "Elija qué núcleo usar o deje en blanco para usar el núcleo \"{}\" predeterminado" msgid "Choose which locale language to use" msgstr "Elija qué idioma local usar" @@ -382,7 +382,7 @@ msgid "Create a required super-user with sudo privileges: " msgstr "Crear un super-usuario requerido con privilegios sudo: " msgid "Enter root password (leave blank to disable root): " -msgstr "Ingrese la contraseña de root (deje en blanco para deshabilitar root): " +msgstr "Ingrese la contraseña de root (deje en blanco para desactivar root): " msgid "Password for user \"{}\": " msgstr "Contraseña para el usuario “{}”: " @@ -454,7 +454,7 @@ msgid "Pre-existing pacman lock never exited. Please clean up any existing pacma msgstr "El bloqueo de pacman preexistente nunca se cerró. Limpie cualquier sesión de pacman existente antes de usar archinstall." msgid "Choose which optional additional repositories to enable" -msgstr "Elija qué repositorios adicionales opcionales habilitar" +msgstr "Elija qué repositorios adicionales opcionales activar" msgid "Add a user" msgstr "Añadir un usuario" @@ -489,7 +489,7 @@ msgid "No network configuration" msgstr "Sin configuración de red" msgid "Set desired subvolumes on a btrfs partition" -msgstr "Establecer los subvolúmenes deseados en una partición btrfs" +msgstr "Establecer los subvolúmenes deseados en una partición BTRFS" msgid "" "{}\n" @@ -501,7 +501,7 @@ msgstr "" "Seleccione en qué partición configurar los subvolúmenes" msgid "Manage btrfs subvolumes for current partition" -msgstr "Administrar subvolúmenes btrfs para la partición actual" +msgstr "Administrar subvolúmenes BTRFS para la partición actual" msgid "No configuration" msgstr "Sin configuración" @@ -650,7 +650,7 @@ msgid "Manual configuration" msgstr "Configuración manual" msgid "Mark/Unmark a partition as compressed (btrfs only)" -msgstr "Marcar/Desmarcar una partición como comprimida (solo btrfs)" +msgstr "Marcar/Desmarcar una partición como comprimida (solo BTRFS)" msgid "The password you are using seems to be weak, are you sure you want to use it?" msgstr "La contraseña que está utilizando parece ser débil, ¿está seguro de que desea usarla?" @@ -665,7 +665,7 @@ msgid "A very basic installation that allows you to customize Arch Linux as you msgstr "Una instalación muy básica que te permite personalizar Arch Linux como mejor te parezca." msgid "Provides a selection of various server packages to install and enable, e.g. httpd, nginx, mariadb" -msgstr "Proporciona una selección de varios paquetes de servidor para instalar y habilitar, p.e. httpd, nginx, mariadb" +msgstr "Proporciona una selección de varios paquetes de servidor para instalar y activar, p.ej. httpd, nginx, mariadb" msgid "Choose which servers to install, if none then a minimal installation will be done" msgstr "Elija qué servidores instalar, si no hay ninguno, se realizará una instalación mínima" @@ -799,29 +799,29 @@ msgid "Configured {} interfaces" msgstr "Interfaces {} configuradas" msgid "This option enables the number of parallel downloads that can occur during installation" -msgstr "Esta opción habilita la cantidad de descargas paralelas que pueden ocurrir durante la instalación" +msgstr "Esta opción activa la cantidad de descargas paralelas que pueden ocurrir durante la instalación" msgid "" "Enter the number of parallel downloads to be enabled.\n" " (Enter a value between 1 to {})\n" "Note:" msgstr "" -"Ingrese el número de descargas paralelas que se habilitarán.\n" +"Ingrese el número de descargas paralelas que se activarán.\n" " (Ingrese un valor entre 1 y {})\n" "Nota:" msgid " - Maximum value : {} ( Allows {} parallel downloads, allows {} downloads at a time )" -msgstr " - Valor máximo : {} ( Habilita {} descargas paralelas, permite {} descargas simultáneas )" +msgstr " - Valor máximo : {} (Permitir {} descargas paralelas, permite {} descargas simultáneas)" msgid " - Minimum value : 1 ( Allows 1 parallel download, allows 2 downloads at a time )" -msgstr " - Valor mínimo : 1 ( Habilita 1 descarga paralela, permite 2 descargas simultáneas )" +msgstr " - Valor mínimo : 1 (Permitir 1 descarga paralela, permite 2 descargas simultáneas)" msgid " - Disable/Default : 0 ( Disables parallel downloading, allows only 1 download at a time )" -msgstr " - Deshabilitar/Predeterminado : 0 ( Deshabilita la descarga paralela, permite solo 1 descarga simultánea )" +msgstr " - Desactivar/Predeterminado : 0 (Desactiva la descarga paralela, permite solo 1 descarga simultánea)" #, python-brace-format msgid "Invalid input! Try again with a valid input [1 to {max_downloads}, or 0 to disable]" -msgstr "¡Entrada no válida! Intente nuevamente con una entrada válida [1 a {max_downloads}, o 0 para deshabilitar]" +msgstr "¡Entrada no válida! Intente nuevamente con una entrada válida [1 a {max_downloads}, o 0 para desactivar]" msgid "Parallel Downloads" msgstr "Descargas paralelas" @@ -832,9 +832,9 @@ msgstr "Pacman" msgid "Color" msgstr "Color" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Enter the number of parallel downloads (1-{})" -msgstr "Ingrese el número de descargas paralelas que desea habilitar" +msgstr "Ingrese el número de descargas paralelas (1-{})" msgid "Enable colored output for pacman" msgstr "Activa salida a color para pacman" @@ -975,7 +975,7 @@ msgid "Higher values increase security but slow down boot time" msgstr "Valores más grandes mejoran la seguridad pero aumentan el tiempo de arranque" msgid "Default: 10000ms, Recommended range: 1000-60000" -msgstr "Por defecto: 10000ms, Rango recomendado 1000-60000" +msgstr "Predeterminado: 10000ms, Rango recomendado 1000-60000" msgid "Iteration time cannot be empty" msgstr "Tiempo de iteración no puede estar vacío" @@ -1073,10 +1073,10 @@ msgid "Packages to be install with this profile (space separated, leave blank to msgstr "Paquetes que se instalarán con este perfil (separados por espacios, déjelo en blanco para omitir): " msgid "Services to be enabled with this profile (space separated, leave blank to skip): " -msgstr "Servicios que se habilitarán con este perfil (separados por espacios, deje en blanco para omitir): " +msgstr "Servicios que se activarán con este perfil (separados por espacios, deje en blanco para omitir): " msgid "Should this profile be enabled for installation?" -msgstr "¿Debería habilitarse este perfil para la instalación?" +msgstr "¿Debería activarse este perfil para la instalación?" msgid "Create your own" msgstr "Crear tu propio" @@ -1158,7 +1158,7 @@ msgid "" "Enter a directory for the configuration(s) to be saved (tab completion enabled)\n" "Save directory: " msgstr "" -"Ingrese un directorio para guardar las configuraciones (completar con tabulación habilitado)\n" +"Ingrese un directorio para guardar las configuraciones (completar con tabulación activado)\n" "Guardar directorio: " msgid "" @@ -1180,10 +1180,10 @@ msgid "Mirror regions" msgstr "Regiones de espejos" msgid " - Maximum value : {} ( Allows {} parallel downloads, allows {max_downloads+1} downloads at a time )" -msgstr " - Valor máximo : {} ( Habilita {} descargas paralelas, permite {max_downloads+1} descargas simultáneas )" +msgstr " - Valor máximo : {} (Permitir {} descargas paralelas, permite {max_downloads+1} descargas simultáneas)" msgid "Invalid input! Try again with a valid input [1 to {}, or 0 to disable]" -msgstr "¡Entrada no válida! Intente nuevamente con una entrada válida [1 a {}, o 0 para deshabilitar]" +msgstr "¡Entrada no válida! Intente nuevamente con una entrada válida [1 a {}, o 0 para desactivar]" msgid "Locales" msgstr "Localidades" @@ -1226,26 +1226,26 @@ msgid "Type" msgstr "Tipo" msgid "This option enables the number of parallel downloads that can occur during package downloads" -msgstr "Esta opción habilita la cantidad de descargas paralelas que pueden ocurrir durante las descargas de paquetes" +msgstr "Esta opción activa la cantidad de descargas paralelas que pueden ocurrir durante las descargas de paquetes" msgid "" "Enter the number of parallel downloads to be enabled.\n" "\n" "Note:\n" msgstr "" -"Ingrese el número de descargas paralelas que se habilitarán.\n" +"Ingrese el número de descargas paralelas que se activarán.\n" "\n" "Nota:\n" #, python-brace-format msgid " - Maximum recommended value : {} ( Allows {} parallel downloads at a time )" -msgstr " - Valor máximo recomendado : {} ( Permite {} descargas paralelas simultáneas )" +msgstr " - Valor máximo recomendado : {} (Permite {} descargas paralelas simultáneas)" msgid " - Disable/Default : 0 ( Disables parallel downloading, allows only 1 download at a time )\n" -msgstr " - Deshabilitar/Predeterminado : 0 ( Deshabilita la descarga paralela, permite solo 1 descarga simultánea )\n" +msgstr " - Desactivar/Predeterminado : 0 (Desactiva la descarga paralela, permite solo 1 descarga simultánea)\n" msgid "Invalid input! Try again with a valid input [or 0 to disable]" -msgstr "¡Entrada no válida! Intente nuevamente con una entrada válida [o 0 para deshabilitar]" +msgstr "¡Entrada no válida! Intente nuevamente con una entrada válida [o 0 para desactivar]" msgid "Hyprland needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" msgstr "Hyprland necesita acceso a su asiento (colección de dispositivos de hardware, es decir, teclado, mouse, etc.)" @@ -1263,10 +1263,10 @@ msgid "All entered values can be suffixed with a unit: %, B, KB, KiB, MB, MiB... msgstr "Todos los valores introducidos pueden tener como sufijo una unidad: %, B, KB, KiB, MB, MiB..." msgid "Would you like to use unified kernel images?" -msgstr "¿Le gustaría utilizar imágenes del kernel unificadas?" +msgstr "¿Le gustaría utilizar imágenes del núcleo unificadas?" msgid "Unified kernel images" -msgstr "Imágenes del kernel unificadas" +msgstr "Imágenes del núcleo unificadas" msgid "Waiting for time sync (timedatectl show) to complete." msgstr "Esperando a que se complete la sincronización de la hora (timedatectl show)." @@ -1449,7 +1449,7 @@ msgid "Enter your gateway (router) IP address (leave blank for none)" msgstr "Ingrese la dirección IP de su puerta de enlace (enrutador) (deje en blanco si no hay ninguna)" msgid "Gateway address" -msgstr "Dirección de puerta de enlace" +msgstr "Dirección de la puerta de enlace" msgid "Enter your DNS servers with space separated (leave blank for none)" msgstr "Ingrese sus servidores DNS separados por espacios (deje en blanco si no hay ninguno)" @@ -1464,7 +1464,7 @@ msgid "Kernel" msgstr "Núcleo" msgid "UEFI is not detected and some options are disabled" -msgstr "No se detecta UEFI y algunas opciones están deshabilitadas" +msgstr "No se detecta UEFI y algunas opciones están desactivadas" msgid "Info" msgstr "Info" @@ -1494,17 +1494,17 @@ msgid "Directory" msgstr "Directorio" msgid "Enter a directory for the configuration(s) to be saved (tab completion enabled)" -msgstr "Ingrese un directorio para guardar las configuraciones (autocompletado de tabulación habilitado)" +msgstr "Ingrese un directorio para guardar las configuraciones (autocompletado de tabulación activado)" #, python-brace-format msgid "Do you want to save the configuration file(s) to {}?" msgstr "¿Desea guardar los archivos de configuración en {}?" msgid "Enabled" -msgstr "Habilitado" +msgstr "Activado" msgid "Disabled" -msgstr "Deshabilitado" +msgstr "Desactivado" msgid "Please submit this issue (and file) to https://github.com/archlinux/archinstall/issues" msgstr "Envíe este problema (y archivo) a https://github.com/archlinux/archinstall/issues" @@ -1683,13 +1683,11 @@ msgstr "Salir del modo de búsqueda" msgid "General" msgstr "General" -#, fuzzy msgid "Navigation" -msgstr "Guardar configuración" +msgstr "Navegación" -#, fuzzy msgid "Selection" -msgstr "Seleccione regiones" +msgstr "Selección" msgid "Search" msgstr "Buscar" @@ -1700,22 +1698,18 @@ msgstr "Abajo" msgid "Up" msgstr "Arriba" -#, fuzzy msgid "Confirm" -msgstr "Confirmar y salir" +msgstr "Confirmar" -#, fuzzy msgid "Focus right" -msgstr "Mover a la derecha" +msgstr "Enfocar a la derecha" -#, fuzzy msgid "Focus left" -msgstr "Mover a la izquierda" +msgstr "Enfocar a la izquierda" msgid "Toggle" msgstr "Alternar" -#, fuzzy msgid "Show/Hide help" msgstr "Mostrar/Ocultar ayuda" @@ -1728,45 +1722,38 @@ msgstr "Primero" msgid "Last" msgstr "Último" -#, fuzzy msgid "Select" -msgstr "Seleccione regiones" +msgstr "Seleccionar" msgid "Page Up" -msgstr "Subir" +msgstr "Subir página" msgid "Page Down" -msgstr "Bajar" +msgstr "Bajar página" -#, fuzzy msgid "Page up" -msgstr "Grupo de paquetes:" +msgstr "Subir página" -#, fuzzy msgid "Page down" -msgstr "Bajar" +msgstr "Bajar página" msgid "Page Left" -msgstr "Izquierda" +msgstr "Página izquierda" -#, fuzzy msgid "Page Right" -msgstr "Mover a la derecha" +msgstr "Página derecha" msgid "Cursor up" msgstr "Subir" -#, fuzzy msgid "Cursor down" -msgstr "Bajar" +msgstr "Cursor hacia abajo" -#, fuzzy msgid "Cursor right" -msgstr "Mover a la derecha" +msgstr "Cursor hacia la derecha" -#, fuzzy msgid "Cursor left" -msgstr "Mover a la izquierda" +msgstr "Cursor hacia la izquierda" msgid "Top" msgstr "Arriba" @@ -1777,38 +1764,35 @@ msgstr "Abajo" msgid "Home" msgstr "Inicio" -#, fuzzy msgid "End" -msgstr "Habilitado" +msgstr "Final" -#, fuzzy msgid "Toggle option" -msgstr "Opciones del subvolumen" +msgstr "Opción de alternancia" msgid "Scroll Up" msgstr "Mover Arriba" -#, fuzzy msgid "Scroll Down" -msgstr "Bajar en vista previa" +msgstr "Deslizar hacia abajo" msgid "Scroll Left" -msgstr "Mover Izquierda" +msgstr "Mover hacia la izquierda" msgid "Scroll Right" -msgstr "Mover Derecha" +msgstr "Mover hacia la derecha" msgid "Scroll Home" -msgstr "Ir a Inicio" +msgstr "Ir al Inicio" msgid "Scroll End" msgstr "Ir al Final" msgid "Focus Next" -msgstr "Centrar Siguiente" +msgstr "Enfocar a la siguiente" msgid "Focus Previous" -msgstr "Centrar Anterior" +msgstr "Enfocar a la anterior" msgid "Copy selected text" msgstr "Copiar texto seleccionado" @@ -1838,7 +1822,7 @@ msgid "Reboot system" msgstr "Reiniciar el sistema" msgid "chroot into installation for post-installation configurations" -msgstr "chroot en la instalación para configuraciones posteriores a la instalación" +msgstr "Hacer chroot en la instalación para configuraciones posteriores a la instalación" msgid "Installation completed" msgstr "Instalación completada" @@ -1907,7 +1891,7 @@ msgstr "Sudo sin contraseña: " #, python-brace-format msgid "Btrfs snapshot type: {}" -msgstr "Tipo de snapshot Btrfs: {}" +msgstr "Tipo de instantánea BTRFS: {}" msgid "Syncing the system..." msgstr "Sincronizando el sistema..." @@ -1932,7 +1916,7 @@ msgid "U2F Login Method" msgstr "Método de inicio de sesión U2F" msgid "Enable passwordless sudo?" -msgstr "Habilitar sudo sin contraseña?" +msgstr "¿Activar sudo sin contraseña?" #, python-brace-format msgid "Setting up U2F device for user: {}" @@ -1948,25 +1932,25 @@ msgid "No network connection found" msgstr "No se encontró una conección de red" msgid "Would you like to connect to a Wifi?" -msgstr "¿Desea conectarse a Wifi?" +msgstr "¿Desea conectarse al Wi-Fi?" msgid "No wifi interface found" -msgstr "No se encontró ninguna interfaz de wifi" +msgstr "No se encontró ninguna interfaz Wi-Fi" msgid "Select wifi network to connect to" -msgstr "Seleccione una red de wifi para conectarse" +msgstr "Seleccione una red Wi-Fi para conectarse" msgid "Scanning wifi networks..." -msgstr "Buscando redes de wifi..." +msgstr "Buscando redes Wi-Fi..." msgid "No wifi networks found" -msgstr "No se encontró redes de wifi" +msgstr "No se encontró redes Wi-Fi" msgid "Failed setting up wifi" -msgstr "Error configurando wifi" +msgstr "Error al configurar el Wi-Fi" msgid "Enter wifi password" -msgstr "Ingrese contraseña de wifi" +msgstr "Ingrese la contraseña del Wi-Fi" msgid "Ok" msgstr "Ok" @@ -2017,7 +2001,7 @@ msgid "Compression algorithm" msgstr "Algoritmo de compresión" msgid "Only packages such as base, sudo, linux, linux-firmware, efibootmgr and optional profile packages are installed." -msgstr "Solo paquetes como base, base-devel, linux, linux-firmware, efibootmgr y paquetes opcionales de perfil se instalan." +msgstr "Solo paquetes como base, sudo, linux, linux-firmware, efibootmgr y paquetes opcionales de perfil se instalan." msgid "Select zram compression algorithm:" msgstr "Seleccione algorimto de compresión zram:" @@ -2031,19 +2015,17 @@ msgstr "Usar gestor de Red (backend iwd)" msgid "Firewall" msgstr "Cortafuegos" -#, fuzzy msgid "Additional fonts" -msgstr "Repositorios adicionales" +msgstr "Fuentes adicionales" -#, fuzzy msgid "Select font packages to install" -msgstr "Seleccione el gestor de arranque que desea instalar" +msgstr "Seleccione los paquetes de fuentes que desea instalar" msgid "Unicode font coverage for most languages" msgstr "Fuente unicode cubierta para la mayoría de idiomas" msgid "color emoji for browsers and apps" -msgstr "Emoji de color para navegador y apps" +msgstr "Emoji de colores para navegadores y aplicaciones" msgid "Chinese, Japanese, Korean characters" msgstr "Carácteres Chino, Japonés, Koreano" @@ -2107,7 +2089,7 @@ msgid "Select timezone" msgstr "Seleccione una zona horaria" msgid "Enter the number of parallel downloads to be enabled" -msgstr "Ingrese el número de descargas paralelas que desea habilitar" +msgstr "Ingrese el número de descargas paralelas que desea activar" #, python-brace-format msgid "Value must be between 1 and {}" @@ -2126,10 +2108,10 @@ msgid "Enter server url" msgstr "Ingrese la URL del servidor" msgid "Select mirror regions to be enabled" -msgstr "Seleccione las regiones espejo que se habilitarán" +msgstr "Seleccione las regiones espejo que se activarán" msgid "Select optional repositories to be enabled" -msgstr "Seleccione repositorios opcionales para habilitar" +msgstr "Seleccione repositorios opcionales para activar" msgid "Select an interface" msgstr "Seleccione una interfaz" @@ -2170,20 +2152,18 @@ msgstr "Seguridad de la contraseña: Fuerte" msgid "The selected desktop profile requires a regular user to log in via the greeter" msgstr "El perfil de escritorio seleccionado requiere que un usuario estándar inicie sesión a través de la pantalla de bienvenida" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Environment type: {} {}" -msgstr "Tipo de entorno: {}" +msgstr "Tipo de entorno: {} {}" -#, fuzzy msgid "Input cannot be empty" -msgstr "El valor no puede estár vacío" +msgstr "La entrada no debe estar vacía" msgid "Recommended" msgstr "Recomendado" -#, fuzzy msgid "Package" -msgstr "Grupo de paquetes:" +msgstr "Paquete" msgid "Curated selection of KDE Plasma packages" msgstr "Selección curada de paquetes KDE Plasma" @@ -2191,41 +2171,37 @@ msgstr "Selección curada de paquetes KDE Plasma" msgid "Dependencies" msgstr "Dependencias" -#, fuzzy msgid "Package group" -msgstr "Grupo de paquetes:" +msgstr "Grupo de paquetes" msgid "Extensive KDE Plasma installation" msgstr "Instalación KDE Plasma Extensible" -#, fuzzy msgid "Packages in group" -msgstr "Grupo de paquetes:" +msgstr "Paquetes en grupo" msgid "Minimal KDE Plasma installation" msgstr "Instalación minima de KDE Plasma" -#, fuzzy msgid "Description" -msgstr "Cifrado de disco" +msgstr "Descripción" -#, fuzzy msgid "Select a flavor of KDE Plasma to install" -msgstr "Seleccione el gestor de arranque que desea instalar" +msgstr "Seleccione una variante de KDE Plasma para instalar" msgid "Arial/Times/Courier replacement, Cyrillic support for Steam/games" -msgstr "" +msgstr "Sustitución de Arial/Times/Courier, compatibilidad con caracteres cirílicos para Steam/juegos" msgid "wide Unicode coverage, good fallback font" -msgstr "" +msgstr "Amplia cobertura Unicode, buena fuente de reserva" #, python-brace-format msgid "Setting up U2F login: {u2f_config.u2f_login_method.value}" msgstr "Configurando Inicio U2F: {u2f_config.u2f_login_method.value}" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Default: {DEFAULT_ITER_TIME}ms, Recommended range: 1000-60000" -msgstr "Por defecto: {DEFAULT_ITER_TIME}ms, Rango recomendado 1000-60000" +msgstr "Predeterminado: {DEFAULT_ITER_TIME}ms, Rango recomendado: 1000-60000" #~ msgid "Add :" #~ msgstr "Añadir :" diff --git a/archinstall/locales/fi/LC_MESSAGES/base.mo b/archinstall/locales/fi/LC_MESSAGES/base.mo index f6edf647..287472f9 100644 Binary files a/archinstall/locales/fi/LC_MESSAGES/base.mo and b/archinstall/locales/fi/LC_MESSAGES/base.mo differ diff --git a/archinstall/locales/fi/LC_MESSAGES/base.po b/archinstall/locales/fi/LC_MESSAGES/base.po index 7651bb13..9534151e 100644 --- a/archinstall/locales/fi/LC_MESSAGES/base.po +++ b/archinstall/locales/fi/LC_MESSAGES/base.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" "PO-Revision-Date: \n" -"Last-Translator: Aleksi Puhakainen \n" +"Last-Translator: Aron R, Github aronmr-1\n" "Language-Team: \n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "Would you like to use swap on zram?" msgstr "Haluatko käyttää swap:ia zram:ssa?" msgid "Desired hostname for the installation: " -msgstr "Valitse hostname asennukselle: " +msgstr "Valitse isäntänimi asennukselle: " msgid "Username for required superuser with sudo privileges: " -msgstr "Käyttäjänimi superkäyttäjälle, jolla on sudo-oikeudet: " +msgstr "Käyttäjänimi pakolliselle superkäyttäjälle, jolla on sudo-oikeudet: " msgid "Any additional users to install (leave blank for no users): " msgstr "Muut asennettavat käyttäjät (jätä tyhjäksi, jos ei muita käyttäjiä): " @@ -55,7 +55,7 @@ msgid "Only packages such as base, base-devel, linux, linux-firmware, efibootmgr msgstr "Vain paketit, kuten base, base-devel, linux, linux-firmware, efibootmgr ja valinnaiset profiili-paketit, asennetaan." msgid "Note: base-devel is no longer installed by default. Add it here if you need build tools." -msgstr "" +msgstr "Huomio: base-devel ei enään asenneta oletuksena. Lisää se tähän jos tarvitset työkaluja pakettejen rakentamiseen" msgid "If you desire a web browser, such as firefox or chromium, you may specify it in the following prompt." msgstr "Jos haluat selaimen, kuten firefox tai chromium, voit valita sen seuraavassa kohdassa." @@ -67,7 +67,7 @@ msgid "Copy ISO network configuration to installation" msgstr "Kopioi ISO verkkoasetukset asennukseen" msgid "Use NetworkManager (necessary for configuring internet graphically in GNOME and KDE)" -msgstr "Käytä NetworkManager ohjelmaa (Internetin graafinen määritys GNOME ja KDE)" +msgstr "Käytä NetworkManager ohjelmaa (tarvitaan verkon graafiseen määritykseen GNOMEssa ja KDEssa)" msgid "Select one network interface to configure" msgstr "Valitse yksi määritettävä verkkoliitäntä" @@ -83,10 +83,10 @@ msgid "Enter your gateway (router) IP address or leave blank for none: " msgstr "Anna yhdyskäytävän (reitittimen) IP-osoite tai jätä tyhjäksi: " msgid "Enter your DNS servers (space separated, blank for none): " -msgstr "Anna DNS-osoitteet (välilyönti erottaa kaksi osoitetta toisistaan, tyhjä ei mitään): " +msgstr "Syötä nimipalvelimet (välilyönti erottaa kaksi osoitetta toisistaan, tyhjä ei mitään): " msgid "Select which filesystem your main partition should use" -msgstr "Valitse, mitä tiedostojärjestelmä pääosiolle" +msgstr "Valitse tiedostojärjestelmä pääosiolle" msgid "Current partition layout" msgstr "Tämänhetkinen osion asettelu" @@ -150,7 +150,7 @@ msgid "" msgstr "" "{}\n" "\n" -"Valitse, mikä osio merkitään salattavaksi" +"Valitse mikä osio merkitään salattavaksi" msgid "" "{}\n" @@ -159,8 +159,9 @@ msgid "" msgstr "" "{}\n" "\n" -"Valitse, mikä osio merkitään käynnistyväksi" +"Valitse mikä osio merkitään käynnistyväksi" +# unsure msgid "" "{}\n" "\n" @@ -168,7 +169,7 @@ msgid "" msgstr "" "{}\n" "\n" -"Valitse, mikä osio merkitään tiedostojärjestelmää varten" +"Valitse osio johon määrittää tiedostojärjestelmä" msgid "Enter a desired filesystem type for the partition: " msgstr "Anna osiolle haluttu tiedostojärjestelmän tyyppi: " @@ -176,14 +177,17 @@ msgstr "Anna osiolle haluttu tiedostojärjestelmän tyyppi: " msgid "Archinstall language" msgstr "Archinstall kieli" +# unsure msgid "Wipe all selected drives and use a best-effort default partition layout" -msgstr "Pyyhi kaikki valitut asemat ja käytä parasta mahdollista oletusosion asettelua" +msgstr "Pyyhi kaikki valitut asemat ja käytä automaattisen oletusosioinnin asettelua" +# unsure msgid "Select what to do with each individual drive (followed by partition usage)" -msgstr "Valitse, mitä tehdään kullekin yksittäiselle asemalle (ja osion käytölle)" +msgstr "Valitse mitä tehdään kullekin yksittäiselle asemalle (ja osion käytölle)" +# unsure msgid "Select what you wish to do with the selected block devices" -msgstr "Valitse, mitä haluat tehdä valituilla lohkoilla" +msgstr "Valitse mitä haluat tehdä valituilla massamuistilaitteilla" msgid "This is a list of pre-programmed profiles, they might make it easier to install things like desktop environments" msgstr "Tämä on lista valmiista profiileista, jotka saattavat helpottaa esimerkiksi työpöytäympäristön asentamista" @@ -197,6 +201,7 @@ msgstr "Valitse yksi alueista, joista paketit ladataan" msgid "Select one or more hard drives to use and configure" msgstr "Valitse yksi tai useampi kiintolevy käytettäväksi ja määritettäväksi" +# unsure msgid "For the best compatibility with your AMD hardware, you may want to use either the all open-source or AMD / ATI options." msgstr "Saat parhaan yhteensopivuuden AMD:n kanssa käyttämällä joko avoimen lähdekoodin vaihtoehtoja tai AMD/ATI valmistajan vaihtoehtoja." @@ -206,6 +211,7 @@ msgstr "Saat parhaan yhteensopivuuden Intelin kanssa käyttämällä joko avoime msgid "For the best compatibility with your Nvidia hardware, you may want to use the Nvidia proprietary driver.\n" msgstr "Saat parhaan yhteensopivuuden Nvidian kanssa käyttämällä Nvidia valmistajan omaa ohjainta.\n" +# unsure msgid "" "\n" "\n" @@ -213,31 +219,32 @@ msgid "" msgstr "" "\n" "\n" -"Valitse näytönohjaimen ohjain tai jätä tyhjäksi niin kaikki asennetaan avoimen lähdekoodin ohjaimilla" +"Valitse näytönohjaimen ohjain tai jätä tyhjäksi asentaaksesi ainoastaan avoimen lähdekoodin ajurit" +# unsure msgid "All open-source (default)" -msgstr "Kaikki avoimet lähdekoodit (oletus)" +msgstr "Kaikki avoimen lähdekoodina (oletus)" msgid "Choose which kernels to use or leave blank for default \"{}\"" -msgstr "Valitse käytettävät kernelit tai jätä tyhjäksi oletuksena \"{}\"" +msgstr "Valitse käytettävät ytimet (kernels) tai jätä tyhjäksi oletuksena \"{}\"" msgid "Choose which locale language to use" -msgstr "Valitse käytettävä kieli" +msgstr "Valitse käytettävä lokaalin (locale) kieli" msgid "Choose which locale encoding to use" -msgstr "Valitse käytettävä kielialueen koodaus" +msgstr "Valitse käytettävä lokaalin merkistö (locale encoding)" msgid "Select one of the values shown below: " msgstr "Valitse jokin alla olevista arvoista: " msgid "Select one or more of the options below: " -msgstr "Valitse yksi tai useampi alla olevista: " +msgstr "Valitse yksi tai useampi alla olevista vaihtoehdoista: " msgid "Adding partition...." msgstr "Lisätään osiota...." msgid "You need to enter a valid fs-type in order to continue. See `man parted` for valid fs-type's." -msgstr "Sinun on annettava kelvollinen fs-tyyppi jatkaaksesi. Katso kelvolliset fs-tyypit kohdasta \"man parted\"." +msgstr "Sinun on annettava kelvollinen tiedostojärjestelmän tyyppi jatkaaksesi. Katso kelvolliset tiedostojärjestelmän tyyppi kohdasta \"man parted\"." msgid "Error: Listing profiles on URL \"{}\" resulted in:" msgstr "Virhe: Profiilien luettelointi URL \"{}\" johti:" @@ -246,16 +253,19 @@ msgid "Error: Could not decode \"{}\" result as JSON:" msgstr "Virhe: Tulosta \"{}\" ei voitu purkaa JSON-muodossa:" msgid "Keyboard layout" -msgstr "Näppäimistö" +msgstr "Näppäimistön asettelu" msgid "Mirror region" -msgstr "Pakettivarasto" +msgstr "Peilin alue (mirror region)" msgid "Locale language" -msgstr "Kieli" +msgstr "Lokaalin kieli (locale)" msgid "Locale encoding" -msgstr "Kieli-koodaus" +msgstr "Lokaalin merkistö (encoding)" + +msgid "Console font" +msgstr "Päätteen kirjaintyyli" msgid "Drive(s)" msgstr "Levyasemat" @@ -273,10 +283,10 @@ msgid "Bootloader" msgstr "Käynnistyksenlataaja" msgid "Root password" -msgstr "Root salasana" +msgstr "Rootin salasana" msgid "Superuser account" -msgstr "Superkäyttäjätili" +msgstr "Superkäyttäjän tili" msgid "User account" msgstr "Käyttäjätili" @@ -285,10 +295,10 @@ msgid "Profile" msgstr "Profiili" msgid "Audio" -msgstr "Audio" +msgstr "Ääni" msgid "Kernels" -msgstr "Kernelit" +msgstr "Ytimet (kernels)" msgid "Additional packages" msgstr "Lisäpaketit" @@ -297,7 +307,7 @@ msgid "Network configuration" msgstr "Verkkoasetukset" msgid "Automatic time sync (NTP)" -msgstr "Autom. kellonajan synkronointi (NTP)" +msgstr "Automaattisen kellonajan synkronointi (NTP)" msgid "Install ({} config(s) missing)" msgstr "Asenna ({} asetusta puuttuu)" @@ -309,12 +319,12 @@ msgid "" "Do you wish to continue?" msgstr "" "Päätit ohittaa kiintolevyn valinnan ja käyttää\n" -"mitä tahansa asema-asetusta {} (kokeellinen)\n" +"mitä tahansa asema-asetusta joka on liitetty kohteessa {} (kokeellinen)\n" "VAROITUS: Archinstall ei voi tarkista asennuksen sopivuutta\n" "Haluatko jatkaa?" msgid "Re-using partition instance: {}" -msgstr "Käytetään osiointi esimerkkiä: {}" +msgstr "Uudelleenkäytetään osioinstanssia: {}" msgid "Create a new partition" msgstr "Luo uusi osio" @@ -329,13 +339,13 @@ msgid "Assign mount-point for a partition" msgstr "Määritä osion liitoskohta" msgid "Mark/Unmark a partition to be formatted (wipes data)" -msgstr "Merkitse/poista osion alustaminen (pyyhkii tiedot)" +msgstr "Lisää/poista osion merkkaus formatointia varten (pyyhkii tiedot)" msgid "Mark/Unmark a partition as encrypted" -msgstr "Merkitse/poista osio salataan merkintä" +msgstr "Lisää/poista osion merkkaus salatuksi (encrypted)" msgid "Mark/Unmark a partition as bootable (automatic for /boot)" -msgstr "Merkitse/poista osion merkintä käynnistyväksi (automaattinen /boot)" +msgstr "Lisää/poista osion merkintä käynnistyväksi (/boot merkitään käynnistyväksi automaattisesti)" msgid "Set desired filesystem for a partition" msgstr "Aseta osiolle haluttu tiedostojärjestelmä" @@ -344,10 +354,10 @@ msgid "Abort" msgstr "Keskeytä" msgid "Hostname" -msgstr "Hostname \"kone-nimi\"" +msgstr "Isäntänimi" msgid "Not configured, unavailable unless setup manually" -msgstr "Ei määritetty, ei käytettävissä, ellei asennusta ole käsin määritetty" +msgstr "Ei määritetty, käytettävissä ainoastaan jos asennus on käsin määritelty" msgid "Timezone" msgstr "Aikavyöhyke" @@ -366,7 +376,7 @@ msgstr "" "\n" msgid "Suggest partition layout" -msgstr "Ehdota osion asettelua" +msgstr "Ehdota osion asettelu" msgid "Enter a password: " msgstr "Anna salasana: " @@ -375,32 +385,32 @@ msgid "Enter a encryption password for {}" msgstr "Anna salauksen salasana {}" msgid "Enter disk encryption password (leave blank for no encryption): " -msgstr "Anna levyn salauksen salasana (jätä tyhjäksi, jos et salaa): " +msgstr "Anna levyn salauksen salasana (jätä tyhjäksi jos et salaa): " msgid "Create a required super-user with sudo privileges: " -msgstr "Luo vaadittu superkäyttäjä, jolla on sudo-oikeudet: " +msgstr "Luo vaadittu superkäyttäjä jolla on sudo-oikeudet: " msgid "Enter root password (leave blank to disable root): " -msgstr "Anna root-salasana (jätä tyhjäksi niin root poistetaan käytöstä): " +msgstr "Anna salasana rootille (jätä tyhjäksi niin root poistetaan käytöstä): " msgid "Password for user \"{}\": " msgstr "Salasana käyttäjälle \"{}\": " msgid "Verifying that additional packages exist (this might take a few seconds)" -msgstr "Varmistetaan, että lisäpaketit ovat olemassa (saattaa kestää muutaman sekunnin)" +msgstr "Varmistetaan että lisäpaketit ovat olemassa (saattaa kestää muutaman sekunnin)" msgid "Would you like to use automatic time synchronization (NTP) with the default time servers?\n" -msgstr "Haluatko käyttää automaattista ajan synkronointia oletus (NTP) aikapalvelinten kanssa?\n" +msgstr "Haluatko käyttää automaattista ajan synkronointia (NTP) oletusaikapalvelimien kanssa?\n" msgid "" "Hardware time and other post-configuration steps might be required in order for NTP to work.\n" "For more information, please check the Arch wiki" msgstr "" -"NTP:n toiminta saattaa vaatia laitteistolle muita määrityksen jälkeisiä vaiheita.\n" +"NTP:n toimiminen saattaa vaatia laitteiston muita määrityksen jälkeisiä vaiheita.\n" "Katso lisätietoja Arch-wiki" msgid "Enter a username to create an additional user (leave blank to skip): " -msgstr "Luo uusi käyttäjä antamalla käyttäjänimi (jätä tyhjäksi ja ohita): " +msgstr "Luo uusi käyttäjä antamalla käyttäjänimi (jätä tyhjäksi ohittaaksesi): " msgid "Use ESC to skip\n" msgstr "Ohita painamalla ESC\n" @@ -447,13 +457,13 @@ msgstr "" "Tämä on sinun valitsema kokoonpano:" msgid "Pacman is already running, waiting maximum 10 minutes for it to terminate." -msgstr "Pacman on jo käynnissä, odota enintään 10 minuuttia sen päättymistä." +msgstr "Pacman on jo käynnissä, odotetaan enintään 10 minuuttia sen päättymistä." msgid "Pre-existing pacman lock never exited. Please clean up any existing pacman sessions before using archinstall." -msgstr "Aiempi pacman-lukko ei ole poistunut. Lopeta kaikki olemassa olevat pacman-istunnot ennen archinstall ohjelman käyttöä." +msgstr "Aiempi pacman-lukko ei ole poistunut. Lopeta kaikki olemassa olevat pacman-istunnot ennen archinstallin käyttöä." msgid "Choose which optional additional repositories to enable" -msgstr "Valitse, valinnaiset lisävarastot jotka otetaan käyttöön" +msgstr "Valitse valinnaiset lisävarastot jotka otetaan käyttöön" msgid "Add a user" msgstr "Lisää käyttäjä" @@ -502,7 +512,7 @@ msgid "Manage btrfs subvolumes for current partition" msgstr "Hallitse nykyisen osion btrfs-alitaltioita" msgid "No configuration" -msgstr "Ei määritystä" +msgstr "Ei konfiguraatiota" msgid "Save user configuration" msgstr "Tallenna käyttäjän määritykset" @@ -517,10 +527,10 @@ msgid "Save all" msgstr "Tallenna kaikki" msgid "Choose which configuration to save" -msgstr "Valitse tallennettavat määritykset" +msgstr "Valitse tallennettavat konfiguraatiot" msgid "Enter a directory for the configuration(s) to be saved: " -msgstr "Anna hakemisto tallennettaville määrityksille: " +msgstr "Anna hakemisto konfiguraation tallentamista varten: " msgid "Not a valid directory: {}" msgstr "Hakemisto ei ole kelvollinen: {}" @@ -535,7 +545,7 @@ msgid "Optional repositories" msgstr "Valinnaiset arkistot" msgid "Save configuration" -msgstr "Tallenna määritykset" +msgstr "Tallenna konfiguraatio" msgid "Missing configurations:\n" msgstr "Puuttuvat määritykset:\n" @@ -572,7 +582,7 @@ msgid "Subvolume mountpoint" msgstr "Alitaltion liitoskohta" msgid "Subvolume options" -msgstr "Alitaltion valinnat" +msgstr "Alitaltion asetukset" msgid "Save" msgstr "Tallenna" @@ -587,29 +597,29 @@ msgid "Select the desired subvolume options " msgstr "Valitse alitaltion asetukset " msgid "Define users with sudo privilege, by username: " -msgstr "Määritä käyttäjät, joilla on sudo-oikeudet, käyttäjänimen mukaan: " +msgstr "Määritä sudo-oikeuksia omaavat käyttäjät käyttäjänimen mukaan: " #, python-brace-format msgid "[!] A log file has been created here: {}" msgstr "[!] Lokitiedosto on luotu tähän: {}" msgid "Would you like to use BTRFS subvolumes with a default structure?" -msgstr "Haluatko käyttää BTRFS-alitaltioita oletusrakenteena?" +msgstr "Haluatko käyttää BTRFS-alitaltioita oletusrakenteella?" msgid "Would you like to use BTRFS compression?" -msgstr "Haluatko käyttää BTRFS-pakkausta?" +msgstr "Haluatko käyttää BTRFS kompressiota?" msgid "Would you like to create a separate partition for /home?" -msgstr "Haluatko luoda erillisen osion /home ?" +msgstr "Haluatko luoda erillisen /home osion?" msgid "The selected drives do not have the minimum capacity required for an automatic suggestion\n" -msgstr "Valituilla asemilla ei ole automaattiseen ehdotukseen vaadittavaa vähimmäistilaa\n" +msgstr "Valituilla asemilla ei ole automaattiseen osiointiin vaadittavaa vähimmäistilaa\n" msgid "Minimum capacity for /home partition: {}GB\n" -msgstr "Minimi tila /home osiolle: {}GB\n" +msgstr "Pienin kapasiteetti /home osiolle: {}GB\n" msgid "Minimum capacity for Arch Linux partition: {}GB" -msgstr "Minimi tila Arch Linux osiolle: {}GB" +msgstr "Pienin kapasiteetti Arch Linux osiolle: {}GB" msgid "Continue" msgstr "Jatka" @@ -624,10 +634,10 @@ msgid "set: {}" msgstr "aseta: {}" msgid "Manual configuration setting must be a list" -msgstr "Manuaaliset asetukset on oltava lista muodossa" +msgstr "Manuaalinen konfiguraatio on oltava listan muodossa" msgid "No iface specified for manual configuration" -msgstr "Manuaalista määritystä varten iface on tekemättä" +msgstr "Manuaalista määritystä varten iface on valitsematta" msgid "Manual nic configuration with no auto DHCP requires an IP address" msgstr "Manuaalinen verkkokortin määritys ilman autom. DHCP:tä vaatii IP-osoitteen" @@ -645,7 +655,7 @@ msgid "Select interface to add" msgstr "Valitse lisättävä liitäntä" msgid "Manual configuration" -msgstr "Käsin määrittely" +msgstr "Manuaalinen konfiguraatio" msgid "Mark/Unmark a partition as compressed (btrfs only)" msgstr "Merkitse/poista osio pakatuksi (vain btrfs)" @@ -654,28 +664,28 @@ msgid "The password you are using seems to be weak, are you sure you want to use msgstr "Käyttämäsi salasana vaikuttaa heikolta, haluatko käyttää sitä?" msgid "Provides a selection of desktop environments and tiling window managers, e.g. gnome, kde, sway" -msgstr "Tarjoaa valikoiman erilaisia työpöytiä ja ikkunointia esim. gnome, kde, sway" +msgstr "Tarjoaa valikoiman erilaisia työpöytäympäristöjä ja ikkunaympäristöjä esim. gnome, kde, sway" msgid "Select your desired desktop environment" -msgstr "Valitse haluamasi työpöytä" +msgstr "Valitse haluamasi työpöytäympäristö" msgid "A very basic installation that allows you to customize Arch Linux as you see fit." -msgstr "Hyvin kevyt asennus, jonka avulla voit mukauttaa Arch Linuxia haluamallasi tavalla." +msgstr "Hyvin yksinkertainen asennus, jonka avulla voit mukauttaa Arch Linuxia haluamallasi tavalla." msgid "Provides a selection of various server packages to install and enable, e.g. httpd, nginx, mariadb" -msgstr "Tarjoaa valikoiman erilaisia palvelinpaketteja ja saatavilla käyttöön esim. httpd, nginx, mariadb" +msgstr "Tarjoaa valikoiman erilaisia palvelinpaketteja asennettavaksi ja aktivoitavaksi, esim. httpd, nginx, mariadb" msgid "Choose which servers to install, if none then a minimal installation will be done" -msgstr "Valitse mitkä palvelimet asennetaan. Jos ei yhtään, tehdään pienin mahdollinen asennus" +msgstr "Valitse mitkä palvelimet asennetaan. Tyhjä valikoima asentaa minimaalisen asennuksen" msgid "Installs a minimal system as well as xorg and graphics drivers." -msgstr "Asentaa minimaalisen järjestelmän sekä xorg ja ohjaimet näytönohjaimelle." +msgstr "Asentaa minimaalisen järjestelmän sekä xorgin ja näytönohjaimen ajurit." msgid "Press Enter to continue." msgstr "Paina ENTER ja jatka." msgid "Would you like to chroot into the newly created installation and perform post-installation configuration?" -msgstr "Haluatko chroot:in uuteen asennukseen ja suorittaa asennuksen jälkeiset asetukset?" +msgstr "Haluatko liittyyä uuteen asennukseen chroot-tilassa ja suorittaa asennuksen jälkeinen konfigurointi?" msgid "Are you sure you want to reset this setting?" msgstr "Haluatko varmasti nollata tämän asetuksen?" @@ -687,7 +697,7 @@ msgid "Any modifications to the existing setting will reset the disk layout!" msgstr "Kaikki muutokset olemassa olevaan asetukseen nollaavat levyasettelun!" msgid "If you reset the harddrive selection this will also reset the current disk layout. Are you sure?" -msgstr "Jos nollaat kiintolevyn valinnan, tämä nollaa myös nykyisen levyasettelun. Oletko varma?" +msgstr "Jos nollaat kiintolevyn valinnan tämä nollaa myös nykyisen levyasettelun. Oletko varma?" msgid "Save and exit" msgstr "Tallenna ja poistu" @@ -716,7 +726,7 @@ msgstr "" "\n" msgid "Copy to: " -msgstr "Kopioi…: " +msgstr "Kopioi kohteeseen: " msgid "Edit: " msgstr "Muokkaa: " @@ -734,7 +744,7 @@ msgid "Value: " msgstr "Arvo: " msgid "You can skip selecting a drive and partitioning and use whatever drive-setup is mounted at /mnt (experimental)" -msgstr "Voit ohittaa aseman valinnan, sekä osioinnin ja käyttää mitä tahansa asemaa, joka on kytketty /mnt hakemistossa (kokeellinen)" +msgstr "Voit ohittaa aseman valinnan sekä osioinnin ja käyttää /mnt hakemistoon kytkettyä aseman asetusta (kokeellinen)" msgid "Select one of the disks or skip and use /mnt as default" msgstr "Valitse jokin levyistä tai ohita ja käytä /mnt oletuksena" @@ -797,7 +807,7 @@ msgid "Configured {} interfaces" msgstr "Määritetty {} liittymää" msgid "This option enables the number of parallel downloads that can occur during installation" -msgstr "Tämä valinta mahdollistaa asennuksen aikana tapahtuvien rinnakkaisten latausten määrän" +msgstr "Tämä valinta määrittää asennuksen aikana tapahtuvien rinnakkaisten latausten määrän" msgid "" "Enter the number of parallel downloads to be enabled.\n" @@ -819,47 +829,44 @@ msgstr " - Pois/oletus : 0 ( ei salli rinnakkaisia latauksia, sallii vain 1 la #, python-brace-format msgid "Invalid input! Try again with a valid input [1 to {max_downloads}, or 0 to disable]" -msgstr "Virheellinen arvo! Yritä uudelleen kelvollisella arvolla [1 - {max_downloads}, tai 0 on poistettu]" +msgstr "Virheellinen arvo! Yritä uudelleen kelvollisella arvolla [1 - {max_downloads}, tai 0 kytkeäksi pois päältä]" msgid "Parallel Downloads" msgstr "Rinnakkaiset lataukset" msgid "Pacman" -msgstr "" +msgstr "Pacman" msgid "Color" -msgstr "" +msgstr "Väri" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Enter the number of parallel downloads (1-{})" -msgstr "" -"Anna rinnakkaisten latausten määrä.\n" -"\n" -"Huomaa:\n" +msgstr "Anna rinnakkaisten latausten määrä (1-{})" msgid "Enable colored output for pacman" -msgstr "" +msgstr "Aktivoi värillinen ulostulo pacman:ille" msgid "ESC to skip" msgstr "Ohita painamalla ESC" msgid "CTRL+C to reset" -msgstr "CTRL+C nollaa" +msgstr "CTRL+C nollaaksesi" msgid "TAB to select" msgstr "TAB valitsee" msgid "[Default value: 0] > " -msgstr "[oletusarvo: 0] > " +msgstr "[Oletusarvo: 0] > " msgid "To be able to use this translation, please install a font manually that supports the language." -msgstr "Jotta voit käyttää tätä käännöstä, asenna käsin fontti, joka tukee tätä kieltä." +msgstr "Jotta voit käyttää tätä käännöstä, asenna kieltä tukeva fontti manuaalisesti" msgid "The font should be stored as {}" msgstr "Fontti tulee tallentaa {}" msgid "Archinstall requires root privileges to run. See --help for more." -msgstr "Archinstall vaatii toimiakseen root oikeudet. Katso --help ja saat lisätietoja." +msgstr "Archinstall vaatii rootin oikeudet toimiakseen. Katso --help ja saat lisätietoja." msgid "Select an execution mode" msgstr "Valitse suoritustila" @@ -870,7 +877,7 @@ msgstr "Profiilia ei voi hakea määritetystä URL-osoitteesta: {}" #, python-brace-format msgid "Profiles must have unique name, but profile definitions with duplicate name found: {}" -msgstr "Profiilin nimi on oltava yksilöllinen, mutta määrityksistä löytyy päällekkäinen nimi: {}" +msgstr "Profiilin nimi on oltava yksilöllinen, mutta profiilien määrityksistä löytyy päällekkäinen nimi: {}" msgid "Select one or more devices to use and configure" msgstr "Valitse yksi tai useampi laite määritettäväksi" @@ -885,18 +892,18 @@ msgid "Select a partitioning option" msgstr "Valitse osiointivaihtoehto" msgid "Enter the root directory of the mounted devices: " -msgstr "Anna root hahemisto liitetylle laitteelle: " +msgstr "Anna root hakemisto liitetylle laitteelle: " #, python-brace-format msgid "Minimum capacity for /home partition: {}GiB\n" -msgstr "Minimi tila /home osiolle: {}GiB\n" +msgstr "Minimi kapasiteetti /home osiolle: {}GiB\n" #, python-brace-format msgid "Minimum capacity for Arch Linux partition: {}GiB" msgstr "Minimi tila Arch Linux osiolle: {}GiB" msgid "This is a list of pre-programmed profiles_bck, they might make it easier to install things like desktop environments" -msgstr "Lista esiohjelmoiduista profiles_bck paketeista, joka voivat helpottaa asioita, kuten työpöydän asentamista" +msgstr "Tämä on lista esiohjelmoiduista profiles_bck instansseista, jotka voivat helpottaa työpöydäympäristön asentamista tai vastaavaa" msgid "Current profile selection" msgstr "Nykyinen profiilivalinta" @@ -967,34 +974,34 @@ msgid "Encryption type" msgstr "Salaustyyppi" msgid "Iteration time" -msgstr "" +msgstr "Iteraatioaika" msgid "Enter iteration time for LUKS encryption (in milliseconds)" -msgstr "" +msgstr "Anna iteraatioaika LUKS salaukselle (millisekunneissa)" msgid "Higher values increase security but slow down boot time" -msgstr "" +msgstr "Suuremmat arvot parantavat tietosuojaa mutta hidastavat käynnistysaikaa" msgid "Default: 10000ms, Recommended range: 1000-60000" -msgstr "" +msgstr "Oletusarvo: 10000ms, suositeltu 1000-60000ms" msgid "Iteration time cannot be empty" -msgstr "" +msgstr "Iteraatioaika ei voi olla tyhjä" msgid "Iteration time must be at least 100ms" -msgstr "" +msgstr "Iteraatioajan on oltava ainakin 100ms" msgid "Iteration time must be at most 120000ms" -msgstr "" +msgstr "Iteraatioaika saa olla enintään 120000ms" msgid "Please enter a valid number" -msgstr "" +msgstr "Ole hyvä ja syötä kelpaava numero" msgid "Partitions" msgstr "Osiot" msgid "No HSM devices available" -msgstr "Ei HSM-laitteita saatavilla" +msgstr "HSM-laitteita ei saatavilla" msgid "Partitions to be encrypted" msgstr "Salattavat osiot" @@ -1006,7 +1013,7 @@ msgid "Select a FIDO2 device to use for HSM" msgstr "Valitse HSM:ään käytettävä FIDO2-laite" msgid "Use a best-effort default partition layout" -msgstr "Käytä parasta mahdollista oletusosion asettelua" +msgstr "Käytä parhaan edellytyksen oletusosioinnin asettelua" msgid "Manual Partitioning" msgstr "Osiointi käsin" @@ -1043,14 +1050,14 @@ msgid "Back" msgstr "Takaisin" msgid "Please chose which greeter to install for the chosen profiles: {}" -msgstr "Valitse asennettava käyttöliittymä valituille profiileille: {}" +msgstr "Valitse asennettava tervehtijä valituille profiileille: {}" #, python-brace-format msgid "Environment type: {}" msgstr "Ympäristötyyppi: {}" msgid "The proprietary Nvidia driver is not supported by Sway. It is likely that you will run into issues, are you okay with that?" -msgstr "Sway ei tue patentoitua Nvidia-ohjainta. Todennäköistä, että kohtaat joitain ongelmia, kelpaako se silti sinulle?" +msgstr "Sway ei tue patentoitua Nvidia-ohjainta. On todennäköistä että kohtaat joitain ongelmia, kelpaako se silti sinulle?" msgid "Installed packages" msgstr "Asennetut paketit" @@ -1087,7 +1094,7 @@ msgid "" "Select a graphics driver or leave blank to install all open-source drivers" msgstr "" "\n" -"Valitse näytönohjaimen ohjain tai jätä tyhjäksi niin kaikki asennetaan avoimen lähdekoodin ohjaimilla" +"Valitse näytönohjaimen ajuri tai jätä tyhjäksi asentaaksesi ainoastaan kaikki avoimen lähdekoodin ajurit" msgid "Sway needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" msgstr "Sway tarvitsee pääsyn istuntoon (kokoelma laitteistoja, kuten näppäimistö, hiiri jne.)" @@ -1102,13 +1109,13 @@ msgstr "" "Valitse asetus antaaksesi Swaylle pääsyn laitteistoosi" msgid "Graphics driver" -msgstr "Näytönohjaimen ohjain" +msgstr "Näytönohjaimen ajuri" msgid "Greeter" -msgstr "Käyttöliittymä" +msgstr "Tervehtijä" msgid "Please chose which greeter to install" -msgstr "Valitse asennettava käyttöliittymä" +msgstr "Valitse asennettava tervehtijä" msgid "This is a list of pre-programmed default_profiles" msgstr "Tämä on lista esiohjelmoiduista default_profiles" @@ -1120,25 +1127,25 @@ msgid "Profiles" msgstr "Profiilit" msgid "Finding possible directories to save configuration files ..." -msgstr "Etsitään hakemistoja asetustiedostojen tallentamiseen ..." +msgstr "Etsitään mahdollisia hakemistoja asetustiedostojen tallentamiseen ..." msgid "Select directory (or directories) for saving configuration files" msgstr "Valitse hakemisto (tai hakemistot) asetustiedostojen tallentamiseen" msgid "Add a custom mirror" -msgstr "Lisää mukautettu peilipaikka" +msgstr "Lisää mukautettu peili" msgid "Change custom mirror" -msgstr "Vaihda mukautettu peilipaikka" +msgstr "Vaihda mukautettu peili" msgid "Delete custom mirror" -msgstr "Poista mukautettu peilipaikka" +msgstr "Poista mukautettu peili" msgid "Enter name (leave blank to skip): " -msgstr "Anna nimi (jätä tyhjäksi ja ohita): " +msgstr "Anna nimi (jätä tyhjäksi ohittaaksesi): " msgid "Enter url (leave blank to skip): " -msgstr "Anna url (jätä tyhjäksi ja ohita): " +msgstr "Anna url (jätä tyhjäksi ohittaaksesi): " msgid "Select signature check option" msgstr "Valitse allekirjoituksen tarkistusvaihtoehto" @@ -1147,19 +1154,19 @@ msgid "Select signature option" msgstr "Valitse allekirjoituksen asetus" msgid "Custom mirrors" -msgstr "Mukautetut peilipaikat" +msgstr "Mukautetut peilit" msgid "Defined" msgstr "Määritelty" msgid "Save user configuration (including disk layout)" -msgstr "Tallenna käyttäjän asetukset (myös levyasettelu)" +msgstr "Tallenna käyttäjän asetukset (sisältäen levyasettelun)" msgid "" "Enter a directory for the configuration(s) to be saved (tab completion enabled)\n" "Save directory: " msgstr "" -"Anna hakemisto tallennettaville määrityksille (välilehden viimeistely käytössä)\n" +"Anna hakemisto konfiguraation(oiden) tallentamista varten (tab-viimeistely käytössä)\n" "Tallennushakemisto: " msgid "" @@ -1167,30 +1174,30 @@ msgid "" "\n" "{}" msgstr "" -"Haluatko tallentaa {} asetustiedostoa seuraavaan paikkaan?\n" +"Haluatko tallentaa {} asennustiedostot seuraavaan paikkaan?\n" "\n" "{}" msgid "Saving {} configuration files to {}" -msgstr "Tallennetaan {} määritystiedostoa {}" +msgstr "Tallennetaan {} konfiguraatiotiedostot kohteeseen {}" msgid "Mirrors" -msgstr "Peilipaikat" +msgstr "Peilit" msgid "Mirror regions" -msgstr "Peilipaikan maa" +msgstr "Peilin maa" msgid " - Maximum value : {} ( Allows {} parallel downloads, allows {max_downloads+1} downloads at a time )" msgstr " - Suurin arvo : {} ( sallii {} rinnakkaista latausta, sallii {max_downloads+1} latausta kerralla )" msgid "Invalid input! Try again with a valid input [1 to {}, or 0 to disable]" -msgstr "Virheellinen arvo! Yritä uudelleen kelvollisella arvolla [1 - {}, tai 0 on poistettu]" +msgstr "Virheellinen arvo! Yritä uudelleen kelvollisella arvolla [1 - {}, 0 vastaa pois päältä]" msgid "Locales" msgstr "Alueet" msgid "Use NetworkManager (necessary to configure internet graphically in GNOME and KDE)" -msgstr "Käytä NetworkManager -ohjelmaa (Internetin määritys graafisesti GNOME ja KDE)" +msgstr "Käytä NetworkManager (Internetin määritys graafisesti GNOMEssa ja KDEssa)" msgid "Total: {} / {}" msgstr "Yhteensä: {} / {}" @@ -1199,7 +1206,7 @@ msgid "All entered values can be suffixed with a unit: B, KB, KiB, MB, MiB..." msgstr "Kaikki annetut arvot voidaan liittää käyttäen yksikköjä: B, KB, KiB, MB, MiB..." msgid "If no unit is provided, the value is interpreted as sectors" -msgstr "Jos yksikköä ei ole annettu, arvo tulkitaan sektoreiksi" +msgstr "Jos yksikköä ei ole annettu, arvo tulkitaan sektoreina" msgid "Enter start (default: sector {}): " msgstr "Anna alku (oletus: sektori {}): " @@ -1208,7 +1215,7 @@ msgid "Enter end (default: {}): " msgstr "Anna loppu (oletus: {}): " msgid "Unable to determine fido2 devices. Is libfido2 installed?" -msgstr "Fido2-laitteita ei voida määrittää. Onko libfido2 asennettu?" +msgstr "Fido2-laitteita ei voitu määrittää. Onko libfido2 asennettu?" msgid "Path" msgstr "Polku" @@ -1223,6 +1230,21 @@ msgstr "Tuote" msgid "Invalid configuration: {error}" msgstr "Virheellinen määritys: {error}" +msgid "Ready to install" +msgstr "Valmis asentamaan" + +msgid "Disks" +msgstr "Levyasemat" + +msgid "Packages" +msgstr "Määritetty {} liittymää" + +msgid "Network" +msgstr "Verkko" + +msgid "Locale" +msgstr "Alueet" + msgid "Type" msgstr "Tyyppi" @@ -1263,209 +1285,182 @@ msgstr "" msgid "All entered values can be suffixed with a unit: %, B, KB, KiB, MB, MiB..." msgstr "Kaikki annetut arvot voidaan liittää käyttäen yksikköjä: B, KB, KiB, MB, MiB..." +# unsure msgid "Would you like to use unified kernel images?" -msgstr "Haluatko käyttää Unified Kernel Images, joka voidaan käynnistää suoraan UEFI-ohjelmistosta?" +msgstr "Haluatko käyttää unified kernel images?" +# unsure msgid "Unified kernel images" -msgstr "UKI Unified Kernel Images" +msgstr "Unified Kernel Images" msgid "Waiting for time sync (timedatectl show) to complete." -msgstr "Odotetaan ajan synkronoinnin (timedatectl show) päättymistä." +msgstr "Odotetaan ajan synkronointia (timedatectl show) päättymistä." msgid "Time syncronization not completing, while you wait - check the docs for workarounds: https://archinstall.readthedocs.io/" -msgstr "Ajan synkronointi ei ole valmis, kun odotat voit tarkistaa kiertotapoja: https://archinstall.readthedocs.io/" +msgstr "Ajan synkronointi ei ole valmis, odottaessasi voit tarkistaa kiertotapoja: https://archinstall.readthedocs.io/" msgid "Skipping waiting for automatic time sync (this can cause issues if time is out of sync during installation)" -msgstr "Autom. ajan synkronoinnin odottaminen ohitetaan (voi aiheuttaa ongelmia, jos aikaa ei ole synkronoitu asennuksen aikana)" +msgstr "Ohitetaan autom. ajan synkronoinnin (voi aiheuttaa ongelmia, jos aika ei ole synkronoitu asennuksen aikana)" msgid "Waiting for Arch Linux keyring sync (archlinux-keyring-wkd-sync) to complete." -msgstr "Odotetaan Arch Linux avainten synkronoinnin valmistumista (archlinux-keyring-wkd-sync)." +msgstr "Odotetaan Arch Linux avaimien synkronointia (archlinux-keyring-wkd-sync)." msgid "Selected profiles: " msgstr "Valitut profiilit: " msgid "Time synchronization not completing, while you wait - check the docs for workarounds: https://archinstall.readthedocs.io/" -msgstr "Ajan synkronointi ei ole valmis, kun odotat voit tarkistaa kiertotapoja: https://archinstall.readthedocs.io/" +msgstr "Ajan synkronointi ei ole valmistumassa, odottaessasi voit tarkistaa kiertotapoja: https://archinstall.readthedocs.io/" msgid "Mark/Unmark as nodatacow" -msgstr "Merkitse/poista nodatacow merkintä" +msgstr "Lisää/poista nodatacow merkintä" msgid "Would you like to use compression or disable CoW?" -msgstr "Haluatko käyttää pakkausta vai poistaa CoW:n käytöstä?" +msgstr "Haluatko käyttää kompressiota vai poistaa CoW:n käytöstä?" msgid "Use compression" -msgstr "Käytä pakkausta" +msgstr "Käytä kompressiota" msgid "Disable Copy-on-Write" msgstr "Poista kopiointi kirjoittamisen yhteydessä" -#, fuzzy msgid "Provides a selection of desktop environments and tiling window managers, e.g. GNOME, KDE Plasma, Sway" -msgstr "Tarjoaa valikoiman erilaisia työpöytiä ja ikkunointia esim. gnome, kde, sway" +msgstr "Tarjoaa valikoiman erilaisia työpöytäympäristöjä ja järjesteleviä ikkunaympäristöjä esim. gnome, kde, sway" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Configuration type: {}" -msgstr "Asetukset" +msgstr "Konfiguraation tyyppi: {}" -#, fuzzy msgid "LVM configuration type" -msgstr "Ei määritystä" +msgstr "LVM konfiguraation tyyppi" msgid "LVM disk encryption with more than 2 partitions is currently not supported" -msgstr "" +msgstr "LVM levyaseman salaus enemmällä kuin kahdella osiolla ei ole tällä hetkellä tuettu" -#, fuzzy msgid "Use NetworkManager (necessary to configure internet graphically in GNOME and KDE Plasma)" -msgstr "Käytä NetworkManager -ohjelmaa (Internetin määritys graafisesti GNOME ja KDE)" +msgstr "Käytä NetworkManager (Internetin määritys graafisesti GNOME:ssa ja KDE Plasma:ssa)" -#, fuzzy msgid "Select a LVM option" -msgstr "Valitse aikavyöhyke" +msgstr "Valitse LVM optio" -#, fuzzy msgid "Partitioning" -msgstr "Osio" +msgstr "Osiointi" msgid "Logical Volume Management (LVM)" -msgstr "" +msgstr "Looginen taltiohallinta (engl. 'Logical Volume Management', LVM)" msgid "Physical volumes" -msgstr "" +msgstr "Fyysiset taltiot" msgid "Volumes" -msgstr "" +msgstr "Taltiot" -#, fuzzy msgid "LVM volumes" -msgstr "Aseta alitaltiot" +msgstr "LVM taltiot" -#, fuzzy msgid "LVM volumes to be encrypted" -msgstr "Salattavat osiot" +msgstr "Salattavat LVM taltiot" -#, fuzzy msgid "Select which LVM volumes to encrypt" -msgstr "Valitse salattavat osiot" +msgstr "Valitse salattavat LVM taltiot" -#, fuzzy msgid "Default layout" -msgstr "Levyn asettelu" +msgstr "Oletusasettelu" -#, fuzzy msgid "No Encryption" -msgstr "Salaustyyppi" +msgstr "Ei salausta" msgid "LUKS" -msgstr "" +msgstr "LUKS" msgid "LVM on LUKS" -msgstr "" +msgstr "LVM LUKS:in päällä (LVM on LUKS)" msgid "LUKS on LVM" -msgstr "" +msgstr "LUKS LVM:än päällä (LUKS on LVM)" -#, fuzzy msgid "Yes" -msgstr "kyllä" +msgstr "Kyllä" msgid "No" -msgstr "" +msgstr "Ei" -#, fuzzy msgid "Archinstall help" -msgstr "Archinstall kieli" +msgstr "Archinstall apu" -#, fuzzy msgid " (default)" msgstr "(oletus)" msgid "Press Ctrl+h for help" -msgstr "" +msgstr "Paina Ctrl+h saadaksesi apua" -#, fuzzy msgid "Choose an option to give Sway access to your hardware" -msgstr "" -"\n" -"\n" -"Valitse asetus antaaksesi Swaylle pääsyn laitteistoosi" +msgstr "Valitse asetus antaaksesi Swaylle pääsyn laitteistoosi" msgid "Seat access" -msgstr "" +msgstr "Istunnon pääsy (seat)" -#, fuzzy msgid "Mountpoint" msgstr "Liitoskohta: " msgid "HSM" -msgstr "" +msgstr "HSM" -#, fuzzy msgid "Enter disk encryption password (leave blank for no encryption)" msgstr "Anna levyn salauksen salasana (jätä tyhjäksi, jos et salaa): " -#, fuzzy msgid "Disk encryption password" msgstr "Salauksen salasana" -#, fuzzy msgid "Partition - New" -msgstr "Osio" +msgstr "Osio - Uusi" -#, fuzzy msgid "Filesystem" -msgstr "Vaihda tiedostojärjestelmä" +msgstr "Tiedostojärjestelmä" msgid "Invalid size" -msgstr "" +msgstr "Epäkelpo koko" -#, fuzzy msgid "Start (default: sector {}): " -msgstr "Anna alku (oletus: sektori {}): " +msgstr "Alku (oletus: sektori {}): " -#, fuzzy msgid "End (default: {}): " -msgstr "Anna loppu (oletus: {}): " +msgstr "Loppu (oletus: {}): " -#, fuzzy msgid "Subvolume name" msgstr "Alitaltion nimi " -#, fuzzy +# unsure msgid "Disk configuration type" -msgstr "Kiintolevyn määritys" +msgstr "Levyn konfiguraatiotyyppi" msgid "Root mount directory" -msgstr "" +msgstr "Root:in liittämishakemisto (mount directory)" -#, fuzzy msgid "Select language" -msgstr "Kieli" +msgstr "Valitse kieli" -#, fuzzy msgid "Write additional packages to install (space separated, leave blank to skip)" -msgstr "Kirjoita asennettavat lisäpaketit (välilyönnillä erotettuna, ohita vaihe jättämällä tyhjäksi): " +msgstr "Kirjoita asennettavat lisäpaketit (välilyönnillä erotettuna, ohita jättämällä tyhjäksi): " msgid "Invalid download number" -msgstr "" +msgstr "Epäkelpo numero lataukseen" msgid "Number downloads" -msgstr "" +msgstr "Numero latauksia" -#, fuzzy msgid "The username you entered is invalid" msgstr "Antamasi käyttäjänimi ei kelpaa. Yritä uudelleen" -#, fuzzy msgid "Username" msgstr "Käyttäjänimi : " -#, fuzzy, python-brace-format +#, python-brace-format msgid "Should \"{}\" be a superuser (sudo)?\n" -msgstr "Pitäisikö \"{}\" olla superkäyttäjä (sudo)?" +msgstr "Pitäisikö \"{}\" olla superkäyttäjä (sudo)?\n" -#, fuzzy +# unsure msgid "Interfaces" -msgstr "Lisää liitäntä" +msgstr "Verkkoliitännät (interfaces)" msgid "You need to enter a valid IP in IP-config mode" msgstr "Sinun on annettava kelvollinen IP-osoite IP-määritystilassa" @@ -1474,255 +1469,212 @@ msgid "Modes" msgstr "Tilat" msgid "IP address" -msgstr "IP osoite" +msgstr "IP-osoite" -#, fuzzy msgid "Enter your gateway (router) IP address (leave blank for none)" -msgstr "Anna yhdyskäytävän (reitittimen) IP-osoite tai jätä tyhjäksi: " +msgstr "Anna yhdyskäytävän (reitittimen) IP-osoite (tai jätä tyhjäksi): " msgid "Gateway address" msgstr "Yhdyskäytävän osoite" -#, fuzzy msgid "Enter your DNS servers with space separated (leave blank for none)" msgstr "Anna DNS-osoitteet (välilyönti erottaa kaksi osoitetta toisistaan, tyhjä ei mitään): " -#, fuzzy msgid "DNS servers" -msgstr "Ei audiopalvelinta" +msgstr "DNS-palvelimet" -#, fuzzy msgid "Configure interfaces" -msgstr "Määritetty {} liittymää" +msgstr "Määritä laitteet" -#, fuzzy msgid "Kernel" -msgstr "Kernelit" +msgstr "Ydin" msgid "UEFI is not detected and some options are disabled" -msgstr "UEFIa ei tunnisteta ja jotkin asetukset on poistettu käytöstä" +msgstr "UEFIa ei tunnisteta ja jotkin asetukset ovat poistettu käytöstä" msgid "Info" msgstr "Informaatio" -#, fuzzy msgid "The proprietary Nvidia driver is not supported by Sway." -msgstr "Sway ei tue patentoitua Nvidia-ohjainta. Todennäköistä, että kohtaat joitain ongelmia, kelpaako se silti sinulle?" +msgstr "Sway ei tue patentoitua Nvidia-ohjainta." -#, fuzzy msgid "It is likely that you will run into issues, are you okay with that?" -msgstr "Sway ei tue patentoitua Nvidia-ohjainta. Todennäköistä, että kohtaat joitain ongelmia, kelpaako se silti sinulle?" +msgstr "On todennäköistä, että kohtaat joitain ongelmia, kelpaako se silti sinulle?" -#, fuzzy msgid "Main profile" -msgstr "Muokkaa profiilia" +msgstr "Pääprofiili" -#, fuzzy msgid "Confirm password" -msgstr "Vaihda salasana" +msgstr "Vahvista salasana" msgid "The confirmation password did not match, please try again" -msgstr "" +msgstr "Salasanat eivät vastannet, ole hyvä ja koita uudestaan" -#, fuzzy msgid "Not a valid directory" msgstr "Hakemisto ei ole kelvollinen: {}" -#, fuzzy msgid "Would you like to continue?" -msgstr "Haluatko käyttää BTRFS-pakkausta?" +msgstr "Haluatko jatkaa?" msgid "Directory" -msgstr "" +msgstr "Hakemisto" -#, fuzzy msgid "Enter a directory for the configuration(s) to be saved (tab completion enabled)" msgstr "" -"Anna hakemisto tallennettaville määrityksille (välilehden viimeistely käytössä)\n" +"Anna hakemisto konfiguraation(oiden) tallentamista varten (tab viimeistely käytössä)\n" "Tallennushakemisto: " -#, fuzzy, python-brace-format +#, python-brace-format msgid "Do you want to save the configuration file(s) to {}?" -msgstr "" -"Haluatko tallentaa {} asetustiedostoa seuraavaan paikkaan?\n" -"\n" -"{}" +msgstr "Haluatko tallentaa asetustiedoston(tot) kohteeseen {}?" msgid "Enabled" msgstr "Käytössä" msgid "Disabled" -msgstr "Pois Käytostä" +msgstr "Pois käytostä" -#, fuzzy msgid "Please submit this issue (and file) to https://github.com/archlinux/archinstall/issues" -msgstr " Lähetä tämä ongelma (ja tiedosto) osoitteeseen https://github.com/archlinux/archinstall/issues" +msgstr "Lähetä tämä ongelma (ja tiedosto) osoitteeseen https://github.com/archlinux/archinstall/issues" -#, fuzzy msgid "Mirror name" -msgstr "Pakettivarasto" +msgstr "Peilin nimi" msgid "Url" -msgstr "" +msgstr "Url" -#, fuzzy msgid "Select signature check" msgstr "Valitse allekirjoituksen tarkistusvaihtoehto" -#, fuzzy msgid "Select execution mode" msgstr "Valitse suoritustila" msgid "Press ? for help" -msgstr "" +msgstr "Paina ? saadaksesi apua" -#, fuzzy msgid "Choose an option to give Hyprland access to your hardware" -msgstr "" -"\n" -"\n" -"Valitse asetus antaaksesi Hyprlandille pääsyn laitteistoosi" +msgstr "Valitse asetus antaaksesi Hyprlandille pääsyn laitteistoosi" -#, fuzzy msgid "Additional repositories" msgstr "Valinnaiset arkistot" msgid "NTP" -msgstr "" +msgstr "NTP" msgid "Swap on zram" -msgstr "" +msgstr "Swap zram:illa (Swap on zram)" msgid "Name" msgstr "Nimi" -#, fuzzy msgid "Signature check" msgstr "Valitse allekirjoituksen tarkistusvaihtoehto" -#, fuzzy, python-brace-format +# unsure +#, python-brace-format msgid "Selected free space segment on device {}:" -msgstr "Laitteen nykyiset vapaat sektorit {}:" +msgstr "Valittiin vapaan tilan osa laitteella {}:" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Size: {} / {}" -msgstr "Yhteensä: {} / {}" +msgstr "Koko: {} / {}" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Size (default: {}): " -msgstr "Anna loppu (oletus: {}): " +msgstr "Koko (oletus: {}): " -#, fuzzy msgid "HSM device" -msgstr "Laite" +msgstr "HSM laite" msgid "Some packages could not be found in the repository" -msgstr "" +msgstr "Jotkut paketit eivät löytyneet repositoriosta" -#, fuzzy msgid "User" -msgstr "Käyttäjänimi : " +msgstr "Käyttäjä" msgid "The specified configuration will be applied" -msgstr "" +msgstr "Käytetään valittua konfiguraatiota" msgid "Wipe" -msgstr "" +msgstr "Pyyhi" -#, fuzzy msgid "Mark/Unmark as XBOOTLDR" -msgstr "Merkitse/poista käynnistyvä" +msgstr "Lisää/poista merkintö XBOOTLDRina" -#, fuzzy msgid "Loading packages..." -msgstr "Lisäpaketit" +msgstr "Ladataan paketteja..." msgid "Select any packages from the below list that should be installed additionally" -msgstr "" +msgstr "Valitse alla olevalta listalta asennettavat lisäpaketit" -#, fuzzy msgid "Add a custom repository" -msgstr "Lisää mukautettu peilipaikka" +msgstr "Lisää mukautettu repositorio" -#, fuzzy msgid "Change custom repository" -msgstr "Vaihda mukautettu peilipaikka" +msgstr "Vaihda mukautettu repositorio" -#, fuzzy msgid "Delete custom repository" -msgstr "Poista mukautettu peilipaikka" +msgstr "Poista mukautettu repositorio" -#, fuzzy msgid "Repository name" -msgstr "Pakettivarasto" +msgstr "Repositorion nimi" -#, fuzzy msgid "Add a custom server" -msgstr "Lisää mukautettu peilipaikka" +msgstr "Lisää mukautettu palvelin" -#, fuzzy msgid "Change custom server" -msgstr "Vaihda mukautettu peilipaikka" +msgstr "Vaihda mukautettu palvelin" -#, fuzzy msgid "Delete custom server" -msgstr "Poista mukautettu peilipaikka" +msgstr "Poista mukautettu palvelin" msgid "Server url" -msgstr "" +msgstr "Palvelimen url" -#, fuzzy msgid "Select regions" -msgstr "Valitse allekirjoituksen asetus" +msgstr "Valitse alueet" -#, fuzzy msgid "Add custom servers" -msgstr "Lisää mukautettu peilipaikka" +msgstr "Lisää mukautetut palvelimet" -#, fuzzy msgid "Add custom repository" -msgstr "Lisää mukautettu peilipaikka" +msgstr "Lisää mukautettu repositorio" -#, fuzzy msgid "Loading mirror regions..." -msgstr "Peilipaikan maa" +msgstr "Ladataan peilialueita..." -#, fuzzy msgid "Mirrors and repositories" -msgstr "Valinnaiset arkistot" +msgstr "Peilit ja repositoriot" -#, fuzzy msgid "Selected mirror regions" -msgstr "Peilipaikan maa" +msgstr "Valitut peilin aluuet" -#, fuzzy msgid "Custom servers" -msgstr "Mukautetut peilipaikat" +msgstr "Mukautetut palvelimet" -#, fuzzy msgid "Custom repositories" -msgstr "Valinnaiset arkistot" +msgstr "Mukautetut repositoriot" msgid "Only ASCII characters are supported" -msgstr "" +msgstr "Ainoastaan ASCII hahmot ovat tuetut" msgid "Show help" -msgstr "Näytä apua" +msgstr "Näytä apu" msgid "Exit help" -msgstr "" +msgstr "Poistu avusta" msgid "Preview scroll up" -msgstr "" +msgstr "Esikatsele ylöspäin scrollaamista" msgid "Preview scroll down" -msgstr "" +msgstr "Esikatsele alaspäin scrollaamista" msgid "Move up" -msgstr "Liikku ylös" +msgstr "Liiku ylös" msgid "Move down" -msgstr "Liikku alas" +msgstr "Liiku alas" msgid "Move right" msgstr "Liiku oikealle" @@ -1731,632 +1683,566 @@ msgid "Move left" msgstr "Liiku vasemmalle" msgid "Jump to entry" -msgstr "" +msgstr "Hyppää kohtaan" msgid "Skip selection (if available)" -msgstr "" +msgstr "Hyppää valinnan yli (jos saatavilla)" msgid "Reset selection (if available)" -msgstr "" +msgstr "Nollaa valinta (jos saatavilla)" -#, fuzzy msgid "Select on single select" -msgstr "Valitse allekirjoituksen tarkistusvaihtoehto" +msgstr "Valinta yksittöisellä valinnalla" -#, fuzzy msgid "Select on multi select" -msgstr "Valitse aikavyöhyke" +msgstr "Valinta multivalinnalla" msgid "Reset" -msgstr "" +msgstr "Nollaa" -#, fuzzy msgid "Skip selection menu" -msgstr "Valitse suoritustila" +msgstr "Hyppää valintavalikon yli" msgid "Start search mode" -msgstr "" +msgstr "Aloita hakutila" msgid "Exit search mode" -msgstr "" +msgstr "Poistu hakutilasta" msgid "General" -msgstr "" +msgstr "Yleinen" -#, fuzzy msgid "Navigation" -msgstr "Tallenna määritykset" +msgstr "Navigaatio" -#, fuzzy msgid "Selection" -msgstr "Valitse allekirjoituksen asetus" +msgstr "Valinta" msgid "Search" -msgstr "" +msgstr "Haku" msgid "Down" -msgstr "" +msgstr "Alas" msgid "Up" -msgstr "" +msgstr "Ylös" -#, fuzzy msgid "Confirm" -msgstr "Vahvista ja poistu" +msgstr "Vahvista" -#, fuzzy msgid "Focus right" -msgstr "Liiku oikealle" +msgstr "Kohdista oikealle" -#, fuzzy msgid "Focus left" -msgstr "Liiku vasemmalle" +msgstr "Kohdista vasemmalle" msgid "Toggle" -msgstr "" +msgstr "Vaihda" -#, fuzzy msgid "Show/Hide help" -msgstr "Näytä apua" +msgstr "Näytä/piilota apu" msgid "Quit" -msgstr "" +msgstr "Poistu" msgid "First" -msgstr "" +msgstr "Ensimmäinen" msgid "Last" -msgstr "" +msgstr "Viimeinen" -#, fuzzy msgid "Select" -msgstr "Valitse allekirjoituksen asetus" +msgstr "Valitse" msgid "Page Up" -msgstr "" +msgstr "Page up" msgid "Page Down" -msgstr "" +msgstr "Page down" msgid "Page up" -msgstr "" +msgstr "Page up" -#, fuzzy msgid "Page down" -msgstr "Liikku alas" +msgstr "Page down" msgid "Page Left" -msgstr "" +msgstr "Sivu vasemmalle" -#, fuzzy msgid "Page Right" -msgstr "Liiku oikealle" +msgstr "Sivu oikealle" msgid "Cursor up" -msgstr "" +msgstr "Kursori ylös" -#, fuzzy msgid "Cursor down" -msgstr "Liikku alas" +msgstr "Kursori alas" -#, fuzzy msgid "Cursor right" -msgstr "Liiku oikealle" +msgstr "Kursori oikealle" -#, fuzzy msgid "Cursor left" -msgstr "Liiku vasemmalle" +msgstr "Kursori vasemmalle" msgid "Top" -msgstr "" +msgstr "Yläosa" msgid "Bottom" -msgstr "" +msgstr "Pohja" msgid "Home" -msgstr "" +msgstr "Home" -#, fuzzy msgid "End" -msgstr "Käytössä" +msgstr "End" -#, fuzzy msgid "Toggle option" -msgstr "Alitaltion valinnat" +msgstr "Vaihda optio" msgid "Scroll Up" -msgstr "" +msgstr "Scrollaa ylös" msgid "Scroll Down" -msgstr "" +msgstr "Scrollaa alas" msgid "Scroll Left" -msgstr "" +msgstr "Scrollaa vasemmalle" msgid "Scroll Right" -msgstr "" +msgstr "Scrollaa oikealle" msgid "Scroll Home" -msgstr "" +msgstr "Scrollaa rivin alkuun" msgid "Scroll End" -msgstr "" +msgstr "Scrollaa rivin loppuun" msgid "Focus Next" -msgstr "" +msgstr "Kohdista seuraava" msgid "Focus Previous" -msgstr "" +msgstr "Kohdista edeltävä" msgid "Copy selected text" -msgstr "" +msgstr "Kopioi valittu teksti" -#, fuzzy msgid "labwc needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" -msgstr "Sway tarvitsee pääsyn istuntoon (kokoelma laitteistoja, kuten näppäimistö, hiiri jne.)" +msgstr "labwc tarvitsee pääsyn istuntoon (kokoelma laitteistoja, kuten näppäimistö, hiiri jne.)" -#, fuzzy msgid "Choose an option to give labwc access to your hardware" -msgstr "" -"\n" -"\n" -"Valitse asetus antaaksesi Swaylle pääsyn laitteistoosi" +msgstr "Valitse asetus antaaksesi labwc:lle pääsyn laitteistoosi" -#, fuzzy msgid "niri needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" -msgstr "Sway tarvitsee pääsyn istuntoon (kokoelma laitteistoja, kuten näppäimistö, hiiri jne.)" +msgstr "niri tarvitsee pääsyn istuntoon (kokoelma laitteistoja, kuten näppäimistö, hiiri jne.)" -#, fuzzy msgid "Choose an option to give niri access to your hardware" -msgstr "" -"\n" -"\n" -"Valitse asetus antaaksesi Swaylle pääsyn laitteistoosi" +msgstr "Valitse asetus antaaksesi nirin pääsyn laitteistoosi" -#, fuzzy msgid "Mark/Unmark as ESP" msgstr "Merkitse/poista käynnistyvä" msgid "Package group:" -msgstr "" +msgstr "Pakettiryhmä:" -#, fuzzy msgid "Exit archinstall" -msgstr "Archinstall kieli" +msgstr "Poistu archinstall:ista" -#, fuzzy msgid "Reboot system" -msgstr "Vaihda tiedostojärjestelmä" +msgstr "Käynnistä järjestelmä uudelleen" -#, fuzzy msgid "chroot into installation for post-installation configurations" msgstr "Haluatko chroot:in uuteen asennukseen ja suorittaa asennuksen jälkeiset asetukset?" msgid "Installation completed" -msgstr "Lataus valmis" +msgstr "Asennus valmis" -#, fuzzy msgid "What would you like to do next?" -msgstr "Haluatko käyttää BTRFS-pakkausta?" +msgstr "Mitä haluaisit tehdä seuraavaksi?" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Select which mode to configure for \"{}\"" -msgstr "Valitse, mikä tila määritetään \"{}\", tai ohita ja käytä \"{}\" oletusta." +msgstr "Valitse tila jolle tehdä konfiguraatio \"{}\"" -#, fuzzy +# unsure msgid "Incorrect credentials file decryption password" -msgstr "Salauksen salasana" +msgstr "Väärä salasana pääsytietojen salausta varten" -#, fuzzy msgid "Incorrect password" -msgstr "Root salasana" +msgstr "Väärä salasana" -#, fuzzy msgid "Credentials file decryption password" -msgstr "Salauksen salasana" +msgstr "Pääsytietotiedoston salauksen salasana" -#, fuzzy msgid "Do you want to encrypt the user_credentials.json file?" -msgstr "" -"Haluatko tallentaa {} asetustiedostoa seuraavaan paikkaan?\n" -"\n" -"{}" +msgstr "Haluatko salata user_crendentials.json tiedoston?" -#, fuzzy msgid "Credentials file encryption password" -msgstr "Salauksen salasana" +msgstr "Pääsytietotiedoston salauksen salasana" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Repositories: {}" -msgstr "Pakettivarasto" +msgstr "Repositoriot: {}" -#, fuzzy msgid "New version available" -msgstr "Ei HSM-laitteita saatavilla" +msgstr "Uusi versio saatavilla" -#, fuzzy msgid "Passwordless login" -msgstr "Salasana" +msgstr "Salasanaton kirjautuminen" msgid "Second factor login" -msgstr "" +msgstr "Toisen faktorin kirjautuminen" msgid "Bluetooth" -msgstr "" +msgstr "Bluetooth" -#, fuzzy msgid "Would you like to configure Bluetooth?" -msgstr "Haluatko käyttää BTRFS-pakkausta?" +msgstr "Haluatko konfiguroida Bluetooth:in?" msgid "Print service" -msgstr "" +msgstr "Printtauspalvelu" -#, fuzzy msgid "Would you like to configure the print service?" -msgstr "Haluatko käyttää BTRFS-pakkausta?" +msgstr "Haluatko konfiguroida printtauspalvelun" -#, fuzzy msgid "Power management" -msgstr "Osioiden hallinta: {}" +msgstr "Tehohallinta" msgid "Authentication" msgstr "Todennus" msgid "Applications" -msgstr "" +msgstr "Applikaatiot" msgid "U2F login method: " -msgstr "" +msgstr "U2F kirjautumismenetelmä" msgid "Passwordless sudo: " msgstr "Salasanaton sudo" #, python-brace-format msgid "Btrfs snapshot type: {}" -msgstr "" +msgstr "Btrfs tilankuvien tyyppi: {}" msgid "Syncing the system..." -msgstr "" +msgstr "Järjestelmän synkronointi" msgid "Value cannot be empty" -msgstr "" +msgstr "Arvo ei voi olla tyhjä" msgid "Snapshot type" -msgstr "" +msgstr "Tilannekuvan tyyppi" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Snapshot type: {}" -msgstr "Ympäristötyyppi: {}" +msgstr "Tilannekuvan tyyppi: {}" msgid "U2F login setup" -msgstr "" +msgstr "U2F kirjautumisen konfigurointi" msgid "No U2F devices found" -msgstr "" +msgstr "U2F laitteita ei löydetty" msgid "U2F Login Method" -msgstr "" +msgstr "U2F kirjautumisen menetelmä" -#, fuzzy msgid "Enable passwordless sudo?" -msgstr "Anna salasana: " +msgstr "Aktivoi salasanaton sudo?" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Setting up U2F device for user: {}" -msgstr "Valitse HSM:ään käytettävä FIDO2-laite" +msgstr "Määritetään U2F laitetta käyttäjälle: {}" msgid "You may need to enter the PIN and then touch your U2F device to register it" -msgstr "" +msgstr "Voit joutua syöttämään PIN:in ja koskettaa U2F laitettasi rekisteröidäksesi sen" msgid "Starting device modifications in " -msgstr "" +msgstr "Aloitetaan laitteen muokkausta " -#, fuzzy msgid "No network connection found" -msgstr "Ei verkkoasetuksia" +msgstr "Verkkoyhteyttä ei löydetty" -#, fuzzy msgid "Would you like to connect to a Wifi?" -msgstr "Haluatko käyttää BTRFS-pakkausta?" +msgstr "Haluaisitko liittyä langattomaan verkkoon?" -#, fuzzy msgid "No wifi interface found" -msgstr "Määritetty {} liittymää" +msgstr "Langattomia liittymiä ei löydetty" -#, fuzzy msgid "Select wifi network to connect to" -msgstr "Valitse yksi määritettävä verkkoliitäntä" +msgstr "Valitse wifiverkko johon yhdistää" msgid "Scanning wifi networks..." -msgstr "" +msgstr "Etsitään wifiyhteyksiä..." -#, fuzzy msgid "No wifi networks found" -msgstr "Ei verkkoasetuksia" +msgstr "Wifiverkkoja ei löytynyt" msgid "Failed setting up wifi" -msgstr "" +msgstr "Langattoman verkon määrittäminen epäonnistui" -#, fuzzy msgid "Enter wifi password" -msgstr "Anna salasana: " +msgstr "Anna wifi salasana" msgid "Ok" -msgstr "" +msgstr "Ok" msgid "Removable" -msgstr "" +msgstr "Irrotettava" msgid "Install to removable location" -msgstr "" +msgstr "Asenna irrotettavaan sijaintiin" msgid "Will install to /EFI/BOOT/ (removable location)" -msgstr "" +msgstr "Asennetaan sijaintiin /EFI/BOOT (irrotettava sijainti)" msgid "Will install to standard location with NVRAM entry" -msgstr "" +msgstr "Asennetaan oletuskohteeseen NVRAM kohteella" msgid "Would you like to install the bootloader to the default removable media search location?" -msgstr "" +msgstr "Haluatko asentaa käynnistyslataajan (bootloader) irrotettavan median oletushakukohteeseen?" msgid "This installs the bootloader to /EFI/BOOT/BOOTX64.EFI (or similar) which is useful for:" -msgstr "" +msgstr "Tämä asentaa käynnistyslataajan sijaintiin /EFI/BOOT/BOOTX64.EFI (tai vastaava) joka on hyödyllistä seuraaville:" msgid "USB drives or other portable external media." -msgstr "" +msgstr "USB levyt ja muu kannettava ulkoinen media." msgid "Systems where you want the disk to be bootable on any computer." -msgstr "" +msgstr "Järjestelmät joissa haluat että levy käynnistyvä millä tahansa koneella." msgid "Firmware that does not properly support NVRAM boot entries." -msgstr "" +msgstr "Firmware joka ei kunnolla tue NVRAM käynnistyskohteita." msgid "Will install to /EFI/BOOT/ (removable location, safe default)" -msgstr "" +msgstr "Asennetaan sijaintiin /EFI/BOOT (irrotettava sijainti, varma oletusarvo)" msgid "Will install to custom location with NVRAM entry" -msgstr "" +msgstr "Asennetaan omaan sijaintiin NVRAM kohteella" msgid "Firmware that does not properly support NVRAM boot entries like most MSI motherboards," -msgstr "" +msgstr "Firmware joka ei kunnolla tue NVRAM käynnistyskohteita kuten useimmat MSI emolevyt," msgid "most Apple Macs, many laptops..." -msgstr "" +msgstr "useimmat Apple Macit, monet kannettavat tietokoneet..." -#, fuzzy msgid "Language" msgstr "Kieli" msgid "Compression algorithm" -msgstr "" +msgstr "Kompressioalgoritmi" -#, fuzzy msgid "Only packages such as base, sudo, linux, linux-firmware, efibootmgr and optional profile packages are installed." -msgstr "Vain paketit, kuten base, base-devel, linux, linux-firmware, efibootmgr ja valinnaiset profiili-paketit, asennetaan." +msgstr "Vain paketit, kuten base, sudo, linux, linux-firmware, efibootmgr ja valinnaiset profiili-paketit ovat asennettu." -#, fuzzy msgid "Select zram compression algorithm:" -msgstr "Valitse liitoskohta :" +msgstr "Valitse zram kompression algoritmi:" msgid "Use Network Manager (default backend)" -msgstr "" +msgstr "Käytä Network Manager (oletus backendi)" msgid "Use Network Manager (iwd backend)" -msgstr "" +msgstr "Käytä Network Manager (iwd backendi)" msgid "Firewall" -msgstr "" +msgstr "Palomuuri" -#, fuzzy msgid "Additional fonts" -msgstr "Valinnaiset arkistot" +msgstr "Lisäfontit" -#, fuzzy msgid "Select font packages to install" -msgstr "Valitse asennettava käyttöliittymä" +msgstr "Valitse asennettavat fonttipaketit" msgid "Unicode font coverage for most languages" -msgstr "" +msgstr "Unicode fontin kattavuus useimmille kielille" msgid "color emoji for browsers and apps" -msgstr "" +msgstr "väri emojit selaimille ja sovelluksille" msgid "Chinese, Japanese, Korean characters" -msgstr "" +msgstr "Kiinalaiset, japanilaiset, korealaiset kirjaimet" -#, fuzzy msgid "Select audio configuration" -msgstr "Tallenna käyttäjän määritykset" +msgstr "Valitse äänen konfiguraatio" -#, fuzzy msgid "Enter credentials file decryption password" -msgstr "Salauksen salasana" +msgstr "Syötä pääsytietotiedoston salauksen salasana" -#, fuzzy msgid "Enter root password" -msgstr "Anna salasana: " +msgstr "Anna rootin salasana" msgid "Select bootloader to install" -msgstr "" +msgstr "Valitse asennettava käynnistyslataaja" -#, fuzzy msgid "Configuration preview" -msgstr "Asetukset" +msgstr "Konfiguraation esikatselu" -#, fuzzy msgid "Enter a directory for the configuration(s) to be saved" msgstr "Anna hakemisto tallennettaville määrityksille: " -#, fuzzy msgid "Select encryption type" msgstr "Salaustyyppi" -#, fuzzy msgid "Select disks for the installation" -msgstr "Valitse hostname asennukselle: " +msgstr "Valitse levyasemat asennukselle" -#, fuzzy msgid "Enter a mountpoint" msgstr "Valitse liitoskohta :" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Enter a size (default: {}): " -msgstr "Anna loppu (oletus: {}): " +msgstr "Anna koko (oletus: {}): " -#, fuzzy msgid "Enter subvolume name" -msgstr "Alitaltion nimi " +msgstr "Anna alitaltion nimi " -#, fuzzy msgid "Enter subvolume mountpoint" -msgstr "Alitaltion liitoskohta" +msgstr "Anna alitaltion liitoskohta" -#, fuzzy msgid "Select a disk configuration" msgstr "Kiintolevyn määritys" msgid "Enter root mount directory" -msgstr "" +msgstr "Syötä juuren liitoshakemisto" msgid "You will use whatever drive-setup is mounted at the specified directory" -msgstr "" +msgstr "Käytät mitä tahansa levykonfiguraatiota joka on liitetty valittuun hakemistoon" msgid "WARNING: Archinstall won't check the suitability of this setup" -msgstr "" +msgstr "VAROITUS: Archinstall ei tarkista konfiguraation soveltuvuutta" -#, fuzzy msgid "Select main filesystem" -msgstr "Vaihda tiedostojärjestelmä" +msgstr "Vaihda päätiedostojärjestelmä" msgid "Enter a hostname" -msgstr "" +msgstr "Syötä isäntänimi (hostname)" -#, fuzzy msgid "Select timezone" msgstr "Valitse aikavyöhyke" -#, fuzzy msgid "Enter the number of parallel downloads to be enabled" -msgstr "" -"Anna rinnakkaisten latausten määrä.\n" -"\n" -"Huomaa:\n" +msgstr "Anna rinnakkaisten latausten määrä" #, python-brace-format msgid "Value must be between 1 and {}" -msgstr "" +msgstr "Arvon on oltava yhden ja {} välillä" -#, fuzzy msgid "Select which kernel(s) to install" -msgstr "Valitse asennettava käyttöliittymä" +msgstr "Valitse asennettavat ytimet (kernel)" -#, fuzzy msgid "Enter a respository name" -msgstr "Pakettivarasto" +msgstr "Syötä pakettivaraston nimi" -#, fuzzy msgid "Enter the repository url" -msgstr "Vaihda mukautettu peilipaikka" +msgstr "Syötä pakettivarason url" msgid "Enter server url" -msgstr "" +msgstr "Syötä palvelimen url" -#, fuzzy msgid "Select mirror regions to be enabled" -msgstr "Peilipaikan maa" +msgstr "Valitse käytössä olevien peilien alueet" -#, fuzzy msgid "Select optional repositories to be enabled" -msgstr "Valitse, valinnaiset lisävarastot jotka otetaan käyttöön" +msgstr "Valitse valinnaiset repositoriot jotka otetaan käyttöön" -#, fuzzy msgid "Select an interface" -msgstr "Poista liitäntä" +msgstr "Valitse liitäntä" -#, fuzzy msgid "Choose network configuration" -msgstr "Ei verkkoasetuksia" +msgstr "Valitse verkkokonfiguraatio" + +msgid "Recommended: Network Manager for desktop, Manual for server" +msgstr "Suositeltu: Network Manager työpöydälle, manuaali palvelinta varten" + +msgid "Warning: no network configuration selected. Network will need to be set up manually on the installed system." +msgstr "Varoitus: verkkokonfiguraatiota ei löytynyt. Verkon on asetettava manuaalisesti asennetulla järjestelmällä." -#, fuzzy msgid "No packages found" -msgstr "Määritetty {} liittymää" +msgstr "Paketteja ei löytynyt" -#, fuzzy msgid "Select which greeter to install" -msgstr "Valitse asennettava käyttöliittymä" +msgstr "Valitse asennettava tervehtijä (greeter)" -#, fuzzy msgid "Select a profile type" -msgstr "Valitut profiilit: " +msgstr "Valitse profiilityyppi" -#, fuzzy msgid "Enter new password" -msgstr "Anna salasana: " +msgstr "Anna uusi salasana: " msgid "Enter a username" -msgstr "" +msgstr "Anna käyttäjänimi" -#, fuzzy msgid "Enter a password" msgstr "Anna salasana: " msgid "The password did not match, please try again" -msgstr "" +msgstr "Salasanat eivät vastanneet, ole hyvä ja yritä uudelleen" msgid "Password strength: Weak" -msgstr "" +msgstr "Salasanan vahvuus on heikko" msgid "Password strength: Moderate" -msgstr "" +msgstr "Salasanan vahvuus on keskiverto" msgid "Password strength: Strong" -msgstr "" +msgstr "Salasanan vahvuus on vahva" msgid "The selected desktop profile requires a regular user to log in via the greeter" -msgstr "" +msgstr "Valittu työpöydän profiili vaati tavallisen käyttäjän kirjautumisen tervehtijällä" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Environment type: {} {}" -msgstr "Ympäristötyyppi: {}" +msgstr "Ympäristötyyppi: {} {}" msgid "Input cannot be empty" -msgstr "" +msgstr "Syöttö ei voi olla tyhjä" msgid "Recommended" -msgstr "" +msgstr "Suositeltu" msgid "Package" -msgstr "" +msgstr "Paketti" msgid "Curated selection of KDE Plasma packages" -msgstr "" +msgstr "Kuratoitu valikoima KDE Plasma paketteja" msgid "Dependencies" -msgstr "" +msgstr "Riippuvuudet" -#, fuzzy msgid "Package group" -msgstr "Määritetty {} liittymää" +msgstr "Pakettiryhmä" msgid "Extensive KDE Plasma installation" -msgstr "" +msgstr "Laaja KDE Plasman asennus" msgid "Packages in group" -msgstr "" +msgstr "Paketit ryhmässä" msgid "Minimal KDE Plasma installation" -msgstr "" +msgstr "Minimaalinen KDE Plasma asennus" -#, fuzzy msgid "Description" -msgstr "Levyn salaus" +msgstr "Kuvaus" -#, fuzzy msgid "Select a flavor of KDE Plasma to install" -msgstr "Valitse asennettava käyttöliittymä" +msgstr "Valitse asennettavan KDE Plasman maku" msgid "Arial/Times/Courier replacement, Cyrillic support for Steam/games" -msgstr "" +msgstr "Arial/Times/Courier korvaus, kyrillisen kirjaimiston tuki Steam/pelejä varten" msgid "wide Unicode coverage, good fallback font" -msgstr "" +msgstr "laaja Unicode kattavuus, hyvä varafontti " + +#, python-brace-format +msgid "Setting up U2F login: {u2f_config.u2f_login_method.value}" +msgstr "Määritellään U2F kirjautuminen: {u2f_config.u2f_login_method.value}" + +#, python-brace-format +msgid "Default: {DEFAULT_ITER_TIME}ms, Recommended range: 1000-60000" +msgstr "Oletus: {DEFAULT_ITER_TIME}ms, suositeltu väli: 1000-60000" + +#, python-brace-format +msgid "Setting up U2F login: {}" +msgstr "Määritetään U2F laitetta käyttäjälle: {}" + +#, python-brace-format +msgid "Default: {}ms, Recommended range: 1000-60000" +msgstr "Oletusarvo: {}ms, suositeltu 1000-60000ms" diff --git a/archinstall/locales/hi/LC_MESSAGES/base.po b/archinstall/locales/hi/LC_MESSAGES/base.po index 9d64d477..3cfe309f 100644 --- a/archinstall/locales/hi/LC_MESSAGES/base.po +++ b/archinstall/locales/hi/LC_MESSAGES/base.po @@ -1502,9 +1502,6 @@ msgstr "सक्षम" msgid "Disabled" msgstr "अक्षम" -msgid "Please submit this issue (and file) to https://github.com/archlinux/archinstall/issues" -msgstr "कृपया इस समस्या (और फ़ाइल) को https://github.com/archlinux/archinstall/issues पर सबमिट करें।" - msgid "Mirror name" msgstr "मिरर का नाम" diff --git a/archinstall/locales/it/LC_MESSAGES/base.mo b/archinstall/locales/it/LC_MESSAGES/base.mo index 79d934d4..a4166e67 100644 Binary files a/archinstall/locales/it/LC_MESSAGES/base.mo and b/archinstall/locales/it/LC_MESSAGES/base.mo differ diff --git a/archinstall/locales/it/LC_MESSAGES/base.po b/archinstall/locales/it/LC_MESSAGES/base.po index 55585263..f46e8a73 100644 --- a/archinstall/locales/it/LC_MESSAGES/base.po +++ b/archinstall/locales/it/LC_MESSAGES/base.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2026-04-12 10:26+0200\n" +"PO-Revision-Date: 2026-05-16 12:52+0200\n" "Last-Translator: Van Matten\n" "Language-Team: Alessio Cuccovillo , Van Matten\n" "Language: it\n" @@ -56,7 +56,7 @@ msgid "Only packages such as base, base-devel, linux, linux-firmware, efibootmgr msgstr "Vengono installati solo pacchetti come base, base-devel, linux, linux-firmware, efibootmgr e pacchetti di profilo opzionali." msgid "Note: base-devel is no longer installed by default. Add it here if you need build tools." -msgstr "Nota: base-devel non è più installato di default. Aggiungilo qui se ti servono i build tools." +msgstr "Nota: base-devel non è più installato come predefinito. Aggiungilo qui se ti servono i build tools." msgid "If you desire a web browser, such as firefox or chromium, you may specify it in the following prompt." msgstr "Se desideri un browser web, come Firefox o Chromium, puoi specificarlo nel seguente prompt." @@ -118,7 +118,7 @@ msgid "" msgstr "" "{}\n" "\n" -"Seleziona per indice quali partizioni eliminare" +"Seleziona per indice le partizioni da eliminare" msgid "" "{}\n" @@ -127,13 +127,13 @@ msgid "" msgstr "" "{}\n" "\n" -"Seleziona per indice quale partizione montare dove" +"Seleziona per indice la partizione dove montare" msgid " * Partition mount-points are relative to inside the installation, the boot would be /boot as an example." -msgstr " * I punti di mount della partizione sono relativi all'interno dell'installazione, per esempio l'avvio sarebbe /boot." +msgstr " * I punti di montaggio della partizione sono relativi all'interno dell'installazione, per esempio l'avvio sarebbe /boot." msgid "Select where to mount partition (leave blank to remove mountpoint): " -msgstr "Seleziona dove montare la partizione (lascia vuoto per rimuovere il punto di mount): " +msgstr "Seleziona dove montare la partizione (lascia vuoto per rimuovere il punto di montaggio): " msgid "" "{}\n" @@ -142,7 +142,7 @@ msgid "" msgstr "" "{}\n" "\n" -"Seleziona quale partizione mascherare per la formattazione" +"Seleziona la partizione da mascherare per la formattazione" msgid "" "{}\n" @@ -151,7 +151,7 @@ msgid "" msgstr "" "{}\n" "\n" -"Seleziona quale partizione contrassegnare come crittografata" +"Seleziona la partizione da contrassegnare come crittografata" msgid "" "{}\n" @@ -160,7 +160,7 @@ msgid "" msgstr "" "{}\n" "\n" -"Seleziona quale partizione contrassegnare come avviabile" +"Seleziona la partizione da contrassegnare come avviabile" msgid "" "{}\n" @@ -169,7 +169,7 @@ msgid "" msgstr "" "{}\n" "\n" -"Seleziona su quale partizione impostare un filesystem" +"Seleziona la partizione su cui impostare un filesystem" msgid "Enter a desired filesystem type for the partition: " msgstr "Inserisci un tipo di filesystem desiderato per la partizione: " @@ -187,7 +187,7 @@ msgid "Select what you wish to do with the selected block devices" msgstr "Seleziona cosa desideri fare con i dispositivi a blocchi selezionati" msgid "This is a list of pre-programmed profiles, they might make it easier to install things like desktop environments" -msgstr "Questo è un elenco di profili pre-programmati, che potrebbero semplificare l'installazione di elementi come gli ambienti desktop" +msgstr "Questo è un elenco di profili preprogrammati, che potrebbero semplificare l'installazione di elementi come gli ambienti desktop" msgid "Select keyboard layout" msgstr "Seleziona il layout della tastiera" @@ -196,7 +196,7 @@ msgid "Select one of the regions to download packages from" msgstr "Seleziona una delle regioni da cui scaricare i pacchetti" msgid "Select one or more hard drives to use and configure" -msgstr "Seleziona uno o più dischi rigidi da utilizzare e configurare" +msgstr "Seleziona uno o più unità da utilizzare e configurare" msgid "For the best compatibility with your AMD hardware, you may want to use either the all open-source or AMD / ATI options." msgstr "Per la migliore compatibilità con il tuo hardware AMD, potresti voler utilizzare tutte le opzioni open source o AMD / ATI." @@ -220,13 +220,13 @@ msgid "All open-source (default)" msgstr "Tutti gli open source (predefinito)" msgid "Choose which kernels to use or leave blank for default \"{}\"" -msgstr "Scegli quali kernel usare o lascia vuoto per il predefinito \"{}\"" +msgstr "Scegli i kernel da usare o lascia vuoto per il predefinito \"{}\"" msgid "Choose which locale language to use" -msgstr "Scegli quale lingua locale utilizzare" +msgstr "Scegli la lingua da usare" msgid "Choose which locale encoding to use" -msgstr "Scegli quale codifica locale utilizzare" +msgstr "Scegli la codifica da usare" msgid "Select one of the values shown below: " msgstr "Seleziona uno dei valori mostrati di seguito: " @@ -235,7 +235,7 @@ msgid "Select one or more of the options below: " msgstr "Seleziona una o più delle seguenti opzioni " msgid "Adding partition...." -msgstr "Aggiungendo la partizione...." +msgstr "Aggiunta della partizione in corso..." msgid "You need to enter a valid fs-type in order to continue. See `man parted` for valid fs-type's." msgstr "Devi inserire un tipo di filesystem valido per continuare. Vedi `man parted` per tipi di filesystem validi." @@ -253,13 +253,16 @@ msgid "Mirror region" msgstr "Regione dei mirror" msgid "Locale language" -msgstr "Lingua locale" +msgstr "Lingua" msgid "Locale encoding" -msgstr "Codifica locale" +msgstr "Codifica" + +msgid "Console font" +msgstr "Font della console" msgid "Drive(s)" -msgstr "Dischi" +msgstr "Unità" msgid "Disk layout" msgstr "Layout del disco" @@ -301,7 +304,7 @@ msgid "Automatic time sync (NTP)" msgstr "Sincronizzazione automatica dell'ora (NTP)" msgid "Install ({} config(s) missing)" -msgstr "Installa ({} configurazioni mancanti)" +msgstr "Installa ({} configurazione/i mancante/i)" msgid "" "You decided to skip harddrive selection\n" @@ -309,7 +312,7 @@ msgid "" "WARNING: Archinstall won't check the suitability of this setup\n" "Do you wish to continue?" msgstr "" -"Hai deciso di saltare la selezione del disco rigido\n" +"Hai deciso di saltare la selezione dell'unità\n" "e utilizzerà qualsiasi configurazione dell'unità montata su {} (sperimentale)\n" "ATTENZIONE: Archinstall non verificherà l'idoneità di questa configurazione\n" "Vuoi continuare?" @@ -327,7 +330,7 @@ msgid "Clear/Delete all partitions" msgstr "Cancella/Elimina tutte le partizioni" msgid "Assign mount-point for a partition" -msgstr "Assegna punto di mount per una partizione" +msgstr "Assegna punto di montaggio per una partizione" msgid "Mark/Unmark a partition to be formatted (wipes data)" msgstr "Seleziona/Deseleziona una partizione da formattare (cancella i dati)" @@ -376,7 +379,7 @@ msgid "Enter a encryption password for {}" msgstr "Inserisci una password di crittografia per {}" msgid "Enter disk encryption password (leave blank for no encryption): " -msgstr "Inserisci la password di crittografia del disco (lasciare vuoto per nessuna crittografia): " +msgstr "Inserisci la password di crittografia del disco (lascia vuoto per nessuna crittografia): " msgid "Create a required super-user with sudo privileges: " msgstr "Crea un superuser richiesto con privilegi sudo: " @@ -454,7 +457,7 @@ msgid "Pre-existing pacman lock never exited. Please clean up any existing pacma msgstr "Il lock di pacman preesistente non è mai terminato. Rimuovi ogni sessione pacman esistente prima di usare archinstall." msgid "Choose which optional additional repositories to enable" -msgstr "Scegli quali repository aggiuntivi facoltativi abilitare" +msgstr "Scegli i repository aggiuntivi facoltativi da abilitare" msgid "Add a user" msgstr "Aggiungi un utente" @@ -476,7 +479,7 @@ msgstr "" "Definisci un nuovo utente\n" msgid "User Name : " -msgstr "Nome utente : " +msgstr "Nome utente: " msgid "Should {} be a superuser (sudoer)?" msgstr "{} dovrebbe essere un superuser (sudoer)?" @@ -497,7 +500,7 @@ msgid "" msgstr "" "{}\n" "\n" -"Seleziona su quale partizione impostare i sottovolumi" +"Seleziona la partizione su cui impostare i sottovolumi" msgid "Manage btrfs subvolumes for current partition" msgstr "Gestisci i sottovolumi btrfs per la partizione corrente" @@ -518,7 +521,7 @@ msgid "Save all" msgstr "Salva tutto" msgid "Choose which configuration to save" -msgstr "Scegli quale configurazione salvare" +msgstr "Scegli la configurazione da salvare" msgid "Enter a directory for the configuration(s) to be saved: " msgstr "Inserisci una cartella in cui salvare le configurazioni: " @@ -570,7 +573,7 @@ msgid "Subvolume name " msgstr "Nome del sottovolume " msgid "Subvolume mountpoint" -msgstr "Punto di mount del sottovolume" +msgstr "Punto di montaggio del sottovolume" msgid "Subvolume options" msgstr "Opzioni del sottovolume" @@ -579,10 +582,10 @@ msgid "Save" msgstr "Salva" msgid "Subvolume name :" -msgstr "Nome del sottovolume :" +msgstr "Nome del sottovolume:" msgid "Select a mount point :" -msgstr "Seleziona un punto di mount:" +msgstr "Seleziona un punto di montaggio:" msgid "Select the desired subvolume options " msgstr "Seleziona le opzioni del sottovolume desiderate " @@ -607,10 +610,10 @@ msgid "The selected drives do not have the minimum capacity required for an auto msgstr "Le unità selezionate non hanno la capacità minima richiesta per un suggerimento automatico\n" msgid "Minimum capacity for /home partition: {}GB\n" -msgstr "Capacità minima per la partizione /home: {}GB\n" +msgstr "Capacità minima per la partizione /home: {} GB\n" msgid "Minimum capacity for Arch Linux partition: {}GB" -msgstr "Capacità minima per la partizione Arch Linux: {}GB" +msgstr "Capacità minima per la partizione Arch Linux: {} GB" msgid "Continue" msgstr "Continua" @@ -661,13 +664,13 @@ msgid "Select your desired desktop environment" msgstr "Seleziona l'ambiente desktop desiderato" msgid "A very basic installation that allows you to customize Arch Linux as you see fit." -msgstr "Un'installazione molto semplice che ti consente di personalizzare Arch Linux come meglio credi." +msgstr "Un'installazione molto semplificata che ti consente di personalizzare Arch Linux come meglio credi." msgid "Provides a selection of various server packages to install and enable, e.g. httpd, nginx, mariadb" msgstr "Fornisce una selezione di vari pacchetti server da installare e abilitare, per esempio httpd, nginx, mariadb" msgid "Choose which servers to install, if none then a minimal installation will be done" -msgstr "Scegli quali server installare, se nessuno verrà eseguita un'installazione minima" +msgstr "Scegli i server da installare, se non ne sarà selezionato nessuno, verrà eseguita un'installazione minima" msgid "Installs a minimal system as well as xorg and graphics drivers." msgstr "Installa un sistema minimo oltre a xorg e driver grafici." @@ -682,13 +685,13 @@ msgid "Are you sure you want to reset this setting?" msgstr "Sei sicuro di voler ripristinare questa impostazione?" msgid "Select one or more hard drives to use and configure\n" -msgstr "Seleziona uno o più dischi rigidi da utilizzare e configurare\n" +msgstr "Seleziona uno o più unità da utilizzare e configurare\n" msgid "Any modifications to the existing setting will reset the disk layout!" msgstr "Qualsiasi modifica all'impostazione esistente ripristinerà il layout del disco!" msgid "If you reset the harddrive selection this will also reset the current disk layout. Are you sure?" -msgstr "Se si ripristina la selezione del disco rigido, verrà ripristinato anche il layout del disco corrente. Sei sicuro?" +msgstr "Se ripristini la selezione dell'unità, verrà ripristinato anche il layout del disco corrente. Sei sicuro?" msgid "Save and exit" msgstr "Salva ed esci" @@ -741,7 +744,7 @@ msgid "Select one of the disks or skip and use /mnt as default" msgstr "Seleziona uno dei dischi o salta e usa /mnt come predefinito" msgid "Select which partitions to mark for formatting:" -msgstr "Seleziona quali partizioni contrassegnare per la formattazione:" +msgstr "Seleziona le partizioni da contrassegnare per la formattazione:" msgid "Use HSM to unlock encrypted drive" msgstr "Utilizza HSM per sbloccare l'unità crittografata" @@ -798,14 +801,14 @@ msgid "Configured {} interfaces" msgstr "Interfacce {} configurate" msgid "This option enables the number of parallel downloads that can occur during installation" -msgstr "Questa opzione consente di impostare il numero di download paralleli che possono avvenire durante l'installazione" +msgstr "Questa opzione consente di impostare il numero di download in parallelo che possono avvenire durante l'installazione" msgid "" "Enter the number of parallel downloads to be enabled.\n" " (Enter a value between 1 to {})\n" "Note:" msgstr "" -"Inserisci il numero di download paralleli da abilitare.\n" +"Inserisci il numero di download in parallelo da abilitare.\n" " (Inserisci un valore compreso tra 1 e {})\n" "Nota:" @@ -816,20 +819,33 @@ msgid " - Minimum value : 1 ( Allows 1 parallel download, allows 2 downloads a msgstr " - Valore minimo : 1 ( Consente 1 download parallelo, consente 2 download alla volta )" msgid " - Disable/Default : 0 ( Disables parallel downloading, allows only 1 download at a time )" -msgstr " - Disabilita/Predefinito : 0 ( Disabilita il download parallelo, consente solo 1 download alla volta )" +msgstr " - Disabilita/Predefinito : 0 ( Disabilita il download in parallelo, consente solo 1 download alla volta )" #, python-brace-format msgid "Invalid input! Try again with a valid input [1 to {max_downloads}, or 0 to disable]" msgstr "Input non valido! Riprova con un input valido [da 1 a {max_downloads}, o 0 per disabilitare]." msgid "Parallel Downloads" -msgstr "Download paralleli" +msgstr "Download in parallelo" + +msgid "Pacman" +msgstr "Pacman" + +msgid "Color" +msgstr "Colore" + +#, python-brace-format +msgid "Enter the number of parallel downloads (1-{})" +msgstr "Inserisci il numero di download in parallelo (1-{})" + +msgid "Enable colored output for pacman" +msgstr "Attiva l'output colorato di pacman" msgid "ESC to skip" msgstr "ESC per saltare" msgid "CTRL+C to reset" -msgstr "CTRL+C per resettare" +msgstr "CTRL+C per ripristinare" msgid "TAB to select" msgstr "TAB per selezionare" @@ -861,27 +877,27 @@ msgid "Select one or more devices to use and configure" msgstr "Seleziona uno o più dispositivi da utilizzare e configurare" msgid "If you reset the device selection this will also reset the current disk layout. Are you sure?" -msgstr "Se si ripristina la selezione del disco rigido, verrà ripristinato anche il layout del disco corrente. Sei sicuro?" +msgstr "Se ripristini la selezione del dispositivo, verrà ripristinato anche il layout del disco corrente. Sei sicuro?" msgid "Existing Partitions" msgstr "Partizioni esistenti" msgid "Select a partitioning option" -msgstr "Selezione opzione di partizionamento" +msgstr "Seleziona un'opzione di partizionamento" msgid "Enter the root directory of the mounted devices: " msgstr "Inserisci la cartella principale dei dispositivi montati: " #, python-brace-format msgid "Minimum capacity for /home partition: {}GiB\n" -msgstr "Capacità minima per la partizione /home: {}GiB\n" +msgstr "Capacità minima per la partizione /home: {} GiB\n" #, python-brace-format msgid "Minimum capacity for Arch Linux partition: {}GiB" -msgstr "Capacità minima per la partizione Arch Linux: {}GiB" +msgstr "Capacità minima per la partizione Arch Linux: {} GiB" msgid "This is a list of pre-programmed profiles_bck, they might make it easier to install things like desktop environments" -msgstr "Questo è un elenco di profili pre-programmati, che potrebbero semplificare l'installazione di elementi come gli ambienti desktop" +msgstr "Questo è un elenco di profiles_bck preprogrammati, che potrebbero semplificare l'installazione di elementi come gli ambienti desktop" msgid "Current profile selection" msgstr "Selezione profilo corrente" @@ -890,7 +906,7 @@ msgid "Remove all newly added partitions" msgstr "Elimina tutte le partizioni appena aggiunte" msgid "Assign mountpoint" -msgstr "Assegna punto di mount" +msgstr "Assegna punto di montaggio" msgid "Mark/Unmark to be formatted (wipes data)" msgstr "Seleziona/Deseleziona come da formattare (cancella i dati)" @@ -917,13 +933,13 @@ msgid "This partition is currently encrypted, to format it a filesystem has to b msgstr "Questa partizione è attualmente crittografata, per formattarla è necessario specificare un filesystem" msgid "Partition mount-points are relative to inside the installation, the boot would be /boot as an example." -msgstr "I punti di mount della partizione sono relativi all'interno dell'installazione, l'avvio sarebbe per esempio /boot." +msgstr "I punti di montaggio della partizione sono relativi all'interno dell'installazione, l'avvio sarebbe per esempio /boot." msgid "If mountpoint /boot is set, then the partition will also be marked as bootable." -msgstr "Se il punto di mount /boot è impostato, anche la partizione sarà contrassegnata come avviabile." +msgstr "Se il punto di montaggio /boot è impostato, anche la partizione sarà contrassegnata come avviabile." msgid "Mountpoint: " -msgstr "Punto di mount: " +msgstr "Punto di montaggio: " msgid "Current free sectors on device {}:" msgstr "Settori attualmente liberi sul dispositivo {}:" @@ -985,7 +1001,7 @@ msgid "Partitions to be encrypted" msgstr "Partizioni da crittografare" msgid "Select disk encryption option" -msgstr "Selezione opzione per crittografia disco" +msgstr "Seleziona un'opzione per la crittografia del disco" msgid "Select a FIDO2 device to use for HSM" msgstr "Seleziona un dispositivo FIDO2 da utilizzare per HSM" @@ -1028,7 +1044,7 @@ msgid "Back" msgstr "Indietro" msgid "Please chose which greeter to install for the chosen profiles: {}" -msgstr "Scegli quale greeter installare per i profili scelti: {}" +msgstr "Scegli il greeter da installare per i profili scelti: {}" #, python-brace-format msgid "Environment type: {}" @@ -1075,7 +1091,7 @@ msgstr "" "Seleziona un driver grafico o lascia vuoto per installare tutti i driver open source" msgid "Sway needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" -msgstr "Sway ha bisogno dell’accesso al tuo posto (insieme di dispositivi hardware, ad esempio tastiera, mouse, ecc.)" +msgstr "Sway richiede l’accesso al tuo posto (insieme di dispositivi hardware, ad esempio tastiera, mouse, ecc.)" msgid "" "\n" @@ -1093,13 +1109,13 @@ msgid "Greeter" msgstr "Greeter" msgid "Please chose which greeter to install" -msgstr "Scegli quale greeter installare" +msgstr "Scegli il greeter da installare" msgid "This is a list of pre-programmed default_profiles" msgstr "Questo è un elenco di default_profiles preprogrammati" msgid "Disk configuration" -msgstr "Configurazione disco" +msgstr "Configurazione del disco" msgid "Profiles" msgstr "Profili" @@ -1144,7 +1160,7 @@ msgid "" "Enter a directory for the configuration(s) to be saved (tab completion enabled)\n" "Save directory: " msgstr "" -"Inserisci una cartella in cui salvare le configurazioni (completamento col tasto tab abilitato)\n" +"Inserisci una cartella in cui salvare le configurazioni (completamento col tasto tab attivo)\n" "Cartella di salvataggio: " msgid "" @@ -1166,7 +1182,7 @@ msgid "Mirror regions" msgstr "Regione dei mirror" msgid " - Maximum value : {} ( Allows {} parallel downloads, allows {max_downloads+1} downloads at a time )" -msgstr " - Valore massimo : {} ( Consente {} download paralleli, consente {max_downloads+1} downloads alla volta )" +msgstr " - Valore massimo : {} ( Consente {} download in parallelo, consente {max_downloads+1} download alla volta )" msgid "Invalid input! Try again with a valid input [1 to {}, or 0 to disable]" msgstr "Input non valido! Riprova con un input valido [da 1 a {}, o 0 per disabilitare]." @@ -1208,33 +1224,48 @@ msgstr "Prodotto" msgid "Invalid configuration: {error}" msgstr "Configurazione non valida: {error}" +msgid "Ready to install" +msgstr "Pronto per l'installazione" + +msgid "Disks" +msgstr "Dischi" + +msgid "Packages" +msgstr "Pacchetti" + +msgid "Network" +msgstr "Rete" + +msgid "Locale" +msgstr "Localizzazione" + msgid "Type" msgstr "Tipo" msgid "This option enables the number of parallel downloads that can occur during package downloads" -msgstr "Questa opzione consente di impostare il numero di download paralleli che possono avvenire durante l'installazione" +msgstr "Questa opzione consente di impostare il numero di download in parallelo che possono avvenire durante l'installazione" msgid "" "Enter the number of parallel downloads to be enabled.\n" "\n" "Note:\n" msgstr "" -"Inserisci il numero di download paralleli da abilitare.\n" +"Inserisci il numero di download in parallelo da abilitare.\n" "\n" "Nota:\n" #, python-brace-format msgid " - Maximum recommended value : {} ( Allows {} parallel downloads at a time )" -msgstr " - Valore massimo raccomandato : {} ( Consente {} download paralleli)" +msgstr " - Valore massimo raccomandato : {} ( Consente {} download in parallelo)" msgid " - Disable/Default : 0 ( Disables parallel downloading, allows only 1 download at a time )\n" -msgstr " - Disabilita/Predefinito : 0 ( Disabilita il download parallelo, consente solo 1 download alla volta )\n" +msgstr " - Disabilita/Predefinito : 0 ( Disabilita il download in parallelo, consente solo 1 download alla volta )\n" msgid "Invalid input! Try again with a valid input [or 0 to disable]" msgstr "Input non valido! Riprova con un input valido [0 per disabilitare]." msgid "Hyprland needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" -msgstr "Hyprland ha bisogno dell’accesso al tuo posto (insieme di dispositivi hardware, ad esempio tastiera, mouse, ecc.)" +msgstr "Hyprland richiede l’accesso al tuo posto (insieme di dispositivi hardware, ad esempio tastiera, mouse, ecc.)" msgid "" "\n" @@ -1270,7 +1301,7 @@ msgid "Selected profiles: " msgstr "Profili selezionati: " msgid "Time synchronization not completing, while you wait - check the docs for workarounds: https://archinstall.readthedocs.io/" -msgstr "La sincronizzazione dell’orario non si sta completando, in attesa, leggi la documentazione alla ricerca di una soluzione: https://archinstall.readthedocs.io/" +msgstr "La sincronizzazione dell’orario non si sta completando, mentre aspetti leggi la documentazione alla ricerca di una soluzione: https://archinstall.readthedocs.io/" msgid "Mark/Unmark as nodatacow" msgstr "Seleziona/Deseleziona come nodatacow" @@ -1322,7 +1353,7 @@ msgid "LVM volumes to be encrypted" msgstr "Volumi LVM da crittografare" msgid "Select which LVM volumes to encrypt" -msgstr "Seleziona volumi LVM da crittografare" +msgstr "Seleziona i volumi LVM da crittografare" msgid "Default layout" msgstr "Layout predefinito" @@ -1361,7 +1392,7 @@ msgid "Seat access" msgstr "Accesso al posto" msgid "Mountpoint" -msgstr "Punto di mount" +msgstr "Punto di montaggio" msgid "HSM" msgstr "HSM" @@ -1479,7 +1510,7 @@ msgid "Directory" msgstr "Cartella" msgid "Enter a directory for the configuration(s) to be saved (tab completion enabled)" -msgstr "Inserisci una cartella in cui salvare le configurazioni (completamento col tasto tab abilitato)" +msgstr "Inserisci una cartella in cui salvare le configurazioni (completamento col tasto tab attivo)" #, python-brace-format msgid "Do you want to save the configuration file(s) to {}?" @@ -1513,7 +1544,7 @@ msgid "Choose an option to give Hyprland access to your hardware" msgstr "Scegli un’opzione per concedere a Hyprland l'accesso al tuo hardware" msgid "Additional repositories" -msgstr "Repository aggiuntive" +msgstr "Repository aggiuntivi" msgid "NTP" msgstr "NTP" @@ -1543,7 +1574,7 @@ msgid "HSM device" msgstr "Dispositivo HSM" msgid "Some packages could not be found in the repository" -msgstr "Alcuni pacchetti non sono stati trovati nella repository" +msgstr "Alcuni pacchetti non sono stati trovati nel repository" msgid "User" msgstr "Utente" @@ -1564,16 +1595,16 @@ msgid "Select any packages from the below list that should be installed addition msgstr "Seleziona dalla lista sotto i pacchetti aggiuntivi da installare" msgid "Add a custom repository" -msgstr "Aggiungi una repository personalizzata" +msgstr "Aggiungi un repository personalizzato" msgid "Change custom repository" -msgstr "Cambia repository personalizzata" +msgstr "Cambia repository personalizzato" msgid "Delete custom repository" -msgstr "Elimina repository personalizzata" +msgstr "Elimina repository personalizzato" msgid "Repository name" -msgstr "Nome repository" +msgstr "Nome del repository" msgid "Add a custom server" msgstr "Aggiungi un server personalizzato" @@ -1594,7 +1625,7 @@ msgid "Add custom servers" msgstr "Aggiungi server personalizzati" msgid "Add custom repository" -msgstr "Aggiungi repository personalizzate" +msgstr "Aggiungi repository personalizzato" msgid "Loading mirror regions..." msgstr "Caricamento regioni dei mirror in corso..." @@ -1609,7 +1640,7 @@ msgid "Custom servers" msgstr "Server personalizzati" msgid "Custom repositories" -msgstr "Repository personalizzate" +msgstr "Repository personalizzati" msgid "Only ASCII characters are supported" msgstr "Sono supportati solo caratteri ASCII" @@ -1756,7 +1787,7 @@ msgid "Toggle option" msgstr "Opzioni di attivazione" msgid "Scroll Up" -msgstr "Scorri Su" +msgstr "Scorri su" msgid "Scroll Down" msgstr "Scorri giù" @@ -1783,13 +1814,13 @@ msgid "Copy selected text" msgstr "Copia il testo selezionato" msgid "labwc needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" -msgstr "labwc ha bisogno dell’accesso al tuo posto (insieme di dispositivi hardware, ad esempio tastiera, mouse, ecc.)" +msgstr "labwc richiede l’accesso al tuo posto (insieme di dispositivi hardware, ad esempio tastiera, mouse, ecc.)" msgid "Choose an option to give labwc access to your hardware" msgstr "Scegli un’opzione per concedere a labwc l’accesso al tuo hardware" msgid "niri needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" -msgstr "niri ha bisogno dell’accesso al tuo posto (insieme di dispositivi hardware, ad esempio tastiera, mouse, ecc.)" +msgstr "niri richiede l’accesso al tuo posto (insieme di dispositivi hardware, ad esempio tastiera, mouse, ecc.)" msgid "Choose an option to give niri access to your hardware" msgstr "Scegli un’opzione per concedere a niri l’accesso al tuo hardware" @@ -1832,7 +1863,7 @@ msgid "Do you want to encrypt the user_credentials.json file?" msgstr "Vuoi criptare il file di user_credentials.json?" msgid "Credentials file encryption password" -msgstr "Password di crittazione del file delle credenziali" +msgstr "Password di crittografia del file delle credenziali" #, python-brace-format msgid "Repositories: {}" @@ -1917,7 +1948,7 @@ msgid "No network connection found" msgstr "Nessuna connessione di rete trovata" msgid "Would you like to connect to a Wifi?" -msgstr "Desideri connetterti ad una Wi-FI?" +msgstr "Desideri connetterti ad una Wi-Fi?" msgid "No wifi interface found" msgstr "Nessuna interfaccia Wi-Fi trovata" @@ -2000,11 +2031,26 @@ msgstr "Usa NetworkManager (backend iwd)" msgid "Firewall" msgstr "Firewall" +msgid "Additional fonts" +msgstr "Font aggiuntivi" + +msgid "Select font packages to install" +msgstr "Seleziona i pacchetti di font da installare" + +msgid "Unicode font coverage for most languages" +msgstr "Copertura Unicode del font per la maggior parte delle lingue" + +msgid "color emoji for browsers and apps" +msgstr "emoji a colori per browser e app" + +msgid "Chinese, Japanese, Korean characters" +msgstr "Caratteri cinesi, giapponesi, coreani" + msgid "Select audio configuration" msgstr "Seleziona la configurazione audio" msgid "Enter credentials file decryption password" -msgstr "Inserici la password di decrittazione del file delle credenziali" +msgstr "Inserisci la password di decrittazione del file delle credenziali" msgid "Enter root password" msgstr "Inserisci la password di root" @@ -2025,7 +2071,7 @@ msgid "Select disks for the installation" msgstr "Seleziona il disco per l'installazione" msgid "Enter a mountpoint" -msgstr "Inserisci un punto di mount" +msgstr "Inserisci un punto di montaggio" #, python-brace-format msgid "Enter a size (default: {}): " @@ -2035,7 +2081,7 @@ msgid "Enter subvolume name" msgstr "Inserisci il nome del sottovolume" msgid "Enter subvolume mountpoint" -msgstr "Inserisci il punto di mount del sottovolume" +msgstr "Inserisci il punto di montaggio del sottovolume" msgid "Select a disk configuration" msgstr "Seleziona una configurazione del disco" @@ -2047,7 +2093,7 @@ msgid "You will use whatever drive-setup is mounted at the specified directory" msgstr "Userai qualunque configurazione del disco che sia montata nella cartella specificata" msgid "WARNING: Archinstall won't check the suitability of this setup" -msgstr "ATTENZIONE: Archinstall non verificherà la compatibilità di di questa configurazione" +msgstr "ATTENZIONE: Archinstall non verificherà la compatibilità di questa configurazione" msgid "Select main filesystem" msgstr "Seleziona il filesystem principale" @@ -2066,22 +2112,22 @@ msgid "Value must be between 1 and {}" msgstr "Il valore deve essere tra 1 e {}" msgid "Select which kernel(s) to install" -msgstr "Scegli quali kernel installare" +msgstr "Seleziona i kernel da installare" msgid "Enter a respository name" msgstr "Inserisci il nome di un repository" msgid "Enter the repository url" -msgstr "Inserisci l'URL della repository" +msgstr "Inserisci l'URL del repository" msgid "Enter server url" msgstr "Inserisci l'URL del server" msgid "Select mirror regions to be enabled" -msgstr "Seleziona quali regioni dei mirror abilitare" +msgstr "Seleziona le regioni dei mirror da abilitare" msgid "Select optional repositories to be enabled" -msgstr "Seleziona quali repository aggiuntive opzionali abilitare" +msgstr "Seleziona i repository opzionali da abilitare" msgid "Select an interface" msgstr "Seleziona un'interfaccia" @@ -2089,11 +2135,17 @@ msgstr "Seleziona un'interfaccia" msgid "Choose network configuration" msgstr "Scegli la configurazione di rete" +msgid "Recommended: Network Manager for desktop, Manual for server" +msgstr "Raccomandato: Network Manager per computer, Manuale per server" + +msgid "Warning: no network configuration selected. Network will need to be set up manually on the installed system." +msgstr "Attenzione: nessuna configurazione di rete selezionata. La rete dovrà essere impostata manualmente sul sistema installato." + msgid "No packages found" msgstr "Nessun pacchetto trovato" msgid "Select which greeter to install" -msgstr "Seleziona quale greeter installare" +msgstr "Seleziona il greeter da installare" msgid "Select a profile type" msgstr "Seleziona un tipo di profilo" @@ -2126,6 +2178,9 @@ msgstr "Il profilo desktop selezionato richiede un utente regolare per accedere msgid "Environment type: {} {}" msgstr "Tipo di ambiente: {} {}" +msgid "Input cannot be empty" +msgstr "Il campo non può essere vuoto" + msgid "Recommended" msgstr "Raccomandato" @@ -2156,5 +2211,194 @@ msgstr "Descrizione" msgid "Select a flavor of KDE Plasma to install" msgstr "Seleziona la configurazione di KDE Plasma da installare" -msgid "Input cannot be empty" -msgstr "Il campo non può essere vuoto" +msgid "Arial/Times/Courier replacement, Cyrillic support for Steam/games" +msgstr "Sostituto di Arial/Times/Courier, supporta il cirillico per Steam/giochi" + +msgid "wide Unicode coverage, good fallback font" +msgstr "ampia copertura Unicode, ottimo font di riserva" + +#, python-brace-format +msgid "Setting up U2F login: {u2f_config.u2f_login_method.value}" +msgstr "Impostazione accesso U2F: {u2f_config.u2f_login_method.value}" + +#, python-brace-format +msgid "Default: {DEFAULT_ITER_TIME}ms, Recommended range: 1000-60000" +msgstr "Predefinito: {DEFAULT_ITER_TIME} ms, Intervallo consigliato: 1000-60000" + +#, python-brace-format +msgid "Setting up U2F login: {}" +msgstr "Impostazione accesso U2F: {}" + +#, python-brace-format +msgid "Default: {}ms, Recommended range: 1000-60000" +msgstr "Predefinito: {} ms, Intervallo consigliato: 1000-60000" + +#, python-brace-format +msgid "{} needs access to your seat" +msgstr "{} richiede l’accesso al tuo posto" + +msgid "collection of hardware devices i.e. keyboard, mouse" +msgstr "insieme di dispositivi hardware, ad esempio tastiera e mouse" + +#, python-brace-format +msgid "Choose an option how to give {} access to your hardware" +msgstr "Scegli un’opzione per concedere a {} l’accesso al tuo hardware" + +#, python-brace-format +msgid "About to upload \"{}\" to the publicly accessible {}" +msgstr "\"{}\" sta per essere caricato per essere pubblicamente accessibile {}" + +msgid "Do you want to continue?" +msgstr "Vuoi continuare?" + +#, python-brace-format +msgid "Log uploaded successfully. URL: {}" +msgstr "Log caricato con successo. URL: {}" + +msgid "Failed to upload log." +msgstr "Impossibile caricare il log." + +msgid "ArchInstall Language" +msgstr "Lingua di ArchInstall" + +msgid "Version" +msgstr "Versione" + +msgid "Installation Script" +msgstr "Script di installazione" + +msgid "Application" +msgstr "Applicazione" + +msgid "Services" +msgstr "Servizi" + +msgid "Custom commands" +msgstr "Comandi personalizzati" + +msgid "Users" +msgstr "Utenti" + +msgid "Root encrypted password" +msgstr "Password di root crittografata" + +msgid "Zram enabled" +msgstr "Zram attiva" + +#, python-brace-format +msgid "Zram algorithm {}" +msgstr "Algoritmo Zram {}" + +msgid "Bluetooth enabled" +msgstr "Bluetooth attivo" + +#, python-brace-format +msgid "Audio server \"{}\"" +msgstr "Server audio \"{}\"" + +#, python-brace-format +msgid "Power management \"{}\"" +msgstr "Gestione energetica \"{}\"" + +msgid "Print service enabled" +msgstr "Servizio di stampa attivo" + +#, python-brace-format +msgid "Firewall \"{}\"" +msgstr "Firewall \"{}\"" + +#, python-brace-format +msgid "Extra fonts \"{}\"" +msgstr "Font aggiuntivi \"{}\"" + +msgid "Root password set" +msgstr "Imposta la password di root" + +#, python-brace-format +msgid "Configured {} user(s)" +msgstr "{} utente/i configurato/i" + +msgid "U2F set up" +msgstr "Imposta U2F" + +#, python-brace-format +msgid "Bootloader \"{}\"" +msgstr "Bootloader \"{}\"" + +msgid "UKI enabled" +msgstr "UKI attiva" + +msgid "Default" +msgstr "Predefinito" + +msgid "Manual" +msgstr "Manuale" + +msgid "Pre-mount" +msgstr "Premontaggio" + +#, python-brace-format +msgid "{} layout" +msgstr "Layout {}" + +#, python-brace-format +msgid "Devices {}" +msgstr "Dispositivi {}" + +msgid "LVM set up" +msgstr "Imposta LVM" + +#, python-brace-format +msgid "{} encryption" +msgstr "Crittografia {}" + +#, python-brace-format +msgid "Btrfs snapshot \"{}\"" +msgstr "Snapshot Btrfs \"{}\"" + +#, python-brace-format +msgid "Keyboard layout \"{}\"" +msgstr "Layout della tastiera \"{}\"" + +#, python-brace-format +msgid "Locale language \"{}\"" +msgstr "Lingua \"{}\"" + +#, python-brace-format +msgid "Locale encoding \"{}\"" +msgstr "Codifica \"{}\"" + +#, python-brace-format +msgid "Console font \"{}\"" +msgstr "Font della console \"{}\"" + +#, python-brace-format +msgid "Mirror regions \"{}\"" +msgstr "Regioni dei mirror \"{}\"" + +#, python-brace-format +msgid "Optional repositories \"{}\"" +msgstr "Repository opzionali \"{}\"" + +msgid "Custom servers set up" +msgstr "Imposta server personalizzati" + +msgid "Custom repositories set up" +msgstr "Imposta repository personalizzati" + +msgid "Use standalone iwd" +msgstr "Usa iwd standalone" + +msgid "Color enabled" +msgstr "Colore attivo" + +#, python-brace-format +msgid "{} grphics driver" +msgstr "Driver grafici {}" + +#, python-brace-format +msgid "{} greeter" +msgstr "Greeter {}" + +msgid "Enter a repository name" +msgstr "Inserisci il nome di un repository" diff --git a/archinstall/locales/ja/LC_MESSAGES/base.mo b/archinstall/locales/ja/LC_MESSAGES/base.mo index 3ad3d1a2..0331225b 100644 Binary files a/archinstall/locales/ja/LC_MESSAGES/base.mo and b/archinstall/locales/ja/LC_MESSAGES/base.mo differ diff --git a/archinstall/locales/ja/LC_MESSAGES/base.po b/archinstall/locales/ja/LC_MESSAGES/base.po index 8919d213..162f5dba 100644 --- a/archinstall/locales/ja/LC_MESSAGES/base.po +++ b/archinstall/locales/ja/LC_MESSAGES/base.po @@ -11,865 +11,366 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 3.8\n" -msgid "[!] A log file has been created here: {} {}" -msgstr "[!] ここにログファイルが作成されました: {} {}" +msgid "Recommended" +msgstr "推奨" -msgid " Please submit this issue (and file) to https://github.com/archlinux/archinstall/issues" -msgstr " この問題（およびファイル）を https://github.com/archlinux/archinstall/issues に送信してください" +msgid "Package" +msgstr "パッケージ" -msgid "Do you really want to abort?" -msgstr "本当に中止しますか？" +msgid "Curated selection of KDE Plasma packages" +msgstr "厳選した KDE Plasma パッケージ" -msgid "And one more time for verification: " -msgstr "確認のためにもう1度: " +msgid "Dependencies" +msgstr "依存関係" -msgid "Would you like to use swap on zram?" -msgstr "zram でスワップを使用しますか？" +msgid "Package group" +msgstr "パッケージグループ" -msgid "Desired hostname for the installation: " -msgstr "インストール時のホスト名: " +msgid "Extensive KDE Plasma installation" +msgstr "広範囲の KDE Plasma インストール" -msgid "Username for required superuser with sudo privileges: " -msgstr "sudo 権限を持つスーパーユーザーのユーザー名: " +msgid "Packages in group" +msgstr "グループ内のパッケージ" -msgid "Any additional users to install (leave blank for no users): " -msgstr "インストールする追加のユーザー（ユーザーがない場合は無記入）: " +msgid "Minimal KDE Plasma installation" +msgstr "最小限の KDE Plasma インストール" -msgid "Should this user be a superuser (sudoer)?" -msgstr "このユーザーはスーパーユーザーに昇格しますか（sudoer）？" +msgid "Type" +msgstr "タイプ" -msgid "Select a timezone" -msgstr "タイムゾーンを選択" +msgid "Description" +msgstr "説明" -msgid "Would you like to use GRUB as a bootloader instead of systemd-boot?" -msgstr "systemd-boot の代わりに GRUB をブートローダーとして使用しますか？" - -msgid "Choose a bootloader" -msgstr "ブートローダーを選択" - -msgid "Choose an audio server" -msgstr "オーディオサーバーを選択" - -msgid "Only packages such as base, base-devel, linux, linux-firmware, efibootmgr and optional profile packages are installed." -msgstr "base, base-devel, linux, linux-firmware, efibootmgr などのパッケージとオプションのプロファイルパッケージのみがインストールされます。" - -msgid "Note: base-devel is no longer installed by default. Add it here if you need build tools." -msgstr "注意: base-devel はデフォルトではインストールされなくなりました。ビルドツールが必要な場合は、ここで追加してください。" - -msgid "If you desire a web browser, such as firefox or chromium, you may specify it in the following prompt." -msgstr "firefox や chromium などのウェブブラウザーをインストールする場合は、次のプロンプトで指定できます。" - -msgid "Write additional packages to install (space separated, leave blank to skip): " -msgstr "追加でインストールするパッケージを書く（スペースで区切る。無記入でスキップ）: " - -msgid "Copy ISO network configuration to installation" -msgstr "ISO ネットワーク設定をインストール環境にコピー" - -msgid "Use NetworkManager (necessary for configuring internet graphically in GNOME and KDE)" -msgstr "NetworkManager を使用（GNOME と KDE でインターネットをグラフィカルに設定するのに必要）" - -msgid "Select one network interface to configure" -msgstr "設定するネットワークインターフェイスを 1 つ選択" - -msgid "Select which mode to configure for \"{}\" or skip to use default mode \"{}\"" -msgstr "どのモードを \"{}\" に設定するかを選択。スキップでデフォルトモード \"{}\" を使用" +msgid "Select a flavor of KDE Plasma to install" +msgstr "インストールする KDE Plasma のバージョンを選択" #, python-brace-format -msgid "Enter the IP and subnet for {} (example: 192.168.0.5/24): " -msgstr "{} の IP とサブネットを入力（例: 192.168.0.5/24）: " +msgid "{} needs access to your seat" +msgstr "{} はお使いの Seat へのアクセスを必要とします" -msgid "Enter your gateway (router) IP address or leave blank for none: " -msgstr "ゲートウェイ（ルーター）の IP アドレスを入力。無い場合は無記入: " +msgid "collection of hardware devices i.e. keyboard, mouse" +msgstr "ハードウェアデバイス群。キーボード、マウスなど" -msgid "Enter your DNS servers (space separated, blank for none): " -msgstr "DNS サーバーを入力（スペースで区切る。無い場合は無記入）: " +#, python-brace-format +msgid "Choose an option how to give {} access to your hardware" +msgstr "{} にハードウェアへのアクセスを許可する方法を選択" -msgid "Select which filesystem your main partition should use" -msgstr "メインパーティションで使用するファイルシステムを選択" +#, python-brace-format +msgid "Environment type: {} {}" +msgstr "環境タイプ: {} {}" -msgid "Current partition layout" -msgstr "現在のパーティションレイアウト" +#, python-brace-format +msgid "Environment type: {}" +msgstr "環境タイプ: {}" -msgid "" -"Select what to do with\n" -"{}" -msgstr "" -"何をするか選択\n" -"{}" +msgid "Installed packages" +msgstr "インストールするパッケージ" -msgid "Enter a desired filesystem type for the partition" -msgstr "パーティションのファイルシステムを入力" - -msgid "Enter the start location (in parted units: s, GB, %, etc. ; default: {}): " -msgstr "開始場所を入力（単位: s, GB, % など。デフォルト: {}）: " - -msgid "Enter the end location (in parted units: s, GB, %, etc. ; ex: {}): " -msgstr "終了場所を入力（単位: s, GB, % など。例: {}）: " - -msgid "{} contains queued partitions, this will remove those, are you sure?" -msgstr "{} にはキューに入っているパーティションが含まれます。それらが削除されますがよろしいですか？" - -msgid "" -"{}\n" -"\n" -"Select by index which partitions to delete" -msgstr "" -"{}\n" -"\n" -"削除するパーティションをインデックスで選択" - -msgid "" -"{}\n" -"\n" -"Select by index which partition to mount where" -msgstr "" -"{}\n" -"\n" -"どのパーティションをどこにマウントするかをインデックスで選択" - -msgid " * Partition mount-points are relative to inside the installation, the boot would be /boot as an example." -msgstr "* パーティションのマウントポイントはインストールにおける相対的なものであり、例として boot は /boot になります。" - -msgid "Select where to mount partition (leave blank to remove mountpoint): " -msgstr "パーティションをマウントする場所を選択（無記入でマウントポイントを削除）: " - -msgid "" -"{}\n" -"\n" -"Select which partition to mask for formatting" -msgstr "" -"{}\n" -"\n" -"フォーマット対象としてマークするパーティションを選択" - -msgid "" -"{}\n" -"\n" -"Select which partition to mark as encrypted" -msgstr "" -"{}\n" -"\n" -"暗号化対象としてマークするパーティションを選択" - -msgid "" -"{}\n" -"\n" -"Select which partition to mark as bootable" -msgstr "" -"{}\n" -"\n" -"ブータブルとしてマークするパーティションを選択" - -msgid "" -"{}\n" -"\n" -"Select which partition to set a filesystem on" -msgstr "" -"{}\n" -"\n" -"ファイルシステムを設定するパーティションを選択" - -msgid "Enter a desired filesystem type for the partition: " -msgstr "パーティションのファイルシステムを入力: " - -msgid "Archinstall language" -msgstr "Archinstall の言語" - -msgid "Wipe all selected drives and use a best-effort default partition layout" -msgstr "選択したすべてのドライブを消去し、ベストエフォートのデフォルトパーティションレイアウトを使用する" - -msgid "Select what to do with each individual drive (followed by partition usage)" -msgstr "個々のドライブをどうするかを選択（次にパーティションの使用方法が続く）" - -msgid "Select what you wish to do with the selected block devices" -msgstr "選択したブロックデバイスで何をするかを選択" - -msgid "This is a list of pre-programmed profiles, they might make it easier to install things like desktop environments" -msgstr "これは事前にプログラムされたプロファイルのリストです。デスクトップ環境などのインストールが簡単になる可能性があります" - -msgid "Select keyboard layout" -msgstr "キーボードレイアウトを選択" - -msgid "Select one of the regions to download packages from" -msgstr "パッケージをダウンロードする地域を 1 つ選択" - -msgid "Select one or more hard drives to use and configure" -msgstr "使用・設定する 1 つ以上のハードドライブを選択" - -msgid "For the best compatibility with your AMD hardware, you may want to use either the all open-source or AMD / ATI options." -msgstr "AMD ハードウェアとの互換性を最大限に高めるには、すべてのオープンソースまたは AMD/ATI オプションのいずれかを使用することをお勧めします。" - -msgid "For the best compatibility with your Intel hardware, you may want to use either the all open-source or Intel options.\n" -msgstr "Intel ハードウェアとの互換性を最大限に高めるには、すべてのオープンソースまたは Intel オプションのいずれかを使用することをお勧めします。\n" - -msgid "For the best compatibility with your Nvidia hardware, you may want to use the Nvidia proprietary driver.\n" -msgstr "Nvidia ハードウェアとの互換性を最大限に高めるには、Nvidia 独自のドライバーを使用することをお勧めします。\n" - -msgid "" -"\n" -"\n" -"Select a graphics driver or leave blank to install all open-source drivers" -msgstr "" -"\n" -"\n" -"グラフィックドライバーを選択するか、無記入ですべてのオープンソースドライバーをインストール" - -msgid "All open-source (default)" -msgstr "すべてのオープンソース（デフォルト）" - -msgid "Choose which kernels to use or leave blank for default \"{}\"" -msgstr "使用するカーネルを選択。無記入でデフォルトの \"{}\"" - -msgid "Choose which locale language to use" -msgstr "使用するロケール言語を選択" - -msgid "Choose which locale encoding to use" -msgstr "使用するロケール エンコーディングを選択" - -msgid "Select one of the values shown below: " -msgstr "以下の値のいずれかを選択: " - -msgid "Select one or more of the options below: " -msgstr "以下のオプションを 1 つ以上選択: " - -msgid "Adding partition...." -msgstr "パーティションを追加...." - -msgid "You need to enter a valid fs-type in order to continue. See `man parted` for valid fs-type's." -msgstr "続行するには、有効な fs-type を入力する必要があります。有効な fs-type については、 `man parted` を参照してください。" - -msgid "Error: Listing profiles on URL \"{}\" resulted in:" -msgstr "エラー: URL \"{}\" のプロファイルをリストすると、次の結果が発生:" - -msgid "Error: Could not decode \"{}\" result as JSON:" -msgstr "エラー: \"{}\" の結果を JSON としてデコードできませんでした:" - -msgid "Keyboard layout" -msgstr "キーボードレイアウト" - -msgid "Mirror region" -msgstr "ミラーの地域" - -msgid "Locale language" -msgstr "ロケール言語" - -msgid "Locale encoding" -msgstr "ロケールエンコーディング" - -msgid "Drive(s)" -msgstr "ドライブ" - -msgid "Disk layout" -msgstr "ディスクレイアウト" - -msgid "Encryption password" -msgstr "暗号化パスワード" - -msgid "Swap" -msgstr "スワップ" - -msgid "Bootloader" -msgstr "ブートローダー" - -msgid "Root password" -msgstr "root パスワード" - -msgid "Superuser account" -msgstr "スーパーユーザーアカウント" - -msgid "User account" -msgstr "ユーザーアカウント" - -msgid "Profile" -msgstr "プロファイル" +msgid "Bluetooth" +msgstr "Bluetooth" msgid "Audio" msgstr "オーディオ" -msgid "Kernels" -msgstr "カーネル" +msgid "Print service" +msgstr "印刷サービス" -msgid "Additional packages" -msgstr "追加パッケージ" +msgid "Power management" +msgstr "電力管理" -msgid "Network configuration" -msgstr "ネットワーク設定" +msgid "Firewall" +msgstr "ファイアウォール" -msgid "Automatic time sync (NTP)" -msgstr "時刻の自動同期（NTP）" +msgid "Additional fonts" +msgstr "追加フォント" -msgid "Install ({} config(s) missing)" -msgstr "インストール（{} 個の設定がありません）" +msgid "Enabled" +msgstr "有効" -msgid "" -"You decided to skip harddrive selection\n" -"and will use whatever drive-setup is mounted at {} (experimental)\n" -"WARNING: Archinstall won't check the suitability of this setup\n" -"Do you wish to continue?" -msgstr "" -"ハードドライブの選択をスキップし、\n" -"{} にマウントしているドライブのセットアップを使用します（実験的）\n" -"警告: Archinstall はこのセットアップの適合性をチェックしません\n" -"続行しますか？" +msgid "Disabled" +msgstr "無効" -msgid "Re-using partition instance: {}" -msgstr "パーティションインスタンスの再利用: {}" +msgid "Would you like to configure Bluetooth?" +msgstr "Bluetooth を設定しますか？" -msgid "Create a new partition" -msgstr "新しいパーティションを作成" +msgid "Would you like to configure the print service?" +msgstr "印刷サービスを設定しますか？" -msgid "Delete a partition" -msgstr "パーティションを削除" +msgid "Select audio configuration" +msgstr "オーディオ設定を選択" -msgid "Clear/Delete all partitions" -msgstr "すべてのパーティションをクリア/削除" +msgid "Select font packages to install" +msgstr "インストールするフォントパッケージを選択" -msgid "Assign mount-point for a partition" -msgstr "パーティションにマウントポイントを割り当てる" +msgid "ArchInstall Language" +msgstr "ArchInstall の言語" -msgid "Mark/Unmark a partition to be formatted (wipes data)" -msgstr "フォーマットするパーティションとしてマーク/マーク解除（データを消去）" +msgid "Version" +msgstr "バージョン" -msgid "Mark/Unmark a partition as encrypted" -msgstr "暗号化するパーティションとしてマーク/マーク解除" +msgid "Installation Script" +msgstr "インストールスクリプト" -msgid "Mark/Unmark a partition as bootable (automatic for /boot)" -msgstr "ブータブルパーティションとしてマーク/マーク解除（/boot の場合は自動）" +msgid "Locales" +msgstr "ロケール" -msgid "Set desired filesystem for a partition" -msgstr "パーティションのファイルシステムを設定" +msgid "Disk configuration" +msgstr "ディスクの設定" -msgid "Abort" -msgstr "中止" +msgid "Profile" +msgstr "プロファイル" + +msgid "Mirrors and repositories" +msgstr "ミラーとリポジトリ" + +msgid "Network" +msgstr "ネットワーク" + +msgid "Bootloader" +msgstr "ブートローダー" + +msgid "Application" +msgstr "アプリケーション" + +msgid "Authentication" +msgstr "認証" + +msgid "Swap" +msgstr "スワップ" msgid "Hostname" msgstr "ホスト名" -msgid "Not configured, unavailable unless setup manually" -msgstr "未設定。手動で設定しない限り使用できません" +msgid "Kernels" +msgstr "カーネル" + +msgid "Automatic time sync (NTP)" +msgstr "時刻の自動同期（NTP）" msgid "Timezone" msgstr "タイムゾーン" -msgid "Set/Modify the below options" -msgstr "以下のオプションを設定/変更" +msgid "Services" +msgstr "サービス" -msgid "Install" -msgstr "インストール" +msgid "Additional packages" +msgstr "追加パッケージ" -msgid "" -"Use ESC to skip\n" -"\n" -msgstr "" -"Esc でスキップ\n" -"\n" +msgid "Pacman" +msgstr "Pacman" -msgid "Suggest partition layout" -msgstr "パーティションレイアウトを提案" +msgid "Custom commands" +msgstr "カスタムコマンド" -msgid "Enter a password: " -msgstr "パスワードを入力: " +msgid "Users" +msgstr "ユーザー" -msgid "Enter a encryption password for {}" -msgstr "{} の暗号化パスワードを入力" +msgid "Root encrypted password" +msgstr "Root 暗号化パスワード" -msgid "Enter disk encryption password (leave blank for no encryption): " -msgstr "ディスクの暗号化パスワードを入力（暗号化しない場合は無記入）: " +msgid "Disk encryption password" +msgstr "ディスク暗号化パスワード" -msgid "Create a required super-user with sudo privileges: " -msgstr "sudo 権限を持つスーパーユーザーを作成: " +msgid "Incorrect credentials file decryption password" +msgstr "認証情報ファイルの復号化パスワードが正しくありません" -msgid "Enter root password (leave blank to disable root): " -msgstr "root パスワードを入力（root を無効にする場合は無記入）: " +msgid "Enter credentials file decryption password" +msgstr "認証情報ファイルの復号パスワードを入力" -msgid "Password for user \"{}\": " -msgstr "ユーザー \"{}\" のパスワード: " +msgid "Incorrect password" +msgstr "パスワードが間違っています" -msgid "Verifying that additional packages exist (this might take a few seconds)" -msgstr "追加のパッケージが存在することを確認（これには数秒かかる場合があります）" +#, python-brace-format +msgid "Setting up U2F login: {}" +msgstr "U2F ログインの設定: {}" -msgid "Would you like to use automatic time synchronization (NTP) with the default time servers?\n" -msgstr "デフォルトのタイムサーバーで時刻の自動同期（NTP）を使用しますか？\n" +#, python-brace-format +msgid "Setting up U2F device for user: {}" +msgstr "ユーザー用 U2F デバイスの設定: {}" -msgid "" -"Hardware time and other post-configuration steps might be required in order for NTP to work.\n" -"For more information, please check the Arch wiki" -msgstr "" -"NTP が機能するには、ハードウェアクロックおよびその他の設定後のステップが必要になる場合があります。\n" -"詳細については Arch wiki を確認してください" +msgid "You may need to enter the PIN and then touch your U2F device to register it" +msgstr "PIN を入力したのち U2F デバイスをタッチして登録しなければならない場合があります" -msgid "Enter a username to create an additional user (leave blank to skip): " -msgstr "ユーザー名を入力して追加ユーザーを作成（無記入でスキップ）: " +msgid "Root password" +msgstr "root パスワード" -msgid "Use ESC to skip\n" -msgstr "Esc でスキップ\n" +msgid "User account" +msgstr "ユーザーアカウント" -msgid "" -"\n" -" Choose an object from the list, and select one of the available actions for it to execute" -msgstr "" -"\n" -"リストからオブジェクトを選択し、そのオブジェクトで実行できるアクションの 1 つを選択" +msgid "U2F login setup" +msgstr "U2F ログインの設定" -msgid "Cancel" -msgstr "キャンセル" +msgid "U2F login method: " +msgstr "U2F ログインメソッド: " -msgid "Confirm and exit" -msgstr "確認して終了" +msgid "Passwordless sudo: " +msgstr "パスワードなしの sudo: " -msgid "Add" -msgstr "追加" +msgid "No U2F devices found" +msgstr "U2F デバイスが見つかりません" -msgid "Copy" -msgstr "コピー" +msgid "Enter root password" +msgstr "root パスワードを入力" -msgid "Edit" -msgstr "編集" +msgid "Enable passwordless sudo?" +msgstr "パスワードなしの sudo を有効にしますか？" -msgid "Delete" -msgstr "削除" +msgid "Unified kernel images" +msgstr "Unified カーネルイメージ" -msgid "Select an action for '{}'" -msgstr "'{}' へのアクションを選択" +msgid "Install to removable location" +msgstr "リムーバブルな場所にインストールする" -msgid "Copy to new key:" -msgstr "新しいキーにコピー:" +msgid "Will install to /EFI/BOOT/ (removable location, safe default)" +msgstr "/EFI/BOOT/（リムーバブルな場所、安全なデフォルト）にインストール" -msgid "Unknown nic type: {}. Possible values are {}" -msgstr "不明な NIC タイプ: {}。可能な値は {}" +msgid "Will install to custom location with NVRAM entry" +msgstr "NVRAM エントリーを使用してカスタムした場所にインストール" -msgid "" -"\n" -"This is your chosen configuration:" -msgstr "" -"\n" -"これが選択した設定です:" +msgid "Would you like to use unified kernel images?" +msgstr "Unified カーネルイメージを使用しますか？" -msgid "Pacman is already running, waiting maximum 10 minutes for it to terminate." -msgstr "Pacman はすでに実行されており、終了するまで最大 10 分間待機します。" +msgid "Would you like to install the bootloader to the default removable media search location?" +msgstr "ブートローダーをデフォルトのリムーバブルメディアの検索場所にインストールしますか？" -msgid "Pre-existing pacman lock never exited. Please clean up any existing pacman sessions before using archinstall." -msgstr "既存の pacman のロックが終了しませんでした。Archinstall を使用する前に、既存の pacman セッションをクリーンアップしてください。" +msgid "This installs the bootloader to /EFI/BOOT/BOOTX64.EFI (or similar) which is useful for:" +msgstr "ブートローダーが /EFI/BOOT/BOOTX64.EFI (または類似の場所) にインストールされ、次の場合に役立ちます:" -msgid "Choose which optional additional repositories to enable" -msgstr "オプションで有効にする追加リポジトリを選択" +msgid "Firmware that does not properly support NVRAM boot entries like most MSI motherboards," +msgstr "ほとんどの MSI マザーボードのように NVRAM ブートエントリーを適切にサポートしていないファームウェア、" -msgid "Add a user" -msgstr "ユーザーを追加" +msgid "most Apple Macs, many laptops..." +msgstr "ほとんどの Apple Mac、多くのラップトップ..." -msgid "Change password" -msgstr "パスワードを変更" +msgid "USB drives or other portable external media." +msgstr "USB ドライブまたは他のポータブル外部メディア。" -msgid "Promote/Demote user" -msgstr "ユーザーを昇格/降格" +msgid "Systems where you want the disk to be bootable on any computer." +msgstr "ディスクをどのコンピューターでも起動できるようにするシステム。" -msgid "Delete User" -msgstr "ユーザーを削除" +msgid "Select bootloader to install" +msgstr "インストールするブートローダーを選択" -msgid "" -"\n" -"Define a new user\n" -msgstr "" -"\n" -"新しいユーザーを定義\n" +msgid "UEFI is not detected and some options are disabled" +msgstr "UEFIが検出されず、一部のオプションが無効になります" -msgid "User Name : " -msgstr "ユーザー名: " +msgid "The specified configuration will be applied" +msgstr "指定された設定が適用されます" -msgid "Should {} be a superuser (sudoer)?" -msgstr "{} はスーパーユーザーに昇格しますか（sudoer）？" +msgid "Would you like to continue?" +msgstr "続行しますか？" -msgid "Define users with sudo privilege: " -msgstr "sudo 権限を持つユーザーを定義: " +msgid "Configuration preview" +msgstr "設定プレビュー" -msgid "No network configuration" -msgstr "ネットワーク設定なし" - -msgid "Set desired subvolumes on a btrfs partition" -msgstr "Btrfs パーティションに必要なサブボリュームを設定" - -msgid "" -"{}\n" -"\n" -"Select which partition to set subvolumes on" -msgstr "" -"{}\n" -"\n" -"サブボリュームを設定するパーティションを選択" - -msgid "Manage btrfs subvolumes for current partition" -msgstr "現在のパーティションの Btrfs サブボリュームを管理" +msgid "Warning: no network configuration selected. Network will need to be set up manually on the installed system." +msgstr "警告: ネットワーク設定が選択されていません。インストール後のシステムで、ネットワークを手動で設定する必要があります。" msgid "No configuration" msgstr "設定なし" -msgid "Save user configuration" -msgstr "ユーザー設定を保存" +msgid "Save user configuration (including disk layout)" +msgstr "ユーザー設定を保存（ディスクレイアウトを含む）" msgid "Save user credentials" msgstr "ユーザーの認証情報を保存" -msgid "Save disk layout" -msgstr "ディスクレイアウトを保存" - msgid "Save all" msgstr "すべて保存" -msgid "Choose which configuration to save" -msgstr "保存する設定を選択" - -msgid "Enter a directory for the configuration(s) to be saved: " -msgstr "設定を保存するディレクトリを入力: " - -msgid "Not a valid directory: {}" -msgstr "有効なディレクトリではありません: {}" - -msgid "The password you are using seems to be weak," -msgstr "使用しているパスワードは弱いようです、" - -msgid "are you sure you want to use it?" -msgstr "本当に使用してもよろしいですか？" - -msgid "Optional repositories" -msgstr "オプションリポジトリ" - -msgid "Save configuration" -msgstr "設定を保存" - -msgid "Missing configurations:\n" -msgstr "設定が存在しません:\n" - -msgid "Either root-password or at least 1 superuser must be specified" -msgstr "root パスワードか、1人以上のスーパーユーザーを指定してください" - -msgid "Manage superuser accounts: " -msgstr "スーパーユーザーアカウントを管理: " - -msgid "Manage ordinary user accounts: " -msgstr "一般ユーザーのアカウントを管理: " - -msgid " Subvolume :{:16}" -msgstr " サブボリューム :{:16}" - -msgid " mounted at {:16}" -msgstr " マウント場所 {:16}" - -msgid " with option {}" -msgstr " 次のオプションで {}" - -msgid "" -"\n" -" Fill the desired values for a new subvolume \n" -msgstr "" -"\n" -" 新しいサブボリュームに必要な値を入力 \n" - -msgid "Subvolume name " -msgstr "サブボリューム名 " - -msgid "Subvolume mountpoint" -msgstr "サブボリュームのマウントポイント" - -msgid "Subvolume options" -msgstr "サブボリュームのオプション" - -msgid "Save" -msgstr "保存" - -msgid "Subvolume name :" -msgstr "サブボリューム名:" - -msgid "Select a mount point :" -msgstr "マウントポイントを選択:" - -msgid "Select the desired subvolume options " -msgstr "サブボリュームのオプションを選択" - -msgid "Define users with sudo privilege, by username: " -msgstr "sudo 権限を持つユーザーを、ユーザー名で定義: " +msgid "Enter a directory for the configuration(s) to be saved" +msgstr "設定を保存するディレクトリを入力" #, python-brace-format -msgid "[!] A log file has been created here: {}" -msgstr "[!] ここにログファイルが作成されました: {}" +msgid "Do you want to save the configuration file(s) to {}?" +msgstr "設定ファイルを次の場所に保存しますか？ {}" + +msgid "Do you want to encrypt the user_credentials.json file?" +msgstr "user_credentials.json ファイルを暗号化しますか？" + +msgid "Credentials file encryption password" +msgstr "認証情報ファイルの暗号化パスワード" + +msgid "Partitioning" +msgstr "パーティションを作成" + +msgid "Disk encryption" +msgstr "ディスクの暗号化" + +#, python-brace-format +msgid "Configuration type: {}" +msgstr "設定タイプ: {}" + +msgid "Mountpoint" +msgstr "マウントポイント" + +msgid "Configuration" +msgstr "設定" + +msgid "Wipe" +msgstr "消去" + +msgid "Physical volumes" +msgstr "物理ボリューム" + +msgid "Volumes" +msgstr "ボリューム" + +#, python-brace-format +msgid "Snapshot type: {}" +msgstr "スナップショットのタイプ: {}" + +msgid "LVM disk encryption with more than 2 partitions is currently not supported" +msgstr "パーティションが2個を超える場合の LVM ディスク暗号化は、現在サポートしていません" + +msgid "Encryption type" +msgstr "暗号化のタイプ" + +msgid "Password" +msgstr "パスワード" + +msgid "Iteration time" +msgstr "イテレーション時間" + +msgid "Select disks for the installation" +msgstr "インストール用のディスクを選択" + +msgid "Partitions" +msgstr "パーティション" + +msgid "Select a disk configuration" +msgstr "ディスクの設定を選択" + +msgid "Enter root mount directory" +msgstr "ルートマウントディレクトリを入力" + +msgid "You will use whatever drive-setup is mounted at the specified directory" +msgstr "指定されたディレクトリにマウントされているドライブの設定を使用します" + +msgid "WARNING: Archinstall won't check the suitability of this setup" +msgstr "警告: Archinstall はこのセットアップの適合性をチェックしません" + +msgid "Select main filesystem" +msgstr "メインファイルシステムを選択" + +msgid "Would you like to use compression or disable CoW?" +msgstr "圧縮を使用しますか、それとも CoW を無効にしますか？" + +msgid "Use compression" +msgstr "圧縮する" + +msgid "Disable Copy-on-Write" +msgstr "コピーオンライトを無効にする" msgid "Would you like to use BTRFS subvolumes with a default structure?" msgstr "デフォルトの設定で Btrfs サブボリュームを使用しますか？" -msgid "Would you like to use BTRFS compression?" -msgstr "Btrfs の圧縮を使用しますか？" - msgid "Would you like to create a separate partition for /home?" msgstr "/home 用に別のパーティションを作成しますか？" msgid "The selected drives do not have the minimum capacity required for an automatic suggestion\n" msgstr "選択したドライブには、自動提案に必要な最小容量がありません\n" -msgid "Minimum capacity for /home partition: {}GB\n" -msgstr "/home パーティションの最小容量: {}GB\n" - -msgid "Minimum capacity for Arch Linux partition: {}GB" -msgstr "Arch Linux パーティションの最小容量: {}GB" - -msgid "Continue" -msgstr "続行" - -msgid "yes" -msgstr "yes" - -msgid "no" -msgstr "no" - -msgid "set: {}" -msgstr "セット: {}" - -msgid "Manual configuration setting must be a list" -msgstr "手動設定はリストである必要があります" - -msgid "No iface specified for manual configuration" -msgstr "手動設定に iface が指定されていません" - -msgid "Manual nic configuration with no auto DHCP requires an IP address" -msgstr "自動 DHCP を使用しない手動 NIC 設定には、IP アドレスが必要です" - -msgid "Add interface" -msgstr "インターフェイスを追加" - -msgid "Edit interface" -msgstr "インターフェイスを編集" - -msgid "Delete interface" -msgstr "インターフェイスを削除" - -msgid "Select interface to add" -msgstr "追加するインターフェースを選択" - -msgid "Manual configuration" -msgstr "手動設定" - -msgid "Mark/Unmark a partition as compressed (btrfs only)" -msgstr "圧縮するパーティションとしてマーク/マーク解除（Btrfs のみ）" - -msgid "The password you are using seems to be weak, are you sure you want to use it?" -msgstr "使用しているパスワードは弱いようですが、本当に使用してもよろしいですか？" - -msgid "Provides a selection of desktop environments and tiling window managers, e.g. gnome, kde, sway" -msgstr "デスクトップ環境とタイルウィンドウマネージャーの選択を提供します。e.g. gnome, kde, sway" - -msgid "Select your desired desktop environment" -msgstr "デスクトップ環境を選択" - -msgid "A very basic installation that allows you to customize Arch Linux as you see fit." -msgstr "Arch Linux を必要に応じてカスタマイズできる非常に基本的なインストールです。" - -msgid "Provides a selection of various server packages to install and enable, e.g. httpd, nginx, mariadb" -msgstr "さまざまなサーバー パッケージの選択肢を提供します。e.g. httpd, nginx, mariadb" - -msgid "Choose which servers to install, if none then a minimal installation will be done" -msgstr "インストールするサーバーを選択。存在しない場合は最小限のインストールが実行されます" - -msgid "Installs a minimal system as well as xorg and graphics drivers." -msgstr "最小限のシステムと xorg およびグラフィックドライバーをインストール。" - -msgid "Press Enter to continue." -msgstr "Enter キーで続行します。" - -msgid "Would you like to chroot into the newly created installation and perform post-installation configuration?" -msgstr "新しく作成したインストールに chroot して、インストール後の設定を実行しますか？" - -msgid "Are you sure you want to reset this setting?" -msgstr "この設定をリセットしてもよろしいですか？" - -msgid "Select one or more hard drives to use and configure\n" -msgstr "使用・設定する 1 つ以上のハードドライブを選択\n" - -msgid "Any modifications to the existing setting will reset the disk layout!" -msgstr "既存の設定を変更すると、ディスクレイアウトがリセットされます！" - -msgid "If you reset the harddrive selection this will also reset the current disk layout. Are you sure?" -msgstr "ハードドライブの選択をリセットすると、現在のディスクレイアウトもリセットされます。よろしいですか？" - -msgid "Save and exit" -msgstr "保存して終了" - -msgid "" -"{}\n" -"contains queued partitions, this will remove those, are you sure?" -msgstr "" -"{}\n" -"キューに入れられたパーティションが含まれています。削除しますがよろしいですか？" - -msgid "No audio server" -msgstr "オーディオサーバーなし" - -msgid "(default)" -msgstr "（デフォルト）" - -msgid "Use ESC to skip" -msgstr "Esc でスキップ" - -msgid "" -"Use CTRL+C to reset current selection\n" -"\n" -msgstr "" -"Ctrl+C で現在の選択をリセット\n" -"\n" - -msgid "Copy to: " -msgstr "コピー先: " - -msgid "Edit: " -msgstr "編集: " - -msgid "Key: " -msgstr "キー: " - -msgid "Edit {}: " -msgstr "編集 {}: " - -msgid "Add: " -msgstr "追加: " - -msgid "Value: " -msgstr "値: " - -msgid "You can skip selecting a drive and partitioning and use whatever drive-setup is mounted at /mnt (experimental)" -msgstr "ドライブ選択とパーティション作成をスキップして、/mnt にマウントしているドライブのセットアップを使用できます（実験的）" - -msgid "Select one of the disks or skip and use /mnt as default" -msgstr "いずれかのディスクを選択するか、スキップして /mnt をデフォルトとして使用" - -msgid "Select which partitions to mark for formatting:" -msgstr "フォーマットするパーティションを選択:" - -msgid "Use HSM to unlock encrypted drive" -msgstr "HSM を使用して暗号化されたドライブのロックを解除" - -msgid "Device" -msgstr "デバイス" - -msgid "Size" -msgstr "サイズ" - -msgid "Free space" -msgstr "空き容量" - -msgid "Bus-type" -msgstr "Bus タイプ" - -msgid "Either root-password or at least 1 user with sudo privileges must be specified" -msgstr "root パスワードか、1人以上の sudo 権限を持つユーザーを指定する必要があります" - -msgid "Enter username (leave blank to skip): " -msgstr "ユーザー名を入力（無記入でスキップ）: " - -msgid "The username you entered is invalid. Try again" -msgstr "入力したユーザー名は無効です。もう1度やり直してください" - -msgid "Should \"{}\" be a superuser (sudo)?" -msgstr "\"{}\" はスーパーユーザーに昇格しますか（sudo）？" - -msgid "Select which partitions to encrypt" -msgstr "暗号化するパーティションを選択" - -msgid "very weak" -msgstr "非常に弱い" - -msgid "weak" -msgstr "弱い" - -msgid "moderate" -msgstr "中程度" - -msgid "strong" -msgstr "強い" - -msgid "Add subvolume" -msgstr "サブボリュームを追加" - -msgid "Edit subvolume" -msgstr "サブボリュームを編集" - -msgid "Delete subvolume" -msgstr "サブボリュームを削除" - -msgid "Configured {} interfaces" -msgstr "設定した {} インターフェース" - -msgid "This option enables the number of parallel downloads that can occur during installation" -msgstr "このオプションは、インストール中に実行できる並列ダウンロードの数を有効にします" - -msgid "" -"Enter the number of parallel downloads to be enabled.\n" -" (Enter a value between 1 to {})\n" -"Note:" -msgstr "" -"有効にする並列ダウンロードの数を入力してください。\n" -" （1 から {} の値を入力）\n" -"注意:" - -msgid " - Maximum value : {} ( Allows {} parallel downloads, allows {} downloads at a time )" -msgstr " - 最大値 : {} ({} 個の並列ダウンロードを許可して、1度に {} 個のダウンロードを許可する)" - -msgid " - Minimum value : 1 ( Allows 1 parallel download, allows 2 downloads at a time )" -msgstr " - 最小値 : 1 (1 個の並列ダウンロードを許可して、1度に 2 個のダウンロードを許可する)" - -msgid " - Disable/Default : 0 ( Disables parallel downloading, allows only 1 download at a time )" -msgstr " - 無効/デフォルト : 0 (並列ダウンロードを無効にして、1度に 1 個のみダウンロードを許可する)" - -#, python-brace-format -msgid "Invalid input! Try again with a valid input [1 to {max_downloads}, or 0 to disable]" -msgstr "無効な入力です！有効な入力を使用して再試行してください [1 - {max_downloads}、0 で無効]" - -msgid "Parallel Downloads" -msgstr "並行ダウンロード" - -msgid "ESC to skip" -msgstr "Esc でスキップ" - -msgid "CTRL+C to reset" -msgstr "Ctrl+C でリセット" - -msgid "TAB to select" -msgstr "Tab で選択" - -msgid "[Default value: 0] > " -msgstr "[デフォルト値: 0] > " - -msgid "To be able to use this translation, please install a font manually that supports the language." -msgstr "この翻訳を使用できるようにするには、その言語をサポートするフォントを手動でインストールしてください。" - -msgid "The font should be stored as {}" -msgstr "フォントは {} として保存する必要があります" - -msgid "Archinstall requires root privileges to run. See --help for more." -msgstr "Archinstall を実行するには root 権限が必要です。詳細については --help を参照してください。" - -msgid "Select an execution mode" -msgstr "実行モードを選択" - -#, python-brace-format -msgid "Unable to fetch profile from specified url: {}" -msgstr "指定された URL からプロファイルを取得できません: {}" - -#, python-brace-format -msgid "Profiles must have unique name, but profile definitions with duplicate name found: {}" -msgstr "プロファイルには一意の名前が必要ですが、重複した名前のプロファイル定義が見つかりました: {}" - -msgid "Select one or more devices to use and configure" -msgstr "使用・設定する 1 つ以上のデバイスを選択" - -msgid "If you reset the device selection this will also reset the current disk layout. Are you sure?" -msgstr "デバイスの選択をリセットすると、現在のディスクレイアウトもリセットされます。よろしいですか？" - -msgid "Existing Partitions" -msgstr "既存のパーティション" - -msgid "Select a partitioning option" -msgstr "パーティション作成のオプションを選択" - -msgid "Enter the root directory of the mounted devices: " -msgstr "マウントしているデバイスのルートディレクトリを入力: " - #, python-brace-format msgid "Minimum capacity for /home partition: {}GiB\n" msgstr "/home パーティションの最小容量: {}GiB\n" @@ -878,11 +379,54 @@ msgstr "/home パーティションの最小容量: {}GiB\n" msgid "Minimum capacity for Arch Linux partition: {}GiB" msgstr "Arch Linux パーティションの最小容量: {}GiB" -msgid "This is a list of pre-programmed profiles_bck, they might make it easier to install things like desktop environments" -msgstr "これは事前にプログラムされたプロファイルのリストです。デスクトップ環境などのインストールが簡単になる可能性があります" +msgid "Encryption password" +msgstr "暗号化パスワード" -msgid "Current profile selection" -msgstr "現在のプロファイルの選択" +msgid "LVM volumes" +msgstr "LVM ボリューム" + +msgid "HSM" +msgstr "HSM" + +msgid "Partitions to be encrypted" +msgstr "暗号化するパーティション" + +msgid "LVM volumes to be encrypted" +msgstr "暗号化する LVM ボリューム" + +msgid "HSM device" +msgstr "HSM デバイス" + +msgid "Select encryption type" +msgstr "暗号化のタイプを選択" + +msgid "Enter disk encryption password (leave blank for no encryption)" +msgstr "ディスクの暗号化パスワードを入力（暗号化しない場合は無記入）" + +msgid "Select a FIDO2 device to use for HSM" +msgstr "HSM に使用する FIDO2 デバイスを選択" + +msgid "Enter iteration time for LUKS encryption (in milliseconds)" +msgstr "LUKS 暗号化のイテレーション時間（ミリ秒単位）を入力" + +msgid "Higher values increase security but slow down boot time" +msgstr "値を大きくするとセキュリティは向上しますが、起動時間が遅くなります" + +#, python-brace-format +msgid "Default: {}ms, Recommended range: 1000-60000" +msgstr "デフォルト: {}ms, 推奨範囲: 1000-60000" + +msgid "Iteration time must be at least 100ms" +msgstr "イテレーション時間は最低 100ms にしてください" + +msgid "Iteration time must be at most 120000ms" +msgstr "イテレーション時間は最大 120000ms にしてください" + +msgid "Please enter a valid number" +msgstr "有効な数字を入力してください" + +msgid "Suggest partition layout" +msgstr "パーティションレイアウトを提案" msgid "Remove all newly added partitions" msgstr "新しく追加されたパーティションをすべて削除" @@ -896,18 +440,38 @@ msgstr "フォーマット対象としてマーク/マーク解除（データ msgid "Mark/Unmark as bootable" msgstr "ブータブルとしてマーク/マーク解除" +msgid "Mark/Unmark as ESP" +msgstr "ESP としてマーク/マーク解除" + +msgid "Mark/Unmark as XBOOTLDR" +msgstr "XBOOTLDR としてマーク/マーク解除" + msgid "Change filesystem" msgstr "ファイルシステムを変更" msgid "Mark/Unmark as compressed" msgstr "圧縮対象としてマーク/マーク解除" +msgid "Mark/Unmark as nodatacow" +msgstr "nodatacow としてマーク/マーク解除" + msgid "Set subvolumes" msgstr "サブボリュームを設定" msgid "Delete partition" msgstr "パーティションを削除" +#, python-brace-format +msgid "Partition management: {}" +msgstr "パーティションを管理: {}" + +#, python-brace-format +msgid "Total length: {}" +msgstr "全体のサイズ: {}" + +msgid "Partition - New" +msgstr "パーティション - 新規" + msgid "Partition" msgstr "パーティション" @@ -917,76 +481,382 @@ msgstr "このパーティションは現在暗号化されています。フォ msgid "Partition mount-points are relative to inside the installation, the boot would be /boot as an example." msgstr "パーティションのマウントポイントはインストールにおける相対的なもので、例として boot は /boot になります。" -msgid "If mountpoint /boot is set, then the partition will also be marked as bootable." -msgstr "マウントポイントに /boot が設定された場合、パーティションはブータブルとしてマークされます。" +msgid "Enter a mountpoint" +msgstr "マウントポイントを入力" -msgid "Mountpoint: " -msgstr "マウントポイント: " +msgid "Invalid size" +msgstr "無効なサイズ" -msgid "Current free sectors on device {}:" -msgstr "デバイス {} の現在の空きセクター:" +#, python-brace-format +msgid "Selected free space segment on device {}:" +msgstr "デバイス {} の選択された空きスペースセグメント:" -msgid "Total sectors: {}" -msgstr "総セクター数: {}" +#, python-brace-format +msgid "Size: {} / {}" +msgstr "サイズ: {} / {}" -msgid "Enter the start sector (default: {}): " -msgstr "開始セクターを入力（デフォルト: {}): " +msgid "All entered values can be suffixed with a unit: %, B, KB, KiB, MB, MiB..." +msgstr "入力したすべての値に、%、B、KB、KiB、MB、MiB などの単位を付けることができます。" -msgid "Enter the end sector of the partition (percentage or block number, default: {}): " -msgstr "パーティションの終了セクターを入力（パーセンテージかブロック番号。デフォルト: {}): " +msgid "If no unit is provided, the value is interpreted as sectors" +msgstr "単位が指定されていない場合、値はセクターとして解釈されます" + +#, python-brace-format +msgid "Enter a size (default: {}): " +msgstr "サイズを入力（デフォルト: {}): " msgid "This will remove all newly added partitions, continue?" msgstr "これは新しく追加されたパーティションをすべて削除します。続けますか？" -#, python-brace-format -msgid "Partition management: {}" -msgstr "パーティションを管理: {}" +msgid "Add subvolume" +msgstr "サブボリュームを追加" + +msgid "Edit subvolume" +msgstr "サブボリュームを編集" + +msgid "Delete subvolume" +msgstr "サブボリュームを削除" + +msgid "Value cannot be empty" +msgstr "値は空にできません" + +msgid "Enter subvolume name" +msgstr "サブボリューム名を入力" + +msgid "Subvolume name" +msgstr "サブボリューム名" + +msgid "Enter subvolume mountpoint" +msgstr "サブボリュームのマウントポイントを入力" + +msgid "Exit archinstall" +msgstr "archinstall を終了" + +msgid "Reboot system" +msgstr "システムを再起動" + +msgid "chroot into installation for post-installation configurations" +msgstr "インストール後の設定を行うためインストールディレクトリに chroot する" + +msgid "Would you like to use automatic time synchronization (NTP) with the default time servers?\n" +msgstr "デフォルトのタイムサーバーで時刻の自動同期（NTP）を使用しますか？\n" + +msgid "" +"Hardware time and other post-configuration steps might be required in order for NTP to work.\n" +"For more information, please check the Arch wiki" +msgstr "" +"NTP が機能するには、ハードウェアクロックおよびその他の設定後のステップが必要になる場合があります。\n" +"詳細については Arch wiki を確認してください" + +msgid "Enter a hostname" +msgstr "ホスト名を入力" + +msgid "Select timezone" +msgstr "タイムゾーンを選択" + +msgid "What would you like to do next?" +msgstr "次は何をしますか？" + +msgid "Select which kernel(s) to install" +msgstr "インストールするカーネルを選択" + +msgid "For the best compatibility with your AMD hardware, you may want to use either the all open-source or AMD / ATI options." +msgstr "AMD ハードウェアとの互換性を最大限に高めるには、すべてのオープンソースまたは AMD/ATI オプションのいずれかを使用することをお勧めします。" + +msgid "For the best compatibility with your Intel hardware, you may want to use either the all open-source or Intel options.\n" +msgstr "Intel ハードウェアとの互換性を最大限に高めるには、すべてのオープンソースまたは Intel オプションのいずれかを使用することをお勧めします。\n" + +msgid "For the best compatibility with your Nvidia hardware, you may want to use the Nvidia proprietary driver.\n" +msgstr "Nvidia ハードウェアとの互換性を最大限に高めるには、Nvidia 独自のドライバーを使用することをお勧めします。\n" + +msgid "Would you like to use swap on zram?" +msgstr "zram でスワップを使用しますか？" + +msgid "Select zram compression algorithm:" +msgstr "zram 圧縮アルゴリズムを選択:" + +msgid "Archinstall language" +msgstr "Archinstall の言語" + +msgid "Applications" +msgstr "アプリケーション" + +msgid "Network configuration" +msgstr "ネットワーク設定" + +msgid "Save configuration" +msgstr "設定を保存" + +msgid "Install" +msgstr "インストール" + +msgid "Abort" +msgstr "中止" + +msgid "Either root-password or at least 1 user with sudo privileges must be specified" +msgstr "root パスワードか、1人以上の sudo 権限を持つユーザーを指定する必要があります" + +msgid "The selected desktop profile requires a regular user to log in via the greeter" +msgstr "選択されたデスクトッププロファイルでは、一般ユーザーがグリーター経由でログインする必要があります" + +msgid "Language" +msgstr "言語" + +msgid "NTP" +msgstr "NTP" + +msgid "LVM configuration type" +msgstr "LVM の設定タイプ" #, python-brace-format -msgid "Total length: {}" -msgstr "全体のサイズ: {}" +msgid "Btrfs snapshot type: {}" +msgstr "Btrfs スナップショットのタイプ: {}" -msgid "Encryption type" -msgstr "暗号化のタイプ" +msgid "Swap on zram" +msgstr "Zram 上でスワップ" -msgid "Iteration time" -msgstr "反復時間" +msgid "Compression algorithm" +msgstr "圧縮アルゴリズム" -msgid "Enter iteration time for LUKS encryption (in milliseconds)" -msgstr "LUKS 暗号化のイテレーション時間（ミリ秒単位）を入力" +msgid "Parallel Downloads" +msgstr "並行ダウンロード" -msgid "Higher values increase security but slow down boot time" -msgstr "値を大きくするとセキュリティは向上しますが、起動時間が遅くなります" +msgid "Color" +msgstr "カラー出力" -msgid "Default: 10000ms, Recommended range: 1000-60000" -msgstr "デフォルト: 10000ms, 推奨範囲: 1000-60000" +msgid "Kernel" +msgstr "カーネル" -msgid "Iteration time cannot be empty" -msgstr "イテレーション時間は空にできません" +msgid "Missing configurations:\n" +msgstr "設定が存在しません:\n" -msgid "Iteration time must be at least 100ms" -msgstr "イテレーション時間は最低 100ms にしてください" +#, python-brace-format +msgid "Invalid configuration: {}" +msgstr "無効な設定: {}" -msgid "Iteration time must be at most 120000ms" -msgstr "イテレーション時間は最大 120000ms にしてください" +msgid "Ready to install" +msgstr "インストールの準備が完了" -msgid "Please enter a valid number" -msgstr "有効な数字を入力してください" +msgid "Profiles" +msgstr "プロファイル" -msgid "Partitions" -msgstr "パーティション" +msgid "Graphics driver" +msgstr "グラフィックドライバー" -msgid "No HSM devices available" -msgstr "利用可能な HSM デバイスがありません" +msgid "Greeter" +msgstr "グリーター" -msgid "Partitions to be encrypted" -msgstr "暗号化するパーティション" +msgid "Selected mirror regions" +msgstr "選択されたミラーの地域" -msgid "Select disk encryption option" -msgstr "ディスクの暗号化オプションを選択" +msgid "Custom servers" +msgstr "カスタムサーバー" -msgid "Select a FIDO2 device to use for HSM" -msgstr "HSM に使用する FIDO2 デバイスを選択" +msgid "Optional repositories" +msgstr "オプションリポジトリ" + +msgid "Custom repositories" +msgstr "カスタムリポジトリ" + +#, python-brace-format +msgid "[!] A log file has been created here: {}" +msgstr "[!] ここにログファイルが作成されました: {}" + +msgid "Please submit this issue (and file) to https://github.com/archlinux/archinstall/issues" +msgstr "この問題（およびファイル）を https://github.com/archlinux/archinstall/issues に送信してください" + +msgid "Syncing the system..." +msgstr "システムを同期..." + +msgid "Waiting for time sync (timedatectl show) to complete." +msgstr "時刻の同期（timedatectl show）が完了するのを待機しています。" + +msgid "Time synchronization not completing, while you wait - check the docs for workarounds: https://archinstall.readthedocs.io/" +msgstr "待機中に時刻同期が完了しません - 回避策についてはドキュメントを確認してください: https://archinstall.readthedocs.io/" + +msgid "Skipping waiting for automatic time sync (this can cause issues if time is out of sync during installation)" +msgstr "自動での時刻同期の待機をスキップします（インストール中に時刻が同期していない場合は、問題が発生する可能性があります）" + +msgid "Waiting for Arch Linux keyring sync (archlinux-keyring-wkd-sync) to complete." +msgstr "Arch Linux キーリングの同期（archlinux-keyring-wkd-sync）が完了するのを待っています。" + +msgid "Keyboard layout" +msgstr "キーボードレイアウト" + +msgid "Locale language" +msgstr "ロケール言語" + +msgid "Locale encoding" +msgstr "ロケールエンコーディング" + +msgid "Console font" +msgstr "コンソールフォント" + +msgid "Back" +msgstr "戻る" + +msgid "Are you sure you want to reset this setting?" +msgstr "この設定をリセットしてもよろしいですか？" + +msgid "Confirm and exit" +msgstr "確認して終了" + +msgid "Cancel" +msgstr "キャンセル" + +msgid "Password strength: Weak" +msgstr "パスワードの強度: 弱い" + +msgid "Password strength: Moderate" +msgstr "パスワードの強度: 中程度" + +msgid "Password strength: Strong" +msgstr "パスワードの強度: 強い" + +msgid "Confirm password" +msgstr "パスワードを確認" + +msgid "The password did not match, please try again" +msgstr "パスワードが一致しません。もう一度試してください" + +msgid "Not a valid directory" +msgstr "有効なディレクトリではありません" + +msgid "Do you really want to abort?" +msgstr "本当に中止しますか？" + +msgid "Add a custom repository" +msgstr "カスタムリポジトリを追加" + +msgid "Change custom repository" +msgstr "カスタムリポジトリを変更" + +msgid "Delete custom repository" +msgstr "カスタムリポジトリを削除" + +msgid "Enter a repository name" +msgstr "リポジトリ名を入力" + +msgid "Name" +msgstr "名前" + +msgid "Enter the repository url" +msgstr "リポジトリの URL を入力" + +msgid "Url" +msgstr "URL" + +msgid "Select signature check" +msgstr "署名チェックを選択" + +msgid "Signature check" +msgstr "署名チェック" + +msgid "Select signature option" +msgstr "署名オプションを選択" + +msgid "Add a custom server" +msgstr "カスタムサーバーを追加" + +msgid "Change custom server" +msgstr "カスタムサーバーを変更" + +msgid "Delete custom server" +msgstr "カスタムサーバーを削除" + +msgid "Enter server url" +msgstr "サーバーの URL を入力" + +msgid "Select regions" +msgstr "地域を選択" + +msgid "Add custom servers" +msgstr "カスタムサーバーを追加" + +msgid "Add custom repository" +msgstr "カスタムリポジトリを追加" + +msgid "Additional repositories" +msgstr "追加リポジトリ" + +msgid "Loading mirror regions..." +msgstr "ミラーの地域を読み込んでいます..." + +msgid "Select mirror regions to be enabled" +msgstr "有効にするミラー地域を選択" + +msgid "Select optional repositories to be enabled" +msgstr "有効にするオプションリポジトリを選択" + +msgid "Unicode font coverage for most languages" +msgstr "ほとんどの言語をカバーする Unicode フォント" + +msgid "color emoji for browsers and apps" +msgstr "ブラウザやアプリ用のカラー絵文字" + +msgid "Chinese, Japanese, Korean characters" +msgstr "日本語、中国語、韓国語の文字" + +msgid "Arial/Times/Courier replacement, Cyrillic support for Steam/games" +msgstr "Arial/Times/Courier フォントの代替、Steam/ゲームにおけるキリル文字のサポート" + +msgid "wide Unicode coverage, good fallback font" +msgstr "Unicode を広くカバーする良い代替フォント" + +msgid "Zram enabled" +msgstr "Zram を有効にする" + +#, python-brace-format +msgid "Zram algorithm {}" +msgstr "Zram アルゴリズム {}" + +msgid "Bluetooth enabled" +msgstr "Bluetooth を有効にする" + +#, python-brace-format +msgid "Audio server \"{}\"" +msgstr "オーディオサーバー \"{}\"" + +#, python-brace-format +msgid "Power management \"{}\"" +msgstr "電力管理 \"{}\"" + +msgid "Print service enabled" +msgstr "印刷サービスを有効にする" + +#, python-brace-format +msgid "Firewall \"{}\"" +msgstr "ファイアウォール \"{}\"" + +#, python-brace-format +msgid "Extra fonts \"{}\"" +msgstr "追加フォント \"{}\"" + +msgid "Passwordless login" +msgstr "パスワードなしのログイン" + +msgid "Second factor login" +msgstr "2要素ログイン" + +msgid "Root password set" +msgstr "Root パスワードを設定" + +#, python-brace-format +msgid "Configured {} user(s)" +msgstr "{} 人のユーザーを設定" + +msgid "U2F set up" +msgstr "U2F を設定" + +#, python-brace-format +msgid "Bootloader \"{}\"" +msgstr "ブートローダー \"{}\"" + +msgid "UKI enabled" +msgstr "UKI を有効にする" + +msgid "Removable" +msgstr "リムーバブル" msgid "Use a best-effort default partition layout" msgstr "ベストエフォートのデフォルトパーティションレイアウトを使用" @@ -997,331 +867,37 @@ msgstr "手動でパーティションを作成" msgid "Pre-mounted configuration" msgstr "現在のマウント設定" +msgid "Default" +msgstr "デフォルト" + +msgid "Manual" +msgstr "マニュアル" + +msgid "Pre-mount" +msgstr "プレマウント" + +#, python-brace-format +msgid "{} layout" +msgstr "{} レイアウト" + +#, python-brace-format +msgid "Devices {}" +msgstr "デバイス {}" + +msgid "LVM set up" +msgstr "LVM の設定" + +#, python-brace-format +msgid "{} encryption" +msgstr "{} 暗号化" + +#, python-brace-format +msgid "Btrfs snapshot \"{}\"" +msgstr "Btrfs スナップショット \"{}\"" + msgid "Unknown" msgstr "不明" -msgid "Partition encryption" -msgstr "パーティションの暗号化" - -#, python-brace-format -msgid " ! Formatting {} in " -msgstr " ! {} のフォーマットまで " - -msgid "← Back" -msgstr "← 戻る" - -msgid "Disk encryption" -msgstr "ディスクの暗号化" - -msgid "Configuration" -msgstr "設定" - -msgid "Password" -msgstr "パスワード" - -msgid "All settings will be reset, are you sure?" -msgstr "すべての設定がリセットされます。よろしいですか？" - -msgid "Back" -msgstr "戻る" - -msgid "Please chose which greeter to install for the chosen profiles: {}" -msgstr "選択したプロファイルにインストールするグリーターを選択: {}" - -#, python-brace-format -msgid "Environment type: {}" -msgstr "環境のタイプ: {}" - -msgid "The proprietary Nvidia driver is not supported by Sway. It is likely that you will run into issues, are you okay with that?" -msgstr "プロプライエタリの Nvidia ドライバーは Sway ではサポートされていません。問題が発生する可能性がありますが、よろしいですか？" - -msgid "Installed packages" -msgstr "インストールするパッケージ" - -msgid "Add profile" -msgstr "プロファイルを追加" - -msgid "Edit profile" -msgstr "プロファイルを編集" - -msgid "Delete profile" -msgstr "プロファイルを削除" - -msgid "Profile name: " -msgstr "プロファイル名: " - -msgid "The profile name you entered is already in use. Try again" -msgstr "入力したプロファイル名はすでに使用されています。もう1度やり直してください" - -msgid "Packages to be install with this profile (space separated, leave blank to skip): " -msgstr "このプロファイルでインストールするパッケージ（スペースで区切る。無記入でスキップ）: " - -msgid "Services to be enabled with this profile (space separated, leave blank to skip): " -msgstr "このプロファイルで有効にするサービス（スペースで区切る。未記入でスキップ): " - -msgid "Should this profile be enabled for installation?" -msgstr "このプロファイルのインストールを有効にしますか？" - -msgid "Create your own" -msgstr "自分で作成" - -msgid "" -"\n" -"Select a graphics driver or leave blank to install all open-source drivers" -msgstr "" -"\n" -"グラフィックドライバーを選択。無記入ですべてのオープンソースドライバーをインストール" - -msgid "Sway needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" -msgstr "Sway はお使いの Seat（キーボード、マウスなどのハードウェアデバイス群）にアクセスする必要があります" - -msgid "" -"\n" -"\n" -"Choose an option to give Sway access to your hardware" -msgstr "" -"\n" -"\n" -"Sway にハードウェアへのアクセスを許可するオプションを選択" - -msgid "Graphics driver" -msgstr "グラフィックドライバー" - -msgid "Greeter" -msgstr "グリーター" - -msgid "Please chose which greeter to install" -msgstr "インストールするグリーターを選択" - -msgid "This is a list of pre-programmed default_profiles" -msgstr "これは、事前にプログラムされた default_profile のリストです" - -msgid "Disk configuration" -msgstr "ディスクの設定" - -msgid "Profiles" -msgstr "プロファイル" - -msgid "Finding possible directories to save configuration files ..." -msgstr "設定ファイルを保存できるディレクトリを検索しています..." - -msgid "Select directory (or directories) for saving configuration files" -msgstr "設定ファイルを保存するディレクトリを選択" - -msgid "Add a custom mirror" -msgstr "カスタムミラーを追加" - -msgid "Change custom mirror" -msgstr "カスタムミラーを変更" - -msgid "Delete custom mirror" -msgstr "カスタムミラーを削除" - -msgid "Enter name (leave blank to skip): " -msgstr "名前を入力（無記入でスキップ）: " - -msgid "Enter url (leave blank to skip): " -msgstr "URL を入力（未記入でスキップ）: " - -msgid "Select signature check option" -msgstr "署名チェックのオプションを選択" - -msgid "Select signature option" -msgstr "署名オプションを選択" - -msgid "Custom mirrors" -msgstr "カスタムミラー" - -msgid "Defined" -msgstr "定義済み" - -msgid "Save user configuration (including disk layout)" -msgstr "ユーザー設定を保存（ディスクレイアウトを含む）" - -msgid "" -"Enter a directory for the configuration(s) to be saved (tab completion enabled)\n" -"Save directory: " -msgstr "" -"設定を保存するディレクトリを入力（Tab で補完可能）\n" -"保存ディレクトリ: " - -msgid "" -"Do you want to save {} configuration file(s) in the following location?\n" -"\n" -"{}" -msgstr "" -"{} 設定ファイルを次の場所に保存しますか？\n" -"\n" -"{}" - -msgid "Saving {} configuration files to {}" -msgstr "{} 設定ファイルを {} に保存" - -msgid "Mirrors" -msgstr "ミラー" - -msgid "Mirror regions" -msgstr "ミラーの地域" - -msgid " - Maximum value : {} ( Allows {} parallel downloads, allows {max_downloads+1} downloads at a time )" -msgstr " - 最大値 : {}（{} 個の並列ダウンロードを許可し、1度に {max_downloads+1} 個のダウンロードを許可する）" - -msgid "Invalid input! Try again with a valid input [1 to {}, or 0 to disable]" -msgstr "無効な入力です！有効な入力でやり直してください [1 から {}、または 0 で無効]" - -msgid "Locales" -msgstr "ロケール" - -msgid "Use NetworkManager (necessary to configure internet graphically in GNOME and KDE)" -msgstr "NetworkManager を使用（GNOME と KDE でインターネットをグラフィカルに設定するのに必要）" - -msgid "Total: {} / {}" -msgstr "全体: {} / {}" - -msgid "All entered values can be suffixed with a unit: B, KB, KiB, MB, MiB..." -msgstr "入力したすべての値に、B、KB、KiB、MB、MiB などの単位を付けることができます。" - -msgid "If no unit is provided, the value is interpreted as sectors" -msgstr "単位が指定されていない場合、値はセクターとして解釈されます" - -msgid "Enter start (default: sector {}): " -msgstr "開始値を入力（デフォルト: セクター {}): " - -msgid "Enter end (default: {}): " -msgstr "終了値を入力（デフォルト: {}): " - -msgid "Unable to determine fido2 devices. Is libfido2 installed?" -msgstr "fido2 デバイスを特定できません。lifido2 はインストールされていますか？" - -msgid "Path" -msgstr "パス" - -msgid "Manufacturer" -msgstr "メーカー" - -msgid "Product" -msgstr "製品" - -#, python-brace-format -msgid "Invalid configuration: {error}" -msgstr "無効な設定: {error}" - -msgid "Type" -msgstr "タイプ" - -msgid "This option enables the number of parallel downloads that can occur during package downloads" -msgstr "このオプションは、パッケージのダウンロード中に実行できる並列ダウンロードの数を設定します" - -msgid "" -"Enter the number of parallel downloads to be enabled.\n" -"\n" -"Note:\n" -msgstr "" -"並列ダウンロードの数を入力してください。\n" -"\n" -"注意:\n" - -#, python-brace-format -msgid " - Maximum recommended value : {} ( Allows {} parallel downloads at a time )" -msgstr " - 最大推奨値 : {} （1度に {} 個の並列ダウンロードを許可する）" - -msgid " - Disable/Default : 0 ( Disables parallel downloading, allows only 1 download at a time )\n" -msgstr " - 無効/デフォルト : 0 （並列ダウンロードを無効にして、1度に 1 個のダウンロードのみ許可する）\n" - -msgid "Invalid input! Try again with a valid input [or 0 to disable]" -msgstr "無効な入力です！有効な入力でやり直してください（無効にする場合は 0）" - -msgid "Hyprland needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" -msgstr "Hyprland はお使いの Seat（キーボード、マウスなどのハードウェアデバイス群）にアクセスする必要があります" - -msgid "" -"\n" -"\n" -"Choose an option to give Hyprland access to your hardware" -msgstr "" -"\n" -"\n" -"Hyprland にハードウェアへのアクセスを許可するオプションを選択" - -msgid "All entered values can be suffixed with a unit: %, B, KB, KiB, MB, MiB..." -msgstr "入力したすべての値に、%、B、KB、KiB、MB、MiB などの単位を付けることができます。" - -msgid "Would you like to use unified kernel images?" -msgstr "Unified カーネルイメージを使用しますか？" - -msgid "Unified kernel images" -msgstr "Unified カーネルイメージ" - -msgid "Waiting for time sync (timedatectl show) to complete." -msgstr "時刻の同期（timedatectl show）が完了するのを待機しています。" - -msgid "Time syncronization not completing, while you wait - check the docs for workarounds: https://archinstall.readthedocs.io/" -msgstr "待機中に時刻同期が完了しません - 回避策についてはドキュメントを確認してください: https://archinstall.readthedocs.io/" - -msgid "Skipping waiting for automatic time sync (this can cause issues if time is out of sync during installation)" -msgstr "自動での時刻同期の待機をスキップします（インストール中に時刻が同期していない場合は、問題が発生する可能性があります）" - -msgid "Waiting for Arch Linux keyring sync (archlinux-keyring-wkd-sync) to complete." -msgstr "Arch Linux キーリングの同期（archlinux-keyring-wkd-sync）が完了するのを待っています。" - -msgid "Selected profiles: " -msgstr "選択したプロファイル: " - -msgid "Time synchronization not completing, while you wait - check the docs for workarounds: https://archinstall.readthedocs.io/" -msgstr "待機中に時刻同期が完了しません - 回避策についてはドキュメントを確認してください: https://archinstall.readthedocs.io/" - -msgid "Mark/Unmark as nodatacow" -msgstr "nodatacow としてマーク/マーク解除" - -msgid "Would you like to use compression or disable CoW?" -msgstr "圧縮を使用しますか、それとも CoW を無効にしますか？" - -msgid "Use compression" -msgstr "圧縮する" - -msgid "Disable Copy-on-Write" -msgstr "コピーオンライトを無効にする" - -msgid "Provides a selection of desktop environments and tiling window managers, e.g. GNOME, KDE Plasma, Sway" -msgstr "デスクトップ環境とタイルウィンドウマネージャーの選択を提供します。例: GNOME, KDE Plasma, Sway" - -#, python-brace-format -msgid "Configuration type: {}" -msgstr "設定タイプ: {}" - -msgid "LVM configuration type" -msgstr "LVM の設定タイプ" - -msgid "LVM disk encryption with more than 2 partitions is currently not supported" -msgstr "パーティションが2個を超える場合の LVM ディスク暗号化は、現在サポートしていません" - -msgid "Use NetworkManager (necessary to configure internet graphically in GNOME and KDE Plasma)" -msgstr "NetworkManager を使用する（GNOME と KDE Plasma でインターネットをグラフィカルに設定するのに必要）" - -msgid "Select a LVM option" -msgstr "LVM のオプションを選択" - -msgid "Partitioning" -msgstr "パーティションを作成" - -msgid "Logical Volume Management (LVM)" -msgstr "論理ボリューム管理（LVM）" - -msgid "Physical volumes" -msgstr "物理ボリューム" - -msgid "Volumes" -msgstr "ボリューム" - -msgid "LVM volumes" -msgstr "LVM ボリューム" - -msgid "LVM volumes to be encrypted" -msgstr "暗号化する LVM ボリューム" - -msgid "Select which LVM volumes to encrypt" -msgstr "暗号化する LVM ボリュームを選択" - msgid "Default layout" msgstr "デフォルトのレイアウト" @@ -1337,462 +913,114 @@ msgstr "LUKS 上の LVM" msgid "LUKS on LVM" msgstr "LVM 上の LUKS" -msgid "Yes" -msgstr "Yes" - -msgid "No" -msgstr "No" - -msgid "Archinstall help" -msgstr "Archinstall ヘルプ" - -msgid " (default)" -msgstr " (デフォルト)" - -msgid "Press Ctrl+h for help" -msgstr "Ctrl+H でヘルプを表示" - -msgid "Choose an option to give Sway access to your hardware" -msgstr "Sway にハードウェアへのアクセスを許可するオプションを選択" - -msgid "Seat access" -msgstr "Seat アクセス" - -msgid "Mountpoint" -msgstr "マウントポイント" - -msgid "HSM" -msgstr "HSM" - -msgid "Enter disk encryption password (leave blank for no encryption)" -msgstr "ディスクの暗号化パスワードを入力（暗号化しない場合は無記入）" - -msgid "Disk encryption password" -msgstr "ディスク暗号化パスワード" - -msgid "Partition - New" -msgstr "パーティション - 新規" - -msgid "Filesystem" -msgstr "ファイルシステム" - -msgid "Invalid size" -msgstr "無効なサイズ" - -msgid "Start (default: sector {}): " -msgstr "開始値（デフォルト: セクター {}): " - -msgid "End (default: {}): " -msgstr "終了値（デフォルト: {}): " - -msgid "Subvolume name" -msgstr "サブボリューム名" - -msgid "Disk configuration type" -msgstr "ディスク設定のタイプ" - -msgid "Root mount directory" -msgstr "ルートマウントディレクトリ" - -msgid "Select language" -msgstr "言語を選択" - -msgid "Write additional packages to install (space separated, leave blank to skip)" -msgstr "追加でインストールするパッケージを書く（スペースで区切る。無記入でスキップ）" - -msgid "Invalid download number" -msgstr "ダウンロード数が無効です" - -msgid "Number downloads" -msgstr "ダウンロード数" - -msgid "The username you entered is invalid" -msgstr "入力したユーザー名は無効です" - -msgid "Username" -msgstr "ユーザー名" +#, python-brace-format +msgid "Keyboard layout \"{}\"" +msgstr "キーボードレイアウト \"{}\"" #, python-brace-format -msgid "Should \"{}\" be a superuser (sudo)?\n" -msgstr "\"{}\" はスーパーユーザーに昇格しますか（sudo）？\n" - -msgid "Interfaces" -msgstr "インターフェイス" - -msgid "You need to enter a valid IP in IP-config mode" -msgstr "IP設定モードで有効なIPを入力する必要があります" - -msgid "Modes" -msgstr "モード" - -msgid "IP address" -msgstr "IPアドレス" - -msgid "Enter your gateway (router) IP address (leave blank for none)" -msgstr "ゲートウェイ（ルーター）の IP アドレスを入力。無い場合は無記入" - -msgid "Gateway address" -msgstr "ゲートウェイアドレス" - -msgid "Enter your DNS servers with space separated (leave blank for none)" -msgstr "DNS サーバーをスペースで区切って入力（無い場合は無記入）" - -msgid "DNS servers" -msgstr "DNSサーバー" - -msgid "Configure interfaces" -msgstr "インターフェースを設定" - -msgid "Kernel" -msgstr "カーネル" - -msgid "UEFI is not detected and some options are disabled" -msgstr "UEFIが検出されず、一部のオプションが無効になります" - -msgid "Info" -msgstr "情報" - -msgid "The proprietary Nvidia driver is not supported by Sway." -msgstr "プロプライエタリの Nvidia ドライバーは Sway ではサポートされていません。" - -msgid "It is likely that you will run into issues, are you okay with that?" -msgstr "問題が発生する可能性が高いですが、よろしいですか？" - -msgid "Main profile" -msgstr "メインプロファイル" - -msgid "Confirm password" -msgstr "パスワードを確認" - -msgid "The confirmation password did not match, please try again" -msgstr "確認のパスワードが一致しませんでした。もう一度試してください" - -msgid "Not a valid directory" -msgstr "有効なディレクトリではありません" - -msgid "Would you like to continue?" -msgstr "続行しますか？" - -msgid "Directory" -msgstr "ディレクトリ" - -msgid "Enter a directory for the configuration(s) to be saved (tab completion enabled)" -msgstr "設定を保存するディレクトリを入力（Tab で補完可能）" +msgid "Locale language \"{}\"" +msgstr "ロケール言語 \"{}\"" #, python-brace-format -msgid "Do you want to save the configuration file(s) to {}?" -msgstr "設定ファイルを次の場所に保存しますか？ {}" - -msgid "Enabled" -msgstr "有効" - -msgid "Disabled" -msgstr "無効" - -msgid "Please submit this issue (and file) to https://github.com/archlinux/archinstall/issues" -msgstr "この問題（およびファイル）を https://github.com/archlinux/archinstall/issues に送信してください" - -msgid "Mirror name" -msgstr "ミラーの名前" - -msgid "Url" -msgstr "URL" - -msgid "Select signature check" -msgstr "署名チェックを選択" - -msgid "Select execution mode" -msgstr "実行モードを選択" - -msgid "Press ? for help" -msgstr "? を押すとヘルプを表示" - -msgid "Choose an option to give Hyprland access to your hardware" -msgstr "Hyprland にハードウェアへのアクセスを許可するオプションを選択" - -msgid "Additional repositories" -msgstr "追加リポジトリ" - -msgid "NTP" -msgstr "NTP" - -msgid "Swap on zram" -msgstr "zram のスワップ" - -msgid "Name" -msgstr "名前" - -msgid "Signature check" -msgstr "署名チェック" +msgid "Locale encoding \"{}\"" +msgstr "ロケールエンコーディング \"{}\"" #, python-brace-format -msgid "Selected free space segment on device {}:" -msgstr "デバイス {} の選択された空きスペースセグメント:" +msgid "Console font \"{}\"" +msgstr "コンソールフォント \"{}\"" #, python-brace-format -msgid "Size: {} / {}" -msgstr "サイズ: {} / {}" +msgid "Mirror regions \"{}\"" +msgstr "ミラーの地域 \"{}\"" #, python-brace-format -msgid "Size (default: {}): " -msgstr "サイズ (デフォルト: {}): " +msgid "Optional repositories \"{}\"" +msgstr "オプションリポジトリ \"{}\"" -msgid "HSM device" -msgstr "HSM デバイス" +msgid "Custom servers set up" +msgstr "カスタムサーバーを設定" -msgid "Some packages could not be found in the repository" -msgstr "リポジトリ内にいくつかのパッケージが見つかりませんでした" +msgid "Custom repositories set up" +msgstr "カスタムリポジトリを設定" -msgid "User" -msgstr "ユーザー" +msgid "Copy ISO network configuration to installation" +msgstr "ISO のネットワーク設定をインストール環境にコピー" -msgid "The specified configuration will be applied" -msgstr "指定された設定が適用されます" +msgid "Use Network Manager (default backend)" +msgstr "Network Manager を使用（デフォルトのバックエンド）" -msgid "Wipe" -msgstr "ワイプ" +msgid "Use Network Manager (iwd backend)" +msgstr "Network Manager を使用（iwd バックエンド）" -msgid "Mark/Unmark as XBOOTLDR" -msgstr "XBOOTLDR としてマーク/マーク解除" +msgid "Use standalone iwd" +msgstr "スタンドアロンの iwd を使用" -msgid "Loading packages..." -msgstr "パッケージを読み込んでいます..." - -msgid "Select any packages from the below list that should be installed additionally" -msgstr "追加でインストールする必要があるパッケージをリストから選択してください" - -msgid "Add a custom repository" -msgstr "カスタムリポジトリを追加" - -msgid "Change custom repository" -msgstr "カスタムリポジトリを変更" - -msgid "Delete custom repository" -msgstr "カスタムリポジトリを削除" - -msgid "Repository name" -msgstr "リポジトリ名" - -msgid "Add a custom server" -msgstr "カスタムサーバーを追加" - -msgid "Change custom server" -msgstr "カスタムサーバーを変更" - -msgid "Delete custom server" -msgstr "カスタムサーバーを削除" - -msgid "Server url" -msgstr "サーバー URL" - -msgid "Select regions" -msgstr "地域を選択" - -msgid "Add custom servers" -msgstr "カスタムサーバーを追加" - -msgid "Add custom repository" -msgstr "カスタムリポジトリを追加" - -msgid "Loading mirror regions..." -msgstr "ミラーの地域を読み込んでいます..." - -msgid "Mirrors and repositories" -msgstr "ミラーとリポジトリ" - -msgid "Selected mirror regions" -msgstr "選択されたミラーの地域" - -msgid "Custom servers" -msgstr "カスタムサーバー" - -msgid "Custom repositories" -msgstr "カスタムリポジトリ" - -msgid "Only ASCII characters are supported" -msgstr "ASCII 文字のみサポートされます" - -msgid "Show help" -msgstr "ヘルプを表示" - -msgid "Exit help" -msgstr "ヘルプを終了" - -msgid "Preview scroll up" -msgstr "プレビューを上にスクロール" - -msgid "Preview scroll down" -msgstr "プレビューを下にスクロール" - -msgid "Move up" -msgstr "上に移動" - -msgid "Move down" -msgstr "下に移動" - -msgid "Move right" -msgstr "右に移動" - -msgid "Move left" -msgstr "左に移動" - -msgid "Jump to entry" -msgstr "エントリーへジャンプ" - -msgid "Skip selection (if available)" -msgstr "選択をスキップ（利用可能な場合）" - -msgid "Reset selection (if available)" -msgstr "選択をリセット（利用可能な場合）" - -msgid "Select on single select" -msgstr "単一で選択" - -msgid "Select on multi select" -msgstr "複数で選択" - -msgid "Reset" -msgstr "リセット" - -msgid "Skip selection menu" -msgstr "選択メニューをスキップ" - -msgid "Start search mode" -msgstr "検索モードを開始" - -msgid "Exit search mode" -msgstr "検索モードを終了" - -msgid "labwc needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" -msgstr "labwc はお使いの Seat（キーボード、マウスなどのハードウェアデバイス群）にアクセスする必要があります" - -msgid "Choose an option to give labwc access to your hardware" -msgstr "labwc にハードウェアへのアクセスを許可するオプションを選択" - -msgid "niri needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" -msgstr "niri はお使いの Seat（キーボード、マウスなどのハードウェアデバイス群）にアクセスする必要があります" - -msgid "Choose an option to give niri access to your hardware" -msgstr "niri にハードウェアへのアクセスを許可するオプションを選択" - -msgid "Mark/Unmark as ESP" -msgstr "ESP としてマーク/マーク解除" +msgid "Manual configuration" +msgstr "手動設定" msgid "Package group:" msgstr "パッケージグループ:" -msgid "Exit archinstall" -msgstr "archinstall を終了" +msgid "Color enabled" +msgstr "カラー出力を有効にする" -msgid "Reboot system" -msgstr "システムを再起動" +#, python-brace-format +msgid "{} grphics driver" +msgstr "{} グラフィックドライバー" -msgid "chroot into installation for post-installation configurations" -msgstr "インストール後の設定を行うためインストールディレクトリに chroot する" +#, python-brace-format +msgid "{} greeter" +msgstr "{} グリーター" -msgid "Installation completed" -msgstr "インストール完了" +msgid "very weak" +msgstr "非常に弱い" -msgid "What would you like to do next?" -msgstr "次は何をしますか？" +msgid "weak" +msgstr "弱い" + +msgid "moderate" +msgstr "中程度" + +msgid "strong" +msgstr "強い" + +msgid "Add interface" +msgstr "インターフェイスを追加" + +msgid "Edit interface" +msgstr "インターフェイスを編集" + +msgid "Delete interface" +msgstr "インターフェイスを削除" + +msgid "Select an interface" +msgstr "インターフェースを選択" + +msgid "You need to enter a valid IP in IP-config mode" +msgstr "IP設定モードで有効なIPを入力する必要があります" #, python-brace-format msgid "Select which mode to configure for \"{}\"" msgstr "「{}」に設定するモードを選択" -msgid "Incorrect credentials file decryption password" -msgstr "認証情報ファイルの復号化パスワードが正しくありません" - -msgid "Incorrect password" -msgstr "パスワードが間違っています" - -msgid "Credentials file decryption password" -msgstr "認証情報ファイルの復号化パスワード" - -msgid "Do you want to encrypt the user_credentials.json file?" -msgstr "user_credentials.json ファイルを暗号化しますか？" - -msgid "Credentials file encryption password" -msgstr "認証情報ファイルの暗号化パスワード" - #, python-brace-format -msgid "Repositories: {}" -msgstr "リポジトリ: {}" +msgid "Enter the IP and subnet for {} (example: 192.168.0.5/24): " +msgstr "{} の IP とサブネットを入力（例: 192.168.0.5/24）: " -msgid "New version available" -msgstr "新しいバージョンが利用可能" +msgid "Enter your gateway (router) IP address (leave blank for none)" +msgstr "ゲートウェイ（ルーター）の IP アドレスを入力。無い場合は無記入" -msgid "Passwordless login" -msgstr "パスワードなしのログイン" +msgid "Enter your DNS servers with space separated (leave blank for none)" +msgstr "DNS サーバーをスペースで区切って入力（無い場合は無記入）" -msgid "Second factor login" -msgstr "2要素ログイン" +msgid "Choose network configuration" +msgstr "ネットワーク設定を選択" -msgid "Bluetooth" -msgstr "Bluetooth" +msgid "Recommended: Network Manager for desktop, Manual for server" +msgstr "推奨: デスクトップのネットワークマネージャー、サーバーのマニュアル" -msgid "Would you like to configure Bluetooth?" -msgstr "Bluetooth を設定しますか？" - -msgid "Print service" -msgstr "印刷サービス" - -msgid "Would you like to configure the print service?" -msgstr "印刷サービスを設定しますか？" - -msgid "Power management" -msgstr "電力管理" - -msgid "Authentication" -msgstr "認証" - -msgid "Applications" -msgstr "アプリケーション" - -msgid "U2F login method: " -msgstr "U2F ログインメソッド: " - -msgid "Passwordless sudo: " -msgstr "パスワードなしの sudo: " - -#, python-brace-format -msgid "Btrfs snapshot type: {}" -msgstr "Btrfs スナップショットのタイプ: {}" - -msgid "Syncing the system..." -msgstr "システムを同期..." - -msgid "Value cannot be empty" -msgstr "値は空にできません" - -msgid "Snapshot type" -msgstr "スナップショットのタイプ" - -#, python-brace-format -msgid "Snapshot type: {}" -msgstr "スナップショットのタイプ: {}" - -msgid "U2F login setup" -msgstr "U2F ログインの設定" - -msgid "No U2F devices found" -msgstr "U2F デバイスが見つかりません" - -msgid "U2F Login Method" -msgstr "U2F ログインメソッド" - -msgid "Enable passwordless sudo?" -msgstr "パスワードなしの sudo を有効にしますか？" - -#, python-brace-format -msgid "Setting up U2F device for user: {}" -msgstr "ユーザー用 U2F デバイスの設定: {}" - -msgid "You may need to enter the PIN and then touch your U2F device to register it" -msgstr "PIN を入力したのち U2F デバイスをタッチして登録しなければならない場合があります" - -msgid "Starting device modifications in " -msgstr "次の場所でデバイスの変更を開始しています " +msgid "Configure interfaces" +msgstr "インターフェースを設定" msgid "No network connection found" msgstr "ネットワーク接続が見つかりません" @@ -1818,160 +1046,50 @@ msgstr "Wi-Fi の設定に失敗しました" msgid "Enter wifi password" msgstr "Wi-Fi パスワードを入力" -msgid "Ok" -msgstr "OK" +#, python-brace-format +msgid "Repositories: {}" +msgstr "リポジトリ: {}" -msgid "Removable" -msgstr "リムーバブル" +msgid "Loading packages..." +msgstr "パッケージを読み込んでいます..." -msgid "Install to removable location" -msgstr "リムーバブルな場所にインストールする" - -msgid "Will install to /EFI/BOOT/ (removable location)" -msgstr "/EFI/BOOT/ (リムーバブルな場所) にインストールする" - -msgid "Will install to standard location with NVRAM entry" -msgstr "NVRAM エントリーのある標準の場所にインストールする" - -msgid "Would you like to install the bootloader to the default removable media search location?" -msgstr "ブートローダーをデフォルトのリムーバブルメディアの検索場所にインストールしますか？" - -msgid "This installs the bootloader to /EFI/BOOT/BOOTX64.EFI (or similar) which is useful for:" -msgstr "ブートローダーが /EFI/BOOT/BOOTX64.EFI (または類似の場所) にインストールされ、次の場合に役立ちます:" - -msgid "USB drives or other portable external media." -msgstr "USB ドライブまたは他のポータブル外部メディア。" - -msgid "Systems where you want the disk to be bootable on any computer." -msgstr "ディスクをどのコンピューターでも起動できるようにするシステム。" - -msgid "Firmware that does not properly support NVRAM boot entries." -msgstr "NVRAM ブートエントリーを適切にサポートしていないファームウェア。" - -msgid "Will install to /EFI/BOOT/ (removable location, safe default)" -msgstr "/EFI/BOOT/（リムーバブルな場所、安全なデフォルト）にインストール" - -msgid "Will install to custom location with NVRAM entry" -msgstr "NVRAM エントリーを使用してカスタムした場所にインストール" - -msgid "Firmware that does not properly support NVRAM boot entries like most MSI motherboards," -msgstr "ほとんどの MSI マザーボードのように NVRAM ブートエントリーを適切にサポートしていないファームウェア、" - -msgid "most Apple Macs, many laptops..." -msgstr "ほとんどの Apple Mac、多くのラップトップ..." - -msgid "Language" -msgstr "言語" - -msgid "Compression algorithm" -msgstr "圧縮アルゴリズム" +msgid "No packages found" +msgstr "パッケージが見つかりません" msgid "Only packages such as base, sudo, linux, linux-firmware, efibootmgr and optional profile packages are installed." msgstr "base、sudo、linux、linux-firmware、efibootmgr などのパッケージとオプションのプロファイルパッケージのみがインストールされます。" -msgid "Select zram compression algorithm:" -msgstr "zram 圧縮アルゴリズムを選択:" +msgid "Note: base-devel is no longer installed by default. Add it here if you need build tools." +msgstr "注意: base-devel はデフォルトではインストールされなくなりました。ビルドツールが必要な場合は、ここで追加してください。" -msgid "Use Network Manager (default backend)" -msgstr "NetworkManager（デフォルトのバックエンド）を使用する" +msgid "Select any packages from the below list that should be installed additionally" +msgstr "追加でインストールする必要があるパッケージをリストから選択してください" -msgid "Use Network Manager (iwd backend)" -msgstr "NetworkManager (iwd バックエンド) を使用する" +msgid "Pacman is already running, waiting maximum 10 minutes for it to terminate." +msgstr "Pacman はすでに実行されており、終了するまで最大 10 分間待機します。" -msgid "Firewall" -msgstr "ファイアウォール" - -msgid "Select audio configuration" -msgstr "オーディオ設定を選択" - -msgid "Enter credentials file decryption password" -msgstr "認証情報ファイルの復号パスワードを入力" - -msgid "Enter root password" -msgstr "ルートパスワードを入力" - -msgid "Select bootloader to install" -msgstr "インストールするブートローダーを選択" - -msgid "Configuration preview" -msgstr "設定プレビュー" - -msgid "Enter a directory for the configuration(s) to be saved" -msgstr "設定を保存するディレクトリを入力" - -msgid "Select encryption type" -msgstr "暗号化のタイプを選択" - -msgid "Select disks for the installation" -msgstr "インストール用のディスクを選択" - -msgid "Enter a mountpoint" -msgstr "マウントポイントを入力" +msgid "Pre-existing pacman lock never exited. Please clean up any existing pacman sessions before using archinstall." +msgstr "既存の pacman のロックが終了しませんでした。archinstall を使用する前に、既存の pacman セッションをすべてクリーンアップしてください。" #, python-brace-format -msgid "Enter a size (default: {}): " -msgstr "サイズを入力（デフォルト: {}): " - -msgid "Enter subvolume name" -msgstr "サブボリューム名を入力" - -msgid "Enter subvolume mountpoint" -msgstr "サブボリュームのマウントポイントを入力" - -msgid "Select a disk configuration" -msgstr "ディスクの設定を選択" - -msgid "Enter root mount directory" -msgstr "ルートマウントディレクトリを入力" - -msgid "You will use whatever drive-setup is mounted at the specified directory" -msgstr "指定されたディレクトリにマウントされているドライブの設定を使用します" - -msgid "WARNING: Archinstall won't check the suitability of this setup" -msgstr "警告: Archinstall はこのセットアップの適合性をチェックしません" - -msgid "Select main filesystem" -msgstr "メインファイルシステムを選択" - -msgid "Enter a hostname" -msgstr "ホスト名を入力" - -msgid "Select timezone" -msgstr "タイムゾーンを選択" - -msgid "Enter the number of parallel downloads to be enabled" -msgstr "有効にする並列ダウンロード数を入力" +msgid "Enter the number of parallel downloads (1-{})" +msgstr "並列ダウンロード数を入力 (1-{})" #, python-brace-format msgid "Value must be between 1 and {}" msgstr "値は 1 から {} までの範囲にしてください" -msgid "Select which kernel(s) to install" -msgstr "インストールするカーネルを選択" +msgid "Enable colored output for pacman" +msgstr "pacman でカラー出力を有効にする" -msgid "Enter a respository name" -msgstr "リポジトリ名を入力" +msgid "The proprietary Nvidia driver is not supported by Sway." +msgstr "プロプライエタリの Nvidia ドライバーは Sway ではサポートされていません。" -msgid "Enter the repository url" -msgstr "リポジトリの URL を入力" +msgid "It is likely that you will run into issues, are you okay with that?" +msgstr "問題が発生する可能性が高いですが、よろしいですか？" -msgid "Enter server url" -msgstr "サーバーの URL を入力" - -msgid "Select mirror regions to be enabled" -msgstr "有効にするミラー地域を選択" - -msgid "Select optional repositories to be enabled" -msgstr "有効にするオプションリポジトリを選択" - -msgid "Select an interface" -msgstr "インターフェースを選択" - -msgid "Choose network configuration" -msgstr "ネットワーク設定を選択" - -msgid "No packages found" -msgstr "パッケージが見つかりません" +msgid "Selected profiles: " +msgstr "選択したプロファイル: " msgid "Select which greeter to install" msgstr "インストールするグリーターを選択" @@ -1979,14 +1097,1303 @@ msgstr "インストールするグリーターを選択" msgid "Select a profile type" msgstr "プロファイルのタイプを選択" +#, python-brace-format +msgid "Unable to fetch profile from specified url: {}" +msgstr "指定された URL からプロファイルを取得できません: {}" + +#, python-brace-format +msgid "Profiles must have unique name, but profile definitions with duplicate name found: {}" +msgstr "プロファイルには一意の名前が必要ですが、重複した名前のプロファイル定義が見つかりました: {}" + +msgid "Add a user" +msgstr "ユーザーを追加" + +msgid "Change password" +msgstr "パスワードを変更" + +msgid "Promote/Demote user" +msgstr "ユーザーを昇格/降格" + +msgid "Delete User" +msgstr "ユーザーを削除" + +msgid "User" +msgstr "ユーザー" + msgid "Enter new password" msgstr "新しいパスワードを入力" +msgid "The username you entered is invalid" +msgstr "入力したユーザー名は無効です" + msgid "Enter a username" msgstr "ユーザー名を入力" +msgid "Username" +msgstr "ユーザー名" + msgid "Enter a password" msgstr "パスワードを入力" -msgid "The password did not match, please try again" -msgstr "パスワードが一致しません。もう一度試してください" +#, python-brace-format +msgid "Should \"{}\" be a superuser (sudo)?\n" +msgstr "\"{}\" はスーパーユーザーに昇格しますか（sudo）？\n" + +#, python-brace-format +msgid "About to upload \"{}\" to the publicly accessible {}" +msgstr "\"{}\" を公開アクセス可能な {} にアップロードしようとしています" + +msgid "Do you want to continue?" +msgstr "続行しますか？" + +#, python-brace-format +msgid "Log uploaded successfully. URL: {}" +msgstr "ログのアップロードに成功しました。URL: {}" + +msgid "Failed to upload log." +msgstr "ログのアップロードに失敗しました。" + +msgid "Archinstall requires root privileges to run. See --help for more." +msgstr "Archinstall を実行するには root 権限が必要です。詳細については --help を参照してください。" + +msgid "New version available" +msgstr "新しいバージョンが利用可能" + +msgid "Starting device modifications in " +msgstr "次の場所でデバイスの変更を開始しています " + +msgid "Ok" +msgstr "OK" + +msgid "Input cannot be empty" +msgstr "入力は空にできません" + +msgid "Yes" +msgstr "Yes" + +msgid "No" +msgstr "No" + +msgid " (default)" +msgstr " (デフォルト)" + +#~ msgid "[!] A log file has been created here: {} {}" +#~ msgstr "[!] ここにログファイルが作成されました: {} {}" + +#~ msgid " Please submit this issue (and file) to https://github.com/archlinux/archinstall/issues" +#~ msgstr " この問題（およびファイル）を https://github.com/archlinux/archinstall/issues に送信してください" + +#~ msgid "And one more time for verification: " +#~ msgstr "確認のためにもう1度: " + +#~ msgid "Desired hostname for the installation: " +#~ msgstr "インストール時のホスト名: " + +#~ msgid "Username for required superuser with sudo privileges: " +#~ msgstr "sudo 権限を持つスーパーユーザーのユーザー名: " + +#~ msgid "Any additional users to install (leave blank for no users): " +#~ msgstr "インストールする追加のユーザー（ユーザーがない場合は無記入）: " + +#~ msgid "Should this user be a superuser (sudoer)?" +#~ msgstr "このユーザーはスーパーユーザーに昇格しますか（sudoer）？" + +#~ msgid "Select a timezone" +#~ msgstr "タイムゾーンを選択" + +#~ msgid "Would you like to use GRUB as a bootloader instead of systemd-boot?" +#~ msgstr "systemd-boot の代わりに GRUB をブートローダーとして使用しますか？" + +#~ msgid "Choose a bootloader" +#~ msgstr "ブートローダーを選択" + +#~ msgid "Choose an audio server" +#~ msgstr "オーディオサーバーを選択" + +#~ msgid "Only packages such as base, base-devel, linux, linux-firmware, efibootmgr and optional profile packages are installed." +#~ msgstr "base, base-devel, linux, linux-firmware, efibootmgr などのパッケージとオプションのプロファイルパッケージのみがインストールされます。" + +#~ msgid "If you desire a web browser, such as firefox or chromium, you may specify it in the following prompt." +#~ msgstr "firefox や chromium などのウェブブラウザーをインストールする場合は、次のプロンプトで指定できます。" + +#~ msgid "Write additional packages to install (space separated, leave blank to skip): " +#~ msgstr "追加でインストールするパッケージを書く（スペースで区切る。無記入でスキップ）: " + +#~ msgid "Use NetworkManager (necessary for configuring internet graphically in GNOME and KDE)" +#~ msgstr "ネットワークマネージャーを使用（GNOME と KDE でインターネットをグラフィカルに設定するのに必要）" + +#~ msgid "Select one network interface to configure" +#~ msgstr "設定するネットワークインターフェイスを 1 つ選択" + +#~ msgid "Select which mode to configure for \"{}\" or skip to use default mode \"{}\"" +#~ msgstr "どのモードを \"{}\" に設定するかを選択。スキップでデフォルトモード \"{}\" を使用" + +#~ msgid "Enter your gateway (router) IP address or leave blank for none: " +#~ msgstr "ゲートウェイ（ルーター）の IP アドレスを入力。無い場合は無記入: " + +#~ msgid "Enter your DNS servers (space separated, blank for none): " +#~ msgstr "DNS サーバーを入力（スペースで区切る。無い場合は無記入）: " + +#~ msgid "Select which filesystem your main partition should use" +#~ msgstr "メインパーティションで使用するファイルシステムを選択" + +#~ msgid "Current partition layout" +#~ msgstr "現在のパーティションレイアウト" + +#~ msgid "" +#~ "Select what to do with\n" +#~ "{}" +#~ msgstr "" +#~ "何をするか選択\n" +#~ "{}" + +#~ msgid "Enter a desired filesystem type for the partition" +#~ msgstr "パーティションのファイルシステムを入力" + +#~ msgid "Enter the start location (in parted units: s, GB, %, etc. ; default: {}): " +#~ msgstr "開始場所を入力（単位: s, GB, % など。デフォルト: {}）: " + +#~ msgid "Enter the end location (in parted units: s, GB, %, etc. ; ex: {}): " +#~ msgstr "終了場所を入力（単位: s, GB, % など。例: {}）: " + +#~ msgid "{} contains queued partitions, this will remove those, are you sure?" +#~ msgstr "{} にはキューに入っているパーティションが含まれます。それらが削除されますがよろしいですか？" + +#~ msgid "" +#~ "{}\n" +#~ "\n" +#~ "Select by index which partitions to delete" +#~ msgstr "" +#~ "{}\n" +#~ "\n" +#~ "削除するパーティションをインデックスで選択" + +#~ msgid "" +#~ "{}\n" +#~ "\n" +#~ "Select by index which partition to mount where" +#~ msgstr "" +#~ "{}\n" +#~ "\n" +#~ "どのパーティションをどこにマウントするかをインデックスで選択" + +#~ msgid " * Partition mount-points are relative to inside the installation, the boot would be /boot as an example." +#~ msgstr "* パーティションのマウントポイントはインストールにおける相対的なものであり、例として boot は /boot になります。" + +#~ msgid "Select where to mount partition (leave blank to remove mountpoint): " +#~ msgstr "パーティションをマウントする場所を選択（無記入でマウントポイントを削除）: " + +#~ msgid "" +#~ "{}\n" +#~ "\n" +#~ "Select which partition to mask for formatting" +#~ msgstr "" +#~ "{}\n" +#~ "\n" +#~ "フォーマット対象としてマークするパーティションを選択" + +#~ msgid "" +#~ "{}\n" +#~ "\n" +#~ "Select which partition to mark as encrypted" +#~ msgstr "" +#~ "{}\n" +#~ "\n" +#~ "暗号化対象としてマークするパーティションを選択" + +#~ msgid "" +#~ "{}\n" +#~ "\n" +#~ "Select which partition to mark as bootable" +#~ msgstr "" +#~ "{}\n" +#~ "\n" +#~ "ブータブルとしてマークするパーティションを選択" + +#~ msgid "" +#~ "{}\n" +#~ "\n" +#~ "Select which partition to set a filesystem on" +#~ msgstr "" +#~ "{}\n" +#~ "\n" +#~ "ファイルシステムを設定するパーティションを選択" + +#~ msgid "Enter a desired filesystem type for the partition: " +#~ msgstr "パーティションのファイルシステムを入力: " + +#~ msgid "Wipe all selected drives and use a best-effort default partition layout" +#~ msgstr "選択したすべてのドライブを消去し、ベストエフォートのデフォルトパーティションレイアウトを使用する" + +#~ msgid "Select what to do with each individual drive (followed by partition usage)" +#~ msgstr "個々のドライブをどうするかを選択（次にパーティションの使用方法が続く）" + +#~ msgid "Select what you wish to do with the selected block devices" +#~ msgstr "選択したブロックデバイスで何をするかを選択" + +#~ msgid "This is a list of pre-programmed profiles, they might make it easier to install things like desktop environments" +#~ msgstr "これは事前にプログラムされたプロファイルのリストです。デスクトップ環境などのインストールが簡単になる可能性があります" + +#~ msgid "Select keyboard layout" +#~ msgstr "キーボードレイアウトを選択" + +#~ msgid "Select one of the regions to download packages from" +#~ msgstr "パッケージをダウンロードする地域を 1 つ選択" + +#~ msgid "Select one or more hard drives to use and configure" +#~ msgstr "使用・設定する 1 つ以上のハードドライブを選択" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Select a graphics driver or leave blank to install all open-source drivers" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "グラフィックドライバーを選択するか、無記入ですべてのオープンソースドライバーをインストール" + +#~ msgid "All open-source (default)" +#~ msgstr "すべてのオープンソース（デフォルト）" + +#~ msgid "Choose which kernels to use or leave blank for default \"{}\"" +#~ msgstr "使用するカーネルを選択。無記入でデフォルトの \"{}\"" + +#~ msgid "Choose which locale language to use" +#~ msgstr "使用するロケール言語を選択" + +#~ msgid "Choose which locale encoding to use" +#~ msgstr "使用するロケールエンコーディングを選択" + +#~ msgid "Select one of the values shown below: " +#~ msgstr "以下の値のいずれかを選択: " + +#~ msgid "Select one or more of the options below: " +#~ msgstr "以下のオプションを 1 つ以上選択: " + +#~ msgid "Adding partition...." +#~ msgstr "パーティションを追加...." + +#~ msgid "You need to enter a valid fs-type in order to continue. See `man parted` for valid fs-type's." +#~ msgstr "続行するには、有効な fs-type を入力する必要があります。有効な fs-type については、 `man parted` を参照してください。" + +#~ msgid "Error: Listing profiles on URL \"{}\" resulted in:" +#~ msgstr "エラー: URL \"{}\" のプロファイルをリストすると、次の結果が発生:" + +#~ msgid "Error: Could not decode \"{}\" result as JSON:" +#~ msgstr "エラー: \"{}\" の結果を JSON としてデコードできませんでした:" + +#~ msgid "Mirror region" +#~ msgstr "ミラーの地域" + +#~ msgid "Drive(s)" +#~ msgstr "ドライブ" + +#~ msgid "Disk layout" +#~ msgstr "ディスクレイアウト" + +#~ msgid "Superuser account" +#~ msgstr "スーパーユーザーアカウント" + +#~ msgid "Install ({} config(s) missing)" +#~ msgstr "インストール（{} 個の設定がありません）" + +#~ msgid "" +#~ "You decided to skip harddrive selection\n" +#~ "and will use whatever drive-setup is mounted at {} (experimental)\n" +#~ "WARNING: Archinstall won't check the suitability of this setup\n" +#~ "Do you wish to continue?" +#~ msgstr "" +#~ "ハードドライブの選択をスキップし、\n" +#~ "{} にマウントしているドライブのセットアップを使用します（実験的）\n" +#~ "警告: Archinstall はこのセットアップの適合性をチェックしません\n" +#~ "続行しますか？" + +#~ msgid "Re-using partition instance: {}" +#~ msgstr "パーティションインスタンスの再利用: {}" + +#~ msgid "Create a new partition" +#~ msgstr "新しいパーティションを作成" + +#~ msgid "Delete a partition" +#~ msgstr "パーティションを削除" + +#~ msgid "Clear/Delete all partitions" +#~ msgstr "すべてのパーティションをクリア/削除" + +#~ msgid "Assign mount-point for a partition" +#~ msgstr "パーティションにマウントポイントを割り当てる" + +#~ msgid "Mark/Unmark a partition to be formatted (wipes data)" +#~ msgstr "フォーマットするパーティションとしてマーク/マーク解除（データを消去）" + +#~ msgid "Mark/Unmark a partition as encrypted" +#~ msgstr "暗号化するパーティションとしてマーク/マーク解除" + +#~ msgid "Mark/Unmark a partition as bootable (automatic for /boot)" +#~ msgstr "ブータブルパーティションとしてマーク/マーク解除（/boot の場合は自動）" + +#~ msgid "Set desired filesystem for a partition" +#~ msgstr "パーティションのファイルシステムを設定" + +#~ msgid "Not configured, unavailable unless setup manually" +#~ msgstr "未設定。手動で設定しない限り使用できません" + +#~ msgid "Set/Modify the below options" +#~ msgstr "以下のオプションを設定/変更" + +#~ msgid "" +#~ "Use ESC to skip\n" +#~ "\n" +#~ msgstr "" +#~ "Esc でスキップ\n" +#~ "\n" + +#~ msgid "Enter a password: " +#~ msgstr "パスワードを入力: " + +#~ msgid "Enter a encryption password for {}" +#~ msgstr "{} の暗号化パスワードを入力" + +#~ msgid "Enter disk encryption password (leave blank for no encryption): " +#~ msgstr "ディスクの暗号化パスワードを入力（暗号化しない場合は無記入）: " + +#~ msgid "Create a required super-user with sudo privileges: " +#~ msgstr "sudo 権限を持つスーパーユーザーを作成: " + +#~ msgid "Enter root password (leave blank to disable root): " +#~ msgstr "root パスワードを入力（root を無効にする場合は無記入）: " + +#~ msgid "Password for user \"{}\": " +#~ msgstr "ユーザー \"{}\" のパスワード: " + +#~ msgid "Verifying that additional packages exist (this might take a few seconds)" +#~ msgstr "追加のパッケージが存在することを確認（これには数秒かかる場合があります）" + +#~ msgid "Enter a username to create an additional user (leave blank to skip): " +#~ msgstr "ユーザー名を入力して追加ユーザーを作成（無記入でスキップ）: " + +#~ msgid "Use ESC to skip\n" +#~ msgstr "Esc でスキップ\n" + +#~ msgid "" +#~ "\n" +#~ " Choose an object from the list, and select one of the available actions for it to execute" +#~ msgstr "" +#~ "\n" +#~ "リストからオブジェクトを選択し、そのオブジェクトで実行できるアクションの 1 つを選択" + +#~ msgid "Add" +#~ msgstr "追加" + +#~ msgid "Copy" +#~ msgstr "コピー" + +#~ msgid "Edit" +#~ msgstr "編集" + +#~ msgid "Delete" +#~ msgstr "削除" + +#~ msgid "Select an action for '{}'" +#~ msgstr "'{}' へのアクションを選択" + +#~ msgid "Copy to new key:" +#~ msgstr "新しいキーにコピー:" + +#~ msgid "Unknown nic type: {}. Possible values are {}" +#~ msgstr "不明な NIC タイプ: {}。可能な値は {}" + +#~ msgid "" +#~ "\n" +#~ "This is your chosen configuration:" +#~ msgstr "" +#~ "\n" +#~ "これが選択した設定です:" + +#~ msgid "Choose which optional additional repositories to enable" +#~ msgstr "オプションで有効にする追加リポジトリを選択" + +#~ msgid "" +#~ "\n" +#~ "Define a new user\n" +#~ msgstr "" +#~ "\n" +#~ "新しいユーザーを定義\n" + +#~ msgid "User Name : " +#~ msgstr "ユーザー名: " + +#~ msgid "Should {} be a superuser (sudoer)?" +#~ msgstr "{} はスーパーユーザーに昇格しますか（sudoer）？" + +#~ msgid "Define users with sudo privilege: " +#~ msgstr "sudo 権限を持つユーザーを定義: " + +#~ msgid "No network configuration" +#~ msgstr "ネットワーク設定なし" + +#~ msgid "Set desired subvolumes on a btrfs partition" +#~ msgstr "Btrfs パーティションに必要なサブボリュームを設定" + +#~ msgid "" +#~ "{}\n" +#~ "\n" +#~ "Select which partition to set subvolumes on" +#~ msgstr "" +#~ "{}\n" +#~ "\n" +#~ "サブボリュームを設定するパーティションを選択" + +#~ msgid "Manage btrfs subvolumes for current partition" +#~ msgstr "現在のパーティションの Btrfs サブボリュームを管理" + +#~ msgid "Save user configuration" +#~ msgstr "ユーザー設定を保存" + +#~ msgid "Save disk layout" +#~ msgstr "ディスクレイアウトを保存" + +#~ msgid "Choose which configuration to save" +#~ msgstr "保存する設定を選択" + +#~ msgid "Enter a directory for the configuration(s) to be saved: " +#~ msgstr "設定を保存するディレクトリを入力: " + +#~ msgid "Not a valid directory: {}" +#~ msgstr "有効なディレクトリではありません: {}" + +#~ msgid "The password you are using seems to be weak," +#~ msgstr "使用しているパスワードは弱いようです、" + +#~ msgid "are you sure you want to use it?" +#~ msgstr "本当に使用してもよろしいですか？" + +#~ msgid "Either root-password or at least 1 superuser must be specified" +#~ msgstr "root パスワードか、1人以上のスーパーユーザーを指定してください" + +#~ msgid "Manage superuser accounts: " +#~ msgstr "スーパーユーザーアカウントを管理: " + +#~ msgid "Manage ordinary user accounts: " +#~ msgstr "一般ユーザーのアカウントを管理: " + +#~ msgid " Subvolume :{:16}" +#~ msgstr " サブボリューム :{:16}" + +#~ msgid " mounted at {:16}" +#~ msgstr " マウント場所 {:16}" + +#~ msgid " with option {}" +#~ msgstr " 次のオプションで {}" + +#~ msgid "" +#~ "\n" +#~ " Fill the desired values for a new subvolume \n" +#~ msgstr "" +#~ "\n" +#~ " 新しいサブボリュームに必要な値を入力 \n" + +#~ msgid "Subvolume name " +#~ msgstr "サブボリューム名 " + +#~ msgid "Subvolume mountpoint" +#~ msgstr "サブボリュームのマウントポイント" + +#~ msgid "Subvolume options" +#~ msgstr "サブボリュームのオプション" + +#~ msgid "Save" +#~ msgstr "保存" + +#~ msgid "Subvolume name :" +#~ msgstr "サブボリューム名:" + +#~ msgid "Select a mount point :" +#~ msgstr "マウントポイントを選択:" + +#~ msgid "Select the desired subvolume options " +#~ msgstr "サブボリュームのオプションを選択" + +#~ msgid "Define users with sudo privilege, by username: " +#~ msgstr "sudo 権限を持つユーザーを、ユーザー名で定義: " + +#~ msgid "Would you like to use BTRFS compression?" +#~ msgstr "Btrfs の圧縮を使用しますか？" + +#~ msgid "Minimum capacity for /home partition: {}GB\n" +#~ msgstr "/home パーティションの最小容量: {}GB\n" + +#~ msgid "Minimum capacity for Arch Linux partition: {}GB" +#~ msgstr "Arch Linux パーティションの最小容量: {}GB" + +#~ msgid "Continue" +#~ msgstr "続行" + +#~ msgid "yes" +#~ msgstr "yes" + +#~ msgid "no" +#~ msgstr "no" + +#~ msgid "set: {}" +#~ msgstr "セット: {}" + +#~ msgid "Manual configuration setting must be a list" +#~ msgstr "手動設定はリストである必要があります" + +#~ msgid "No iface specified for manual configuration" +#~ msgstr "手動設定に iface が指定されていません" + +#~ msgid "Manual nic configuration with no auto DHCP requires an IP address" +#~ msgstr "自動 DHCP を使用しない手動 NIC 設定には、IP アドレスが必要です" + +#~ msgid "Select interface to add" +#~ msgstr "追加するインターフェースを選択" + +#~ msgid "Mark/Unmark a partition as compressed (btrfs only)" +#~ msgstr "圧縮するパーティションとしてマーク/マーク解除（Btrfs のみ）" + +#~ msgid "The password you are using seems to be weak, are you sure you want to use it?" +#~ msgstr "使用しているパスワードは弱いようですが、本当に使用してもよろしいですか？" + +#~ msgid "Provides a selection of desktop environments and tiling window managers, e.g. gnome, kde, sway" +#~ msgstr "デスクトップ環境とタイルウィンドウマネージャーの選択を提供します。e.g. gnome, kde, sway" + +#~ msgid "Select your desired desktop environment" +#~ msgstr "デスクトップ環境を選択" + +#~ msgid "A very basic installation that allows you to customize Arch Linux as you see fit." +#~ msgstr "Arch Linux を必要に応じてカスタマイズできる非常に基本的なインストールです。" + +#~ msgid "Provides a selection of various server packages to install and enable, e.g. httpd, nginx, mariadb" +#~ msgstr "さまざまなサーバー パッケージの選択肢を提供します。e.g. httpd, nginx, mariadb" + +#~ msgid "Choose which servers to install, if none then a minimal installation will be done" +#~ msgstr "インストールするサーバーを選択。存在しない場合は最小限のインストールが実行されます" + +#~ msgid "Installs a minimal system as well as xorg and graphics drivers." +#~ msgstr "最小限のシステムと xorg およびグラフィックドライバーをインストール。" + +#~ msgid "Press Enter to continue." +#~ msgstr "Enter キーで続行します。" + +#~ msgid "Would you like to chroot into the newly created installation and perform post-installation configuration?" +#~ msgstr "新しく作成したインストールに chroot して、インストール後の設定を実行しますか？" + +#~ msgid "Select one or more hard drives to use and configure\n" +#~ msgstr "使用・設定する 1 つ以上のハードドライブを選択\n" + +#~ msgid "Any modifications to the existing setting will reset the disk layout!" +#~ msgstr "既存の設定を変更すると、ディスクレイアウトがリセットされます！" + +#~ msgid "If you reset the harddrive selection this will also reset the current disk layout. Are you sure?" +#~ msgstr "ハードドライブの選択をリセットすると、現在のディスクレイアウトもリセットされます。よろしいですか？" + +#~ msgid "Save and exit" +#~ msgstr "保存して終了" + +#~ msgid "" +#~ "{}\n" +#~ "contains queued partitions, this will remove those, are you sure?" +#~ msgstr "" +#~ "{}\n" +#~ "キューに入れられたパーティションが含まれています。削除しますがよろしいですか？" + +#~ msgid "No audio server" +#~ msgstr "オーディオサーバーなし" + +#~ msgid "(default)" +#~ msgstr "（デフォルト）" + +#~ msgid "Use ESC to skip" +#~ msgstr "Esc でスキップ" + +#~ msgid "" +#~ "Use CTRL+C to reset current selection\n" +#~ "\n" +#~ msgstr "" +#~ "Ctrl+C で現在の選択をリセット\n" +#~ "\n" + +#~ msgid "Copy to: " +#~ msgstr "コピー先: " + +#~ msgid "Edit: " +#~ msgstr "編集: " + +#~ msgid "Key: " +#~ msgstr "キー: " + +#~ msgid "Edit {}: " +#~ msgstr "編集 {}: " + +#~ msgid "Add: " +#~ msgstr "追加: " + +#~ msgid "Value: " +#~ msgstr "値: " + +#~ msgid "You can skip selecting a drive and partitioning and use whatever drive-setup is mounted at /mnt (experimental)" +#~ msgstr "ドライブ選択とパーティション作成をスキップして、/mnt にマウントしているドライブのセットアップを使用できます（実験的）" + +#~ msgid "Select one of the disks or skip and use /mnt as default" +#~ msgstr "いずれかのディスクを選択するか、スキップして /mnt をデフォルトとして使用" + +#~ msgid "Select which partitions to mark for formatting:" +#~ msgstr "フォーマットするパーティションを選択:" + +#~ msgid "Use HSM to unlock encrypted drive" +#~ msgstr "HSM を使用して暗号化されたドライブのロックを解除" + +#~ msgid "Device" +#~ msgstr "デバイス" + +#~ msgid "Size" +#~ msgstr "サイズ" + +#~ msgid "Free space" +#~ msgstr "空き容量" + +#~ msgid "Bus-type" +#~ msgstr "Bus タイプ" + +#~ msgid "Enter username (leave blank to skip): " +#~ msgstr "ユーザー名を入力（無記入でスキップ）: " + +#~ msgid "The username you entered is invalid. Try again" +#~ msgstr "入力したユーザー名は無効です。もう1度やり直してください" + +#~ msgid "Should \"{}\" be a superuser (sudo)?" +#~ msgstr "\"{}\" はスーパーユーザーに昇格しますか（sudo）？" + +#~ msgid "Select which partitions to encrypt" +#~ msgstr "暗号化するパーティションを選択" + +#~ msgid "Configured {} interfaces" +#~ msgstr "設定した {} インターフェース" + +#~ msgid "This option enables the number of parallel downloads that can occur during installation" +#~ msgstr "このオプションは、インストール中に実行できる並列ダウンロードの数を有効にします" + +#~ msgid "" +#~ "Enter the number of parallel downloads to be enabled.\n" +#~ " (Enter a value between 1 to {})\n" +#~ "Note:" +#~ msgstr "" +#~ "有効にする並列ダウンロードの数を入力してください。\n" +#~ " （1 から {} の値を入力）\n" +#~ "注意:" + +#~ msgid " - Maximum value : {} ( Allows {} parallel downloads, allows {} downloads at a time )" +#~ msgstr " - 最大値 : {} ({} 個の並列ダウンロードを許可して、1度に {} 個のダウンロードを許可する)" + +#~ msgid " - Minimum value : 1 ( Allows 1 parallel download, allows 2 downloads at a time )" +#~ msgstr " - 最小値 : 1 (1 個の並列ダウンロードを許可して、1度に 2 個のダウンロードを許可する)" + +#~ msgid " - Disable/Default : 0 ( Disables parallel downloading, allows only 1 download at a time )" +#~ msgstr " - 無効/デフォルト : 0 (並列ダウンロードを無効にして、1度に 1 個のみダウンロードを許可する)" + +#, python-brace-format +#~ msgid "Invalid input! Try again with a valid input [1 to {max_downloads}, or 0 to disable]" +#~ msgstr "無効な入力です！有効な入力を使用して再試行してください [1 - {max_downloads}、0 で無効]" + +#~ msgid "ESC to skip" +#~ msgstr "Esc でスキップ" + +#~ msgid "CTRL+C to reset" +#~ msgstr "Ctrl+C でリセット" + +#~ msgid "TAB to select" +#~ msgstr "Tab で選択" + +#~ msgid "[Default value: 0] > " +#~ msgstr "[デフォルト値: 0] > " + +#~ msgid "To be able to use this translation, please install a font manually that supports the language." +#~ msgstr "この翻訳を使用できるようにするには、その言語をサポートするフォントを手動でインストールしてください。" + +#~ msgid "The font should be stored as {}" +#~ msgstr "フォントは {} として保存する必要があります" + +#~ msgid "Select an execution mode" +#~ msgstr "実行モードを選択" + +#~ msgid "Select one or more devices to use and configure" +#~ msgstr "使用・設定する 1 つ以上のデバイスを選択" + +#~ msgid "If you reset the device selection this will also reset the current disk layout. Are you sure?" +#~ msgstr "デバイスの選択をリセットすると、現在のディスクレイアウトもリセットされます。よろしいですか？" + +#~ msgid "Existing Partitions" +#~ msgstr "既存のパーティション" + +#~ msgid "Select a partitioning option" +#~ msgstr "パーティション作成のオプションを選択" + +#~ msgid "Enter the root directory of the mounted devices: " +#~ msgstr "マウントしているデバイスのルートディレクトリを入力: " + +#~ msgid "This is a list of pre-programmed profiles_bck, they might make it easier to install things like desktop environments" +#~ msgstr "これは事前にプログラムされたプロファイルのリストです。デスクトップ環境などのインストールが簡単になる可能性があります" + +#~ msgid "Current profile selection" +#~ msgstr "現在のプロファイルの選択" + +#~ msgid "If mountpoint /boot is set, then the partition will also be marked as bootable." +#~ msgstr "マウントポイントに /boot が設定された場合、パーティションはブータブルとしてマークされます。" + +#~ msgid "Mountpoint: " +#~ msgstr "マウントポイント: " + +#~ msgid "Current free sectors on device {}:" +#~ msgstr "デバイス {} の現在の空きセクター:" + +#~ msgid "Total sectors: {}" +#~ msgstr "総セクター数: {}" + +#~ msgid "Enter the start sector (default: {}): " +#~ msgstr "開始セクターを入力（デフォルト: {}): " + +#~ msgid "Enter the end sector of the partition (percentage or block number, default: {}): " +#~ msgstr "パーティションの終了セクターを入力（パーセンテージかブロック番号。デフォルト: {}): " + +#~ msgid "Default: 10000ms, Recommended range: 1000-60000" +#~ msgstr "デフォルト: 10000ms, 推奨範囲: 1000-60000" + +#~ msgid "Iteration time cannot be empty" +#~ msgstr "イテレーション時間は空にできません" + +#~ msgid "No HSM devices available" +#~ msgstr "利用可能な HSM デバイスがありません" + +#~ msgid "Select disk encryption option" +#~ msgstr "ディスクの暗号化オプションを選択" + +#~ msgid "Partition encryption" +#~ msgstr "パーティションの暗号化" + +#, python-brace-format +#~ msgid " ! Formatting {} in " +#~ msgstr " ! {} のフォーマットまで " + +#~ msgid "← Back" +#~ msgstr "← 戻る" + +#~ msgid "All settings will be reset, are you sure?" +#~ msgstr "すべての設定がリセットされます。よろしいですか？" + +#~ msgid "Please chose which greeter to install for the chosen profiles: {}" +#~ msgstr "選択したプロファイルにインストールするグリーターを選択: {}" + +#~ msgid "The proprietary Nvidia driver is not supported by Sway. It is likely that you will run into issues, are you okay with that?" +#~ msgstr "プロプライエタリの Nvidia ドライバーは Sway ではサポートされていません。問題が発生する可能性がありますが、よろしいですか？" + +#~ msgid "Add profile" +#~ msgstr "プロファイルを追加" + +#~ msgid "Edit profile" +#~ msgstr "プロファイルを編集" + +#~ msgid "Delete profile" +#~ msgstr "プロファイルを削除" + +#~ msgid "Profile name: " +#~ msgstr "プロファイル名: " + +#~ msgid "The profile name you entered is already in use. Try again" +#~ msgstr "入力したプロファイル名はすでに使用されています。もう1度やり直してください" + +#~ msgid "Packages to be install with this profile (space separated, leave blank to skip): " +#~ msgstr "このプロファイルでインストールするパッケージ（スペースで区切る。無記入でスキップ）: " + +#~ msgid "Services to be enabled with this profile (space separated, leave blank to skip): " +#~ msgstr "このプロファイルで有効にするサービス（スペースで区切る。未記入でスキップ): " + +#~ msgid "Should this profile be enabled for installation?" +#~ msgstr "このプロファイルのインストールを有効にしますか？" + +#~ msgid "Create your own" +#~ msgstr "自分で作成" + +#~ msgid "" +#~ "\n" +#~ "Select a graphics driver or leave blank to install all open-source drivers" +#~ msgstr "" +#~ "\n" +#~ "グラフィックドライバーを選択。無記入ですべてのオープンソースドライバーをインストール" + +#~ msgid "Sway needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" +#~ msgstr "Sway はお使いの Seat（キーボード、マウスなどのハードウェアデバイス群）にアクセスする必要があります" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Choose an option to give Sway access to your hardware" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Sway にハードウェアへのアクセスを許可するオプションを選択" + +#~ msgid "Please chose which greeter to install" +#~ msgstr "インストールするグリーターを選択" + +#~ msgid "This is a list of pre-programmed default_profiles" +#~ msgstr "これは、事前にプログラムされた default_profile のリストです" + +#~ msgid "Finding possible directories to save configuration files ..." +#~ msgstr "設定ファイルを保存できるディレクトリを検索しています..." + +#~ msgid "Select directory (or directories) for saving configuration files" +#~ msgstr "設定ファイルを保存するディレクトリを選択" + +#~ msgid "Add a custom mirror" +#~ msgstr "カスタムミラーを追加" + +#~ msgid "Change custom mirror" +#~ msgstr "カスタムミラーを変更" + +#~ msgid "Delete custom mirror" +#~ msgstr "カスタムミラーを削除" + +#~ msgid "Enter name (leave blank to skip): " +#~ msgstr "名前を入力（無記入でスキップ）: " + +#~ msgid "Enter url (leave blank to skip): " +#~ msgstr "URL を入力（未記入でスキップ）: " + +#~ msgid "Select signature check option" +#~ msgstr "署名チェックのオプションを選択" + +#~ msgid "Custom mirrors" +#~ msgstr "カスタムミラー" + +#~ msgid "Defined" +#~ msgstr "定義済み" + +#~ msgid "" +#~ "Enter a directory for the configuration(s) to be saved (tab completion enabled)\n" +#~ "Save directory: " +#~ msgstr "" +#~ "設定を保存するディレクトリを入力（Tab で補完可能）\n" +#~ "保存ディレクトリ: " + +#~ msgid "" +#~ "Do you want to save {} configuration file(s) in the following location?\n" +#~ "\n" +#~ "{}" +#~ msgstr "" +#~ "{} 設定ファイルを次の場所に保存しますか？\n" +#~ "\n" +#~ "{}" + +#~ msgid "Saving {} configuration files to {}" +#~ msgstr "{} 設定ファイルを {} に保存" + +#~ msgid "Mirrors" +#~ msgstr "ミラー" + +#~ msgid "Mirror regions" +#~ msgstr "ミラーの地域" + +#~ msgid " - Maximum value : {} ( Allows {} parallel downloads, allows {max_downloads+1} downloads at a time )" +#~ msgstr " - 最大値 : {}（{} 個の並列ダウンロードを許可し、1度に {max_downloads+1} 個のダウンロードを許可する）" + +#~ msgid "Invalid input! Try again with a valid input [1 to {}, or 0 to disable]" +#~ msgstr "無効な入力です！有効な入力でやり直してください [1 から {}、または 0 で無効]" + +#~ msgid "Use NetworkManager (necessary to configure internet graphically in GNOME and KDE)" +#~ msgstr "ネットワークマネージャーを使用（GNOME と KDE でインターネットをグラフィカルに設定するのに必要）" + +#~ msgid "Total: {} / {}" +#~ msgstr "全体: {} / {}" + +#~ msgid "All entered values can be suffixed with a unit: B, KB, KiB, MB, MiB..." +#~ msgstr "入力したすべての値に、B、KB、KiB、MB、MiB などの単位を付けることができます。" + +#~ msgid "Enter start (default: sector {}): " +#~ msgstr "開始値を入力（デフォルト: セクター {}): " + +#~ msgid "Enter end (default: {}): " +#~ msgstr "終了値を入力（デフォルト: {}): " + +#~ msgid "Unable to determine fido2 devices. Is libfido2 installed?" +#~ msgstr "fido2 デバイスを特定できません。lifido2 はインストールされていますか？" + +#~ msgid "Path" +#~ msgstr "パス" + +#~ msgid "Manufacturer" +#~ msgstr "メーカー" + +#~ msgid "Product" +#~ msgstr "製品" + +#~ msgid "Disks" +#~ msgstr "ディスク" + +#~ msgid "Packages" +#~ msgstr "パッケージ" + +#~ msgid "Locale" +#~ msgstr "ロケール" + +#~ msgid "This option enables the number of parallel downloads that can occur during package downloads" +#~ msgstr "このオプションは、パッケージのダウンロード中に実行できる並列ダウンロードの数を設定します" + +#~ msgid "" +#~ "Enter the number of parallel downloads to be enabled.\n" +#~ "\n" +#~ "Note:\n" +#~ msgstr "" +#~ "並列ダウンロードの数を入力してください。\n" +#~ "\n" +#~ "注意:\n" + +#, python-brace-format +#~ msgid " - Maximum recommended value : {} ( Allows {} parallel downloads at a time )" +#~ msgstr " - 最大推奨値 : {} （1度に {} 個の並列ダウンロードを許可する）" + +#~ msgid " - Disable/Default : 0 ( Disables parallel downloading, allows only 1 download at a time )\n" +#~ msgstr " - 無効/デフォルト : 0 （並列ダウンロードを無効にして、1度に 1 個のダウンロードのみ許可する）\n" + +#~ msgid "Invalid input! Try again with a valid input [or 0 to disable]" +#~ msgstr "無効な入力です！有効な入力でやり直してください（無効にする場合は 0）" + +#~ msgid "Hyprland needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" +#~ msgstr "Hyprland はお使いの Seat（キーボード、マウスなどのハードウェアデバイス群）にアクセスする必要があります" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Choose an option to give Hyprland access to your hardware" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Hyprland にハードウェアへのアクセスを許可するオプションを選択" + +#~ msgid "Time syncronization not completing, while you wait - check the docs for workarounds: https://archinstall.readthedocs.io/" +#~ msgstr "待機中に時刻同期が完了しません - 回避策についてはドキュメントを確認してください: https://archinstall.readthedocs.io/" + +#~ msgid "Provides a selection of desktop environments and tiling window managers, e.g. GNOME, KDE Plasma, Sway" +#~ msgstr "デスクトップ環境とタイルウィンドウマネージャーの選択を提供します。例: GNOME, KDE Plasma, Sway" + +#~ msgid "Use NetworkManager (necessary to configure internet graphically in GNOME and KDE Plasma)" +#~ msgstr "ネットワークマネージャーを使用（GNOME と KDE Plasma でインターネットをグラフィカルに設定するのに必要）" + +#~ msgid "Select a LVM option" +#~ msgstr "LVM のオプションを選択" + +#~ msgid "Logical Volume Management (LVM)" +#~ msgstr "論理ボリューム管理（LVM）" + +#~ msgid "Select which LVM volumes to encrypt" +#~ msgstr "暗号化する LVM ボリュームを選択" + +#~ msgid "Archinstall help" +#~ msgstr "Archinstall ヘルプ" + +#~ msgid "Press Ctrl+h for help" +#~ msgstr "Ctrl+H でヘルプを表示" + +#~ msgid "Choose an option to give Sway access to your hardware" +#~ msgstr "Sway にハードウェアへのアクセスを許可するオプションを選択" + +#~ msgid "Seat access" +#~ msgstr "Seat アクセス" + +#~ msgid "Filesystem" +#~ msgstr "ファイルシステム" + +#~ msgid "Start (default: sector {}): " +#~ msgstr "開始値（デフォルト: セクター {}): " + +#~ msgid "End (default: {}): " +#~ msgstr "終了値（デフォルト: {}): " + +#~ msgid "Disk configuration type" +#~ msgstr "ディスク設定のタイプ" + +#~ msgid "Root mount directory" +#~ msgstr "ルートマウントディレクトリ" + +#~ msgid "Select language" +#~ msgstr "言語を選択" + +#~ msgid "Write additional packages to install (space separated, leave blank to skip)" +#~ msgstr "追加でインストールするパッケージを書く（スペースで区切る。無記入でスキップ）" + +#~ msgid "Invalid download number" +#~ msgstr "ダウンロード数が無効です" + +#~ msgid "Number downloads" +#~ msgstr "ダウンロード数" + +#~ msgid "Interfaces" +#~ msgstr "インターフェイス" + +#~ msgid "Modes" +#~ msgstr "モード" + +#~ msgid "IP address" +#~ msgstr "IPアドレス" + +#~ msgid "Gateway address" +#~ msgstr "ゲートウェイアドレス" + +#~ msgid "DNS servers" +#~ msgstr "DNSサーバー" + +#~ msgid "Info" +#~ msgstr "情報" + +#~ msgid "Main profile" +#~ msgstr "メインプロファイル" + +#~ msgid "The confirmation password did not match, please try again" +#~ msgstr "確認のパスワードが一致しませんでした。もう一度試してください" + +#~ msgid "Directory" +#~ msgstr "ディレクトリ" + +#~ msgid "Enter a directory for the configuration(s) to be saved (tab completion enabled)" +#~ msgstr "設定を保存するディレクトリを入力（Tab で補完可能）" + +#~ msgid "Mirror name" +#~ msgstr "ミラーの名前" + +#~ msgid "Select execution mode" +#~ msgstr "実行モードを選択" + +#~ msgid "Press ? for help" +#~ msgstr "? を押すとヘルプを表示" + +#~ msgid "Choose an option to give Hyprland access to your hardware" +#~ msgstr "Hyprland にハードウェアへのアクセスを許可するオプションを選択" + +#, python-brace-format +#~ msgid "Size (default: {}): " +#~ msgstr "サイズ (デフォルト: {}): " + +#~ msgid "Some packages could not be found in the repository" +#~ msgstr "リポジトリ内にいくつかのパッケージが見つかりませんでした" + +#~ msgid "Repository name" +#~ msgstr "リポジトリ名" + +#~ msgid "Server url" +#~ msgstr "サーバー URL" + +#~ msgid "Only ASCII characters are supported" +#~ msgstr "ASCII 文字のみサポートされます" + +#~ msgid "Show help" +#~ msgstr "ヘルプを表示" + +#~ msgid "Exit help" +#~ msgstr "ヘルプを終了" + +#~ msgid "Preview scroll up" +#~ msgstr "プレビューを上にスクロール" + +#~ msgid "Preview scroll down" +#~ msgstr "プレビューを下にスクロール" + +#~ msgid "Move up" +#~ msgstr "上に移動" + +#~ msgid "Move down" +#~ msgstr "下に移動" + +#~ msgid "Move right" +#~ msgstr "右に移動" + +#~ msgid "Move left" +#~ msgstr "左に移動" + +#~ msgid "Jump to entry" +#~ msgstr "エントリーへジャンプ" + +#~ msgid "Skip selection (if available)" +#~ msgstr "選択をスキップ（利用可能な場合）" + +#~ msgid "Reset selection (if available)" +#~ msgstr "選択をリセット（利用可能な場合）" + +#~ msgid "Select on single select" +#~ msgstr "単一で選択" + +#~ msgid "Select on multi select" +#~ msgstr "複数で選択" + +#~ msgid "Reset" +#~ msgstr "リセット" + +#~ msgid "Skip selection menu" +#~ msgstr "選択メニューをスキップ" + +#~ msgid "Start search mode" +#~ msgstr "検索モードを開始" + +#~ msgid "Exit search mode" +#~ msgstr "検索モードを終了" + +#~ msgid "General" +#~ msgstr "一般" + +#~ msgid "Navigation" +#~ msgstr "ナビゲーション" + +#~ msgid "Selection" +#~ msgstr "選択" + +#~ msgid "Search" +#~ msgstr "検索" + +#~ msgid "Down" +#~ msgstr "下へ" + +#~ msgid "Up" +#~ msgstr "上へ" + +#~ msgid "Confirm" +#~ msgstr "確認" + +#~ msgid "Focus right" +#~ msgstr "右にフォーカス" + +#~ msgid "Focus left" +#~ msgstr "左にフォーカス" + +#~ msgid "Toggle" +#~ msgstr "切り替え" + +#~ msgid "Show/Hide help" +#~ msgstr "ヘルプを表示/隠す" + +#~ msgid "Quit" +#~ msgstr "終了" + +#~ msgid "First" +#~ msgstr "最初" + +#~ msgid "Last" +#~ msgstr "最後" + +#~ msgid "Select" +#~ msgstr "選択" + +#~ msgid "Page Up" +#~ msgstr "上のページへ" + +#~ msgid "Page Down" +#~ msgstr "下のページへ" + +#~ msgid "Page up" +#~ msgstr "上のページへ" + +#~ msgid "Page down" +#~ msgstr "下のページへ" + +#~ msgid "Page Left" +#~ msgstr "左のページへ" + +#~ msgid "Page Right" +#~ msgstr "右のページへ" + +#~ msgid "Cursor up" +#~ msgstr "カーソルを上へ" + +#~ msgid "Cursor down" +#~ msgstr "カースルを下へ" + +#~ msgid "Cursor right" +#~ msgstr "カーソルを右へ" + +#~ msgid "Cursor left" +#~ msgstr "カーソルを左へ" + +#~ msgid "Top" +#~ msgstr "一番上へ" + +#~ msgid "Bottom" +#~ msgstr "一番下へ" + +#~ msgid "Home" +#~ msgstr "ホーム" + +#~ msgid "End" +#~ msgstr "最後へ" + +#~ msgid "Toggle option" +#~ msgstr "オプションを切り替え" + +#~ msgid "Scroll Up" +#~ msgstr "上にスクロール" + +#~ msgid "Scroll Down" +#~ msgstr "下にスクロール" + +#~ msgid "Scroll Left" +#~ msgstr "左にスクロール" + +#~ msgid "Scroll Right" +#~ msgstr "右にスクロール" + +#~ msgid "Scroll Home" +#~ msgstr "ホームにスクロール" + +#~ msgid "Scroll End" +#~ msgstr "一番下にスクロール" + +#~ msgid "Focus Next" +#~ msgstr "次にフォーカス" + +#~ msgid "Focus Previous" +#~ msgstr "前にフォーカス" + +#~ msgid "Copy selected text" +#~ msgstr "選択したテキストをコピー" + +#~ msgid "labwc needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" +#~ msgstr "labwc はお使いの Seat（キーボード、マウスなどのハードウェアデバイス群）にアクセスする必要があります" + +#~ msgid "Choose an option to give labwc access to your hardware" +#~ msgstr "labwc にハードウェアへのアクセスを許可するオプションを選択" + +#~ msgid "niri needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" +#~ msgstr "niri はお使いの Seat（キーボード、マウスなどのハードウェアデバイス群）にアクセスする必要があります" + +#~ msgid "Choose an option to give niri access to your hardware" +#~ msgstr "niri にハードウェアへのアクセスを許可するオプションを選択" + +#~ msgid "Installation completed" +#~ msgstr "インストール完了" + +#~ msgid "Credentials file decryption password" +#~ msgstr "認証情報ファイルの復号化パスワード" + +#~ msgid "Snapshot type" +#~ msgstr "スナップショットのタイプ" + +#~ msgid "U2F Login Method" +#~ msgstr "U2F ログインメソッド" + +#~ msgid "Will install to /EFI/BOOT/ (removable location)" +#~ msgstr "/EFI/BOOT/ (リムーバブルな場所) にインストールする" + +#~ msgid "Will install to standard location with NVRAM entry" +#~ msgstr "NVRAM エントリーのある標準の場所にインストールする" + +#~ msgid "Firmware that does not properly support NVRAM boot entries." +#~ msgstr "NVRAM ブートエントリーを適切にサポートしていないファームウェア。" + +#~ msgid "Enter the number of parallel downloads to be enabled" +#~ msgstr "有効にする並列ダウンロード数を入力" + +#, python-brace-format +#~ msgid "Setting up U2F login: {u2f_config.u2f_login_method.value}" +#~ msgstr "U2F ログインの設定: {u2f_config.u2f_login_method.value}" + +#, python-brace-format +#~ msgid "Default: {DEFAULT_ITER_TIME}ms, Recommended range: 1000-60000" +#~ msgstr "デフォルト: {DEFAULT_ITER_TIME}ms, 推奨範囲: 1000-60000" diff --git a/archinstall/locales/languages.json b/archinstall/locales/languages.json index 2dbcf3b4..22c9c9ec 100644 --- a/archinstall/locales/languages.json +++ b/archinstall/locales/languages.json @@ -42,7 +42,7 @@ {"abbr": "fo", "lang": "Faroese"}, {"abbr": "fa", "lang": "Persian"}, {"abbr": "fj", "lang": "Fijian"}, - {"abbr": "fi", "lang": "Finnish"}, + {"abbr": "fi", "lang": "Finnish", "translated_lang": "Suomi"}, {"abbr": "fr", "lang": "French", "translated_lang": "Français"}, {"abbr": "fy", "lang": "Western Frisian"}, {"abbr": "ff", "lang": "Fulah"}, diff --git a/archinstall/locales/locales_generator.sh b/archinstall/locales/locales_generator.sh index 7ce2ea19..18977dfc 100755 --- a/archinstall/locales/locales_generator.sh +++ b/archinstall/locales/locales_generator.sh @@ -1,48 +1,109 @@ #!/usr/bin/env bash set -euo pipefail -cd $(dirname "$0")/.. +cd "$(dirname "$0")/.." -function update_lang() { - file=${1} +usage() { + echo "Usage: ${0} " + echo "" + echo "Commands:" + echo " all Regenerate base.pot and update all languages" + echo " Regenerate base.pot and update a single language" + echo " check Run translation validation checks" + echo " -h, --help Show this help" +} +generate_pot() { + find . -type f -iname '*.py' | sort \ + | xargs xgettext --no-location --omit-header --keyword='tr' \ + -d base -o locales/base.pot +} + +update_lang() { + local file=${1} echo "Updating: ${file}" + local path path=$(dirname "${file}") msgmerge --quiet --no-location --width 512 --backup none --update "${file}" locales/base.pot msgfmt -o "${path}/base.mo" "${file}" } - -function generate_all() { +cmd_generate_all() { + generate_pot for file in $(find locales/ -name "base.po"); do update_lang "${file}" done } -function generate_single_lang() { - lang_file="locales/${1}/LC_MESSAGES/base.po" - +cmd_generate_single() { + local lang_file="locales/${1}/LC_MESSAGES/base.po" if [ ! -f "${lang_file}" ]; then echo "Language files not found: ${lang_file}" exit 1 fi - + generate_pot update_lang "${lang_file}" } +cmd_check_po_syntax() { + echo "Checking .po syntax..." + local failed=0 + while IFS= read -r po; do + if ! msgfmt --check --output-file=/dev/null "$po" 2>&1; then + echo "FAIL: $po" + failed=1 + fi + done < <(find locales/ -name '*.po') + if [ "$failed" -eq 1 ]; then + echo "ERROR: some .po files have syntax errors" >&2 + return 1 + fi + echo "All .po files passed syntax check." +} + +cmd_check_no_tr_fstring() { + echo "Checking for tr(f-string) anti-pattern..." + if grep -rnE "tr\(\s*f['\"]" . --include='*.py'; then + echo "ERROR: use tr('...{}').format(...) instead of tr(f'...')" >&2 + return 1 + fi + echo "No tr(f-string) anti-pattern found." +} + +cmd_check_pot_freshness() { + # msgcmp (not diff) because base.pot carries legacy stale entries from + # --join-existing; diff would always fail until a full cleanup is done. + echo "Checking base.pot for missing strings..." + find . -type f -iname '*.py' | sort \ + | xargs xgettext --no-location --omit-header --keyword='tr' \ + -d base -o /tmp/generated.pot + if ! msgcmp --use-untranslated locales/base.pot /tmp/generated.pot; then + echo "ERROR: base.pot is missing strings - run: locales_generator.sh all" >&2 + return 1 + fi + echo "base.pot contains all translatable strings." +} + +cmd_check() { + local failed=0 + cmd_check_po_syntax || failed=1 + cmd_check_no_tr_fstring || failed=1 + cmd_check_pot_freshness || failed=1 + if [ "$failed" -eq 1 ]; then + echo "Some translation checks failed." >&2 + exit 1 + fi + echo "All translation checks passed." +} if [ $# -eq 0 ]; then - echo "Usage: ${0} " - echo "Special case 'all' for builds all languages." + usage exit 1 fi -lang=${1} - -# Update the base file containing all translatable strings -find . -type f -iname "*.py" | xargs xgettext --join-existing --no-location --omit-header --keyword='tr' -d base -o locales/base.pot - -case "${lang}" in - "all") generate_all;; - *) generate_single_lang "${lang}" +case "${1}" in + check) cmd_check ;; + all) cmd_generate_all ;; + -h|--help) usage ;; + *) cmd_generate_single "${1}" ;; esac diff --git a/archinstall/locales/pl/LC_MESSAGES/base.mo b/archinstall/locales/pl/LC_MESSAGES/base.mo index 4a57d37c..0ab34f9e 100644 Binary files a/archinstall/locales/pl/LC_MESSAGES/base.mo and b/archinstall/locales/pl/LC_MESSAGES/base.mo differ diff --git a/archinstall/locales/pl/LC_MESSAGES/base.po b/archinstall/locales/pl/LC_MESSAGES/base.po index ab73ad85..d01f1012 100644 --- a/archinstall/locales/pl/LC_MESSAGES/base.po +++ b/archinstall/locales/pl/LC_MESSAGES/base.po @@ -256,6 +256,9 @@ msgstr "Język" msgid "Locale encoding" msgstr "Kodowanie" +msgid "Console font" +msgstr "Czcionka konsoli" + msgid "Drive(s)" msgstr "Dysk(i)" @@ -820,6 +823,19 @@ msgstr "Nieprawidłowa wartość! Spróbuj jeszcze raz z prawidłową wartości msgid "Parallel Downloads" msgstr "Pobieranie kilku plików jednocześnie" +msgid "Pacman" +msgstr "Pacman" + +msgid "Color" +msgstr "Kolor" + +#, python-brace-format +msgid "Enter the number of parallel downloads (1-{})" +msgstr "Wprowadź maksymalną liczbę plików pobieranych jednocześnie (1-{})" + +msgid "Enable colored output for pacman" +msgstr "Włącz kolory w pacmanie" + msgid "ESC to skip" msgstr "Naciśnij ESC, aby pominąć" @@ -1203,6 +1219,21 @@ msgstr "Produkt" msgid "Invalid configuration: {error}" msgstr "Niepoprawna konfiguracja: {error}" +msgid "Ready to install" +msgstr "Gotowe do zainstalowania" + +msgid "Disks" +msgstr "Dyski" + +msgid "Packages" +msgstr "Pakiety" + +msgid "Network" +msgstr "Sieć" + +msgid "Locale" +msgstr "Ustawienia regionalne (locale)" + msgid "Type" msgstr "Typ" @@ -1660,6 +1691,123 @@ msgstr "Wejdź w tryb wyszukiwania" msgid "Exit search mode" msgstr "Wyjdź z trybu wyszukiwania" +msgid "General" +msgstr "Ogólne" + +msgid "Navigation" +msgstr "Nawigacja" + +msgid "Selection" +msgstr "Wybór" + +msgid "Search" +msgstr "Szukaj" + +msgid "Down" +msgstr "W dół" + +msgid "Up" +msgstr "W górę" + +msgid "Confirm" +msgstr "Potwierdź" + +msgid "Focus right" +msgstr "W prawo" + +msgid "Focus left" +msgstr "W lewo" + +msgid "Toggle" +msgstr "Zaznacz/Odznacz" + +msgid "Show/Hide help" +msgstr "Pokaż/Ukryj pomoc" + +msgid "Quit" +msgstr "Wyjdź" + +msgid "First" +msgstr "Pierwszy" + +msgid "Last" +msgstr "Ostatni" + +msgid "Select" +msgstr "Wybierz" + +msgid "Page Up" +msgstr "Strona w górę" + +msgid "Page Down" +msgstr "Strona w dół" + +msgid "Page up" +msgstr "Strona w górę" + +msgid "Page down" +msgstr "Strona w dół" + +msgid "Page Left" +msgstr "Strona w lewo" + +msgid "Page Right" +msgstr "Strona w prawo" + +msgid "Cursor up" +msgstr "Kursor w górę" + +msgid "Cursor down" +msgstr "Kursor w dół" + +msgid "Cursor right" +msgstr "Kursor w prawo" + +msgid "Cursor left" +msgstr "Kursor w lewo" + +msgid "Top" +msgstr "Góra" + +msgid "Bottom" +msgstr "Dół" + +msgid "Home" +msgstr "Początek" + +msgid "End" +msgstr "Koniec" + +msgid "Toggle option" +msgstr "Zaznacz/Odznacz opcję" + +msgid "Scroll Up" +msgstr "Przewiń w górę" + +msgid "Scroll Down" +msgstr "Przewiń w dół" + +msgid "Scroll Left" +msgstr "Przewiń w lewo" + +msgid "Scroll Right" +msgstr "Przewiń w prawo" + +msgid "Scroll Home" +msgstr "Przewiń do początku" + +msgid "Scroll End" +msgstr "Przewiń do końca" + +msgid "Focus Next" +msgstr "Następny" + +msgid "Focus Previous" +msgstr "Poprzedni" + +msgid "Copy selected text" +msgstr "Skopiuj zaznaczony tekst" + msgid "labwc needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)" msgstr "labwc potrzebuje dostępu do twojego seat'a (sprzętu, np. klawiatury, myszki)" @@ -1878,6 +2026,21 @@ msgstr "Użyj NetworkManager'a (backend iwd)" msgid "Firewall" msgstr "Zapora sieciowa" +msgid "Additional fonts" +msgstr "Dodatkowe czcionki" + +msgid "Select font packages to install" +msgstr "Wybierz pakiety czcionek do zainstalowania" + +msgid "Unicode font coverage for most languages" +msgstr "Wsparcie Unicode dla większości języków" + +msgid "color emoji for browsers and apps" +msgstr "kolorowe emoji dla przeglądarek i aplikacji" + +msgid "Chinese, Japanese, Korean characters" +msgstr "Chińskie, Japońskie, Koreańskie znaki" + msgid "Select audio configuration" msgstr "Wybierz konfigurację audio" @@ -1965,7 +2128,13 @@ msgid "Select an interface" msgstr "Wybierz interfejs" msgid "Choose network configuration" -msgstr "Wybierz konfigurację sieciową" +msgstr "Wybierz konfigurację sieci" + +msgid "Recommended: Network Manager for desktop, Manual for server" +msgstr "Rekomendowane: Network Manager dla desktopów, ręcznie dla serwerów" + +msgid "Warning: no network configuration selected. Network will need to be set up manually on the installed system." +msgstr "Uwaga: nie wybrano konfiguracji sieci. Sieć musi zostać skonfigurowana ręcznie w zainstalowanym systemie." msgid "No packages found" msgstr "Nie znaleziono pakietów" @@ -2004,6 +2173,72 @@ msgstr "Wybrany profil pulpitu wymaga logowania normalnego użytkownika przez gr msgid "Environment type: {} {}" msgstr "Typ środowiska: {} {}" +msgid "Input cannot be empty" +msgstr "Podana wartość nie może być pusta" + +msgid "Recommended" +msgstr "Rekomendowane" + +msgid "Package" +msgstr "Pakiet" + +msgid "Curated selection of KDE Plasma packages" +msgstr "Wyselekcjonowany zestaw pakietów KDE Plasma" + +msgid "Dependencies" +msgstr "Zależności" + +msgid "Package group" +msgstr "Grupa pakietów" + +msgid "Extensive KDE Plasma installation" +msgstr "Obszerna instalacja KDE Plasma" + +msgid "Packages in group" +msgstr "Pakiety w grupie" + +msgid "Minimal KDE Plasma installation" +msgstr "Minimalistyczna instalacja KDE Plasma" + +msgid "Description" +msgstr "Opis" + +msgid "Select a flavor of KDE Plasma to install" +msgstr "Wybierz rodzaj KDE Plasma do zainstalowania" + +msgid "Arial/Times/Courier replacement, Cyrillic support for Steam/games" +msgstr "Zamiennik Arial/Times/Courier, obsługa Cyrylicy dla Steam/gier" + +msgid "wide Unicode coverage, good fallback font" +msgstr "szerokie wsparcie Unicode, dobra czczionka zastępcza" + +#, python-brace-format +msgid "Setting up U2F login: {u2f_config.u2f_login_method.value}" +msgstr "Ustawianie logowania U2F {u2f_config.u2f_login_method.value}" + +#, python-brace-format +msgid "Default: {DEFAULT_ITER_TIME}ms, Recommended range: 1000-60000" +msgstr "Domyślnie: {DEFAULT_ITER_TIME}ms, Rekomendowany przedział: 1000-60000" + +#, python-brace-format +msgid "Setting up U2F login: {}" +msgstr "Konfigurowanie logowania U2F: {}" + +#, python-brace-format +msgid "Default: {}ms, Recommended range: 1000-60000" +msgstr "Domyślnie: {}ms, Rekomendowany przedział: 1000-60000" + +#, python-brace-format +msgid "{} needs access to your seat" +msgstr "{} potrzebuje dostępu do twojego seat'a" + +msgid "collection of hardware devices i.e. keyboard, mouse" +msgstr "zbiór urządzeń, t.j. klawiatura, myszka" + +#, python-brace-format +msgid "Choose an option how to give {} access to your hardware" +msgstr "Wybierz opcję, aby nadać {} dostęp do twojego sprzętu" + #~ msgid "When picking a directory to save configuration files to, by default we will ignore the following folders: " #~ msgstr "Podczas wybierania katalogu do zapisywania plików konfiguracyjnych, domyślnie ignorowane są następujące foldery: " diff --git a/archinstall/locales/uk/LC_MESSAGES/base.mo b/archinstall/locales/uk/LC_MESSAGES/base.mo index 1cb241b9..7c0230e6 100644 Binary files a/archinstall/locales/uk/LC_MESSAGES/base.mo and b/archinstall/locales/uk/LC_MESSAGES/base.mo differ diff --git a/archinstall/locales/uk/LC_MESSAGES/base.po b/archinstall/locales/uk/LC_MESSAGES/base.po index a178ac2d..fab48b2b 100644 --- a/archinstall/locales/uk/LC_MESSAGES/base.po +++ b/archinstall/locales/uk/LC_MESSAGES/base.po @@ -256,6 +256,9 @@ msgstr "Мова локалізації" msgid "Locale encoding" msgstr "Кодування локалізації" +msgid "Console font" +msgstr "Шрифт консолі" + msgid "Drive(s)" msgstr "Диск(и)" @@ -1039,7 +1042,7 @@ msgid "Back" msgstr "Назад" msgid "Please chose which greeter to install for the chosen profiles: {}" -msgstr "Будь ласка, виберіть, який екран привітання встановити для обраних профілів: {}" +msgstr "Будь ласка, виберіть, який менеджер входу встановити для обраних профілів: {}" #, python-brace-format msgid "Environment type: {}" @@ -1101,10 +1104,10 @@ msgid "Graphics driver" msgstr "Графічні драйвери" msgid "Greeter" -msgstr "Дисплейний менеджер" +msgstr "Менеджер входу" msgid "Please chose which greeter to install" -msgstr "Виберіть, який дисплейний менеджер встановлювати" +msgstr "Виберіть, який менеджер входу встановлювати" msgid "This is a list of pre-programmed default_profiles" msgstr "Список попередньо налаштованих default_profiles" @@ -1219,6 +1222,21 @@ msgstr "Модель" msgid "Invalid configuration: {error}" msgstr "Неправильна конфігурація: {error}" +msgid "Ready to install" +msgstr "Готово до встановлення" + +msgid "Disks" +msgstr "Диски" + +msgid "Packages" +msgstr "Пакети" + +msgid "Network" +msgstr "Мережа" + +msgid "Locale" +msgstr "Локаль" + msgid "Type" msgstr "Тип" @@ -1903,7 +1921,7 @@ msgid "Snapshot type: {}" msgstr "Тип знімка: {}" msgid "U2F login setup" -msgstr "Налаштування входу з пристроєм двофакторної авторизації" +msgstr "Налаштування входу з пристроєм двофакторної автентифікації" msgid "No U2F devices found" msgstr "Не знайдено жодного пристрою двофакторної автентифікації" @@ -1919,7 +1937,7 @@ msgid "Setting up U2F device for user: {}" msgstr "Налаштування пристроя двофакторної автентифікації для користувача: {}" msgid "You may need to enter the PIN and then touch your U2F device to register it" -msgstr "Ви повинні написати PIN та потім торкнутися вашого пристрою двофакторної авторизації, щоб зареєструвати його" +msgstr "Ви повинні написати PIN та потім торкнутися вашого пристрою двофакторної автентифікації, щоб зареєструвати його" msgid "Starting device modifications in " msgstr "Початок модифікацій пристрою в " @@ -2115,6 +2133,12 @@ msgstr "Оберіть інтерфейс" msgid "Choose network configuration" msgstr "Оберіть конфігурацію мережі" +msgid "Recommended: Network Manager for desktop, Manual for server" +msgstr "Рекомендовано: Network Manager для робочого столу, ручне налаштування для сервера" + +msgid "Warning: no network configuration selected. Network will need to be set up manually on the installed system." +msgstr "Попередження: конфігурацію мережі не обрано. Мережу доведеться налаштувати вручну на встановленій системі." + msgid "No packages found" msgstr "Пакети не знайдено" @@ -2148,45 +2172,61 @@ msgstr "Надійність пароля: Сильна" msgid "The selected desktop profile requires a regular user to log in via the greeter" msgstr "Обраний профіль робочого столу вимагає входу звичайного користувача через менеджер входу" -#, fuzzy, python-brace-format +#, python-brace-format msgid "Environment type: {} {}" -msgstr "Тип середовища: {}" +msgstr "Тип середовища: {} {}" -#, fuzzy msgid "Input cannot be empty" msgstr "Значення не може бути пустим" msgid "Recommended" -msgstr "" +msgstr "Рекомендовано" -#, fuzzy msgid "Package" -msgstr "Група пакетів:" +msgstr "Пакет" msgid "Curated selection of KDE Plasma packages" -msgstr "" +msgstr "Підібраний набір пакетів KDE Plasma" msgid "Dependencies" -msgstr "" +msgstr "Залежності" -#, fuzzy msgid "Package group" -msgstr "Група пакетів:" +msgstr "Група пакетів" msgid "Extensive KDE Plasma installation" -msgstr "" +msgstr "Розширене встановлення KDE Plasma" -#, fuzzy msgid "Packages in group" -msgstr "Група пакетів:" +msgstr "Пакети у групі" msgid "Minimal KDE Plasma installation" -msgstr "" +msgstr "Мінімальне встановлення KDE Plasma" -#, fuzzy msgid "Description" -msgstr "Шифрування диска" +msgstr "Опис" -#, fuzzy msgid "Select a flavor of KDE Plasma to install" -msgstr "Оберіть завантажувач для встановлення" +msgstr "Оберіть варіант KDE Plasma для встановлення" + +msgid "Arial/Times/Courier replacement, Cyrillic support for Steam/games" +msgstr "заміна Arial/Times/Courier, підтримка кирилиці для Steam та ігор" + +msgid "wide Unicode coverage, good fallback font" +msgstr "широке покриття Unicode, хороший резервний шрифт" + +#, python-brace-format +msgid "Setting up U2F login: {u2f_config.u2f_login_method.value}" +msgstr "Налаштування входу з пристроєм двофакторної автентифікації: {u2f_config.u2f_login_method.value}" + +#, python-brace-format +msgid "Default: {DEFAULT_ITER_TIME}ms, Recommended range: 1000-60000" +msgstr "Стандартно: {DEFAULT_ITER_TIME}мс, Рекомендований діапазон - 1000-60000" + +#, python-brace-format +msgid "Setting up U2F login: {}" +msgstr "Налаштування входу з пристроєм двофакторної автентифікації: {}" + +#, python-brace-format +msgid "Default: {}ms, Recommended range: 1000-60000" +msgstr "Стандартно: {}мс, Рекомендований діапазон - 1000-60000" diff --git a/archinstall/main.py b/archinstall/main.py index cf0e42f6..e38b3d48 100644 --- a/archinstall/main.py +++ b/archinstall/main.py @@ -8,17 +8,19 @@ import time import traceback from pathlib import Path -from archinstall.lib.args import ArchConfigHandler +from archinstall.lib.args import ArchConfigHandler, SubCommand from archinstall.lib.disk.utils import disk_layouts from archinstall.lib.hardware import SysInfo +from archinstall.lib.log import debug, error, info, logger, share_install_log, warn +from archinstall.lib.menu.helpers import Confirmation from archinstall.lib.network.wifi_handler import WifiHandler from archinstall.lib.networking import ping -from archinstall.lib.output import debug, error, info, warn from archinstall.lib.packages.util import check_version_upgrade from archinstall.lib.pacman.pacman import Pacman from archinstall.lib.translationhandler import tr, translation_handler from archinstall.lib.utils.util import running_from_iso -from archinstall.tui.ui.components import tui +from archinstall.tui.components import tui +from archinstall.tui.menu_item import MenuItemGroup def _log_sys_info() -> None: @@ -73,6 +75,38 @@ def _list_scripts() -> str: return '\n'.join(lines) +def _share_log_command() -> None: + paste_url: str = 'https://paste.rs' + log_path = logger.path + max_size = 10 * 1024 * 1024 # max supported size by paste.rs + content = logger.get_content(max_bytes=max_size).decode() + + header = tr('About to upload "{}" to the publicly accessible {}').format(log_path, paste_url) + '\n\n' + header += tr('Do you want to continue?') + + group = MenuItemGroup.yes_no() + group.set_preview_for_all(lambda _: content) + + async def _confirm() -> bool: + result = await Confirmation( + header=header, + allow_skip=False, + group=group, + preview_header='Log content', + preview_location='bottom', + ).show() + return result.get_value() + + result = tui.run(_confirm) + + if result is True: + res = share_install_log(paste_url=paste_url, max_bytes=max_size) + if res is not None: + info(tr('Log uploaded successfully. URL: {}').format(res)) + else: + error(tr('Failed to upload log.')) + + def run() -> int: """ This can either be run as the compiled and installed application: python setup.py install @@ -85,6 +119,13 @@ def run() -> int: arch_config_handler.print_help() return 0 + match arch_config_handler.args.command: + case SubCommand.SHARE_LOG: + _share_log_command() + exit(0) + case None: + pass + script = arch_config_handler.get_script() if script == 'list': @@ -141,8 +182,8 @@ def _error_message(exc: Exception) -> None: Archinstall experienced the above error. If you think this is a bug, please report it to https://github.com/archlinux/archinstall and include the log file "/var/log/archinstall/install.log". - Hint: To extract the log from a live ISO - curl -F 'file=@/var/log/archinstall/install.log' https://0x0.st + Hint: To upload the log and get a shareable URL, run + archinstall share-log """ ) warn(text) diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py index 5cdcdad9..6f484910 100644 --- a/archinstall/scripts/guided.py +++ b/archinstall/scripts/guided.py @@ -12,17 +12,17 @@ from archinstall.lib.disk.utils import disk_layouts from archinstall.lib.general.general_menu import PostInstallationAction, select_post_installation from archinstall.lib.global_menu import GlobalMenu from archinstall.lib.installer import Installer, accessibility_tools_in_use, run_custom_user_commands +from archinstall.lib.log import debug, error, info from archinstall.lib.menu.util import delayed_warning from archinstall.lib.mirror.mirror_handler import MirrorListHandler from archinstall.lib.models import Bootloader from archinstall.lib.models.device import DiskLayoutType, EncryptionType from archinstall.lib.models.users import User from archinstall.lib.network.network_handler import install_network_config -from archinstall.lib.output import debug, error, info from archinstall.lib.packages.util import check_version_upgrade from archinstall.lib.profile.profiles_handler import profile_handler from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.components import tui +from archinstall.tui.components import tui def show_menu( @@ -115,7 +115,11 @@ def perform_installation( installation.setup_swap(algo=config.swap.algorithm) if config.bootloader_config and config.bootloader_config.bootloader != Bootloader.NO_BOOTLOADER: - installation.add_bootloader(config.bootloader_config.bootloader, config.bootloader_config.uki, config.bootloader_config.removable) + installation.add_bootloader( + config.bootloader_config.bootloader, + config.bootloader_config.uki, + config.bootloader_config.removable, + ) if config.network_config: install_network_config( @@ -226,7 +230,7 @@ def main(arch_config_handler: ArchConfigHandler | None = None) -> None: if not arch_config_handler.args.silent: aborted = False - res: bool = tui.run(config.confirm_config) + res: bool = tui.run(lambda: config.confirm_config(show_install_warnings=True)) if not res: debug('Installation aborted') diff --git a/archinstall/scripts/minimal.py b/archinstall/scripts/minimal.py index 4e897142..c6eda03d 100644 --- a/archinstall/scripts/minimal.py +++ b/archinstall/scripts/minimal.py @@ -4,15 +4,15 @@ from archinstall.lib.configuration import ConfigurationOutput from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu from archinstall.lib.disk.filesystem import FilesystemHandler from archinstall.lib.installer import Installer +from archinstall.lib.log import debug, error, info from archinstall.lib.menu.util import delayed_warning from archinstall.lib.models import Bootloader from archinstall.lib.models.profile import ProfileConfiguration from archinstall.lib.models.users import Password, User from archinstall.lib.network.network_handler import install_network_config -from archinstall.lib.output import debug, error, info from archinstall.lib.profile.profiles_handler import profile_handler from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.components import tui +from archinstall.tui.components import tui def perform_installation(arch_config_handler: ArchConfigHandler) -> None: @@ -77,7 +77,7 @@ async def main(arch_config_handler: ArchConfigHandler | None = None) -> None: if not arch_config_handler.args.silent: aborted = False - res: bool = tui.run(config.confirm_config) + res: bool = tui.run(lambda: config.confirm_config(show_install_warnings=True)) if not res: debug('Installation aborted') diff --git a/archinstall/scripts/only_hd.py b/archinstall/scripts/only_hd.py index afb1f919..c7349c51 100644 --- a/archinstall/scripts/only_hd.py +++ b/archinstall/scripts/only_hd.py @@ -7,10 +7,10 @@ from archinstall.lib.disk.filesystem import FilesystemHandler from archinstall.lib.disk.utils import disk_layouts from archinstall.lib.global_menu import GlobalMenu from archinstall.lib.installer import Installer +from archinstall.lib.log import debug, error from archinstall.lib.menu.util import delayed_warning -from archinstall.lib.output import debug, error from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.components import tui +from archinstall.tui.components import tui def show_menu(arch_config_handler: ArchConfigHandler) -> None: diff --git a/archinstall/tui/ui/components.py b/archinstall/tui/components.py similarity index 97% rename from archinstall/tui/ui/components.py rename to archinstall/tui/components.py index c51d35f9..efbb64f9 100644 --- a/archinstall/tui/ui/components.py +++ b/archinstall/tui/components.py @@ -19,10 +19,10 @@ from textual.widgets.option_list import Option from textual.widgets.selection_list import Selection from textual.worker import WorkerCancelled -from archinstall.lib.output import debug +from archinstall.lib.log import debug from archinstall.lib.translationhandler import tr -from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup -from archinstall.tui.ui.result import Result, ResultType +from archinstall.tui.menu_item import MenuItem, MenuItemGroup +from archinstall.tui.result import Result, ResultType ValueT = TypeVar('ValueT') @@ -200,6 +200,11 @@ class OptionListScreen(BaseScreen[ValueT]): color: white; text-style: bold; } + + .wrap-preview { + width: 100%; + height: auto; + } """ def __init__( @@ -211,6 +216,7 @@ class OptionListScreen(BaseScreen[ValueT]): allow_reset: bool = False, preview_location: Literal['right', 'bottom'] | None = None, enable_filter: bool = False, + wrap_preview: bool = False, ): super().__init__(allow_skip, allow_reset) self._group = group @@ -218,6 +224,7 @@ class OptionListScreen(BaseScreen[ValueT]): self._title = title self._preview_location = preview_location self._filter = enable_filter + self._wrap_preview = wrap_preview self._show_frame = False self._options = self._get_options() @@ -280,7 +287,10 @@ class OptionListScreen(BaseScreen[ValueT]): with Container(): yield option_list yield Rule(orientation=rule_orientation) - yield ScrollableContainer(Label('', id='preview_content', markup=False)) + preview_label = Label('', id='preview_content', markup=False) + if self._wrap_preview: + preview_label.add_class('wrap-preview') + yield ScrollableContainer(preview_label) if self._filter: yield Input(placeholder='/filter', id='filter-input') @@ -340,17 +350,12 @@ class OptionListScreen(BaseScreen[ValueT]): ] ) - # debug(f'Index: {index}') - # debug(f'Region: {option_list.region}') - # debug(f'Scroll offset: {option_list.scroll_offset}') - # debug(f'Target_Y: {target_y}') - self.app.cursor_position = Offset(option_list.region.x, target_y) self.app.refresh() def _set_preview(self, item_id: str) -> None: if self._preview_location is None: - return None + return preview_widget = self.query_one('#preview_content', Label) item = self._group.find_by_id(item_id) @@ -433,6 +438,11 @@ class SelectListScreen(BaseScreen[ValueT]): color: white; text-style: bold; } + + .wrap-preview { + width: 100%; + height: auto; + } """ def __init__( @@ -443,6 +453,7 @@ class SelectListScreen(BaseScreen[ValueT]): allow_reset: bool = False, preview_location: Literal['right', 'bottom'] | None = None, enable_filter: bool = False, + wrap_preview: bool = False, ): super().__init__(allow_skip, allow_reset) self._group = group @@ -450,6 +461,7 @@ class SelectListScreen(BaseScreen[ValueT]): self._preview_location = preview_location self._show_frame = False self._filter = enable_filter + self._wrap_preview = wrap_preview self._selected_items: list[MenuItem] = self._group.selected_items self._options: list[Selection[MenuItem]] = self._get_selections() @@ -510,7 +522,10 @@ class SelectListScreen(BaseScreen[ValueT]): with Container(): yield selection_list yield Rule(orientation=rule_orientation) - yield ScrollableContainer(Label('', id='preview_content', markup=False)) + preview_label = Label('', id='preview_content', markup=False) + if self._wrap_preview: + preview_label.add_class('wrap-preview') + yield ScrollableContainer(preview_label) if self._filter: yield Input(placeholder='/filter', id='filter-input') @@ -530,7 +545,7 @@ class SelectListScreen(BaseScreen[ValueT]): selection_list = self.query_one(SelectionList) if not selection_list.has_focus or event.key != 'enter': - return None + return if len(self._selected_items) < 1: index = selection_list.highlighted @@ -743,7 +758,7 @@ class ConfirmationScreen(BaseScreen[ValueT]): if self._is_btn_focus(): item = self._group.focus_item if not item: - return None + return _ = self.dismiss(Result(ResultType.Selection, _item=item)) @@ -1143,8 +1158,6 @@ class TableSelectionScreen(BaseScreen[ValueT]): ] ) - debug(f'Setting cursor to target_y: {target_y}') - self.app.cursor_position = Offset(data_table.region.x, target_y) self.app.refresh() diff --git a/archinstall/tui/curses_menu.py b/archinstall/tui/curses_menu.py deleted file mode 100644 index b64a800c..00000000 --- a/archinstall/tui/curses_menu.py +++ /dev/null @@ -1,1369 +0,0 @@ -import curses -import os -import signal -import sys -from abc import ABCMeta, abstractmethod -from collections.abc import Callable -from curses.ascii import isprint -from curses.textpad import Textbox -from types import FrameType, TracebackType -from typing import ClassVar, Literal, Self, override - -from archinstall.lib.translationhandler import tr -from archinstall.tui.help import Help -from archinstall.tui.menu_item import MenuItem, MenuItemGroup, MenuItemsState -from archinstall.tui.result import Result, ResultType -from archinstall.tui.types import ( - SCROLL_INTERVAL, - STYLE, - Alignment, - Chars, - FrameDim, - FrameProperties, - FrameStyle, - MenuKeys, - Orientation, - PreviewStyle, - ViewportEntry, -) - - -class AbstractCurses[ValueT](metaclass=ABCMeta): - def __init__(self) -> None: - self._help_window = self._set_help_viewport() - - @abstractmethod - def resize_win(self) -> None: - pass - - @abstractmethod - def kickoff(self, win: curses.window) -> Result[ValueT]: - pass - - def clear_all(self) -> None: - Tui.t().screen.clear() - Tui.t().screen.refresh() - - def clear_help_win(self) -> None: - self._help_window.erase() - - def _set_help_viewport(self) -> Viewport: - max_height, max_width = Tui.t().max_yx - height = max_height - 10 - - max_help_width = max([len(line) for line in Help.get_help_text().split('\n')]) - x_start = int((max_width / 2) - (max_help_width / 2)) - - return Viewport( - max_help_width + 10, - height, - x_start, - int((max_height / 2) - height / 2), - frame=FrameProperties.min(tr('Archinstall help')), - ) - - def _confirm_interrupt(self, warning: str) -> bool: - while True: - result = SelectMenu[bool]( - MenuItemGroup.yes_no(), - header=warning, - alignment=Alignment.CENTER, - columns=2, - orientation=Orientation.HORIZONTAL, - ).run() - - match result.type_: - case ResultType.Selection: - if result.item() == MenuItem.yes(): - return True - - return False - - def help_text(self) -> str: - return tr('Press Ctrl+h for help') - - def _show_help(self) -> None: - help_text = Help.get_help_text() - lines = help_text.split('\n') - - entries = [ViewportEntry('', 0, 0, STYLE.NORMAL)] - entries += [ViewportEntry(f' {e} ', idx + 1, 0, STYLE.NORMAL) for idx, e in enumerate(lines)] - self._help_window.update(entries, 0) - - def get_header_entries(self, header: str) -> list[ViewportEntry]: - full_header = [] - rows = header.split('\n') - - for cur_row, line in enumerate(rows): - full_header += [ViewportEntry(line, cur_row, 0, STYLE.NORMAL)] - - return full_header - - -class AbstractViewport: - def __init__(self) -> None: - pass - - def add_str(self, screen: curses.window, row: int, col: int, text: str, color: STYLE) -> None: - try: - screen.addstr(row, col, text, Tui.t().get_color(color)) - except curses.error: - # debug(f'Curses error while adding string to viewport: {text}') - pass - - def add_frame( - self, - entries: list[ViewportEntry], - max_width: int, - max_height: int, - frame: FrameProperties, - scroll_pct: int | None = None, - ) -> list[ViewportEntry]: - if not entries: - return [] - - dim = self._get_frame_dim(entries, max_width, max_height, frame) - - h_bar = Chars.Horizontal * (dim.x_delta() - 2) - top_ve = self._get_top(dim, h_bar, frame, scroll_pct) - bottom_ve = self._get_bottom(dim, h_bar, scroll_pct) - - frame_border = [] - - for i in range(1, dim.height): - frame_border += [ViewportEntry(Chars.Vertical, i, dim.x_start, STYLE.NORMAL)] - - frame_border += self._get_right_frame(dim, scroll_pct) - - # adjust the original rows and cols of the entries as - # they need to be shrunk by 1 to make space for the frame - entries = self._adjust_entries(entries) - - framed_entries = [ - top_ve, - bottom_ve, - *frame_border, - *entries, - ] - - return framed_entries - - def align_center(self, lines: list[ViewportEntry], width: int) -> int: - max_col = self._max_col(lines) - x_offset = int((width / 2) - (max_col / 2)) - return x_offset - - def _get_right_frame( - self, - dim: FrameDim, - scroll_percentage: int | None = None, - ) -> list[ViewportEntry]: - right_frame = {} - scroll_height = int(dim.height * scroll_percentage // 100) if scroll_percentage else 0 - - if scroll_height <= 0: - scroll_height = 1 - elif scroll_height >= dim.height: - scroll_height = dim.height - 1 - - for i in range(1, dim.height): - right_frame[i] = ViewportEntry(Chars.Vertical, i, dim.x_end - 1, STYLE.NORMAL) - - if scroll_percentage is not None: - right_frame[0] = ViewportEntry(Chars.Triangle_up, 0, dim.x_end - 1, STYLE.NORMAL) - right_frame[scroll_height] = ViewportEntry(Chars.Block, scroll_height, dim.x_end - 1, STYLE.NORMAL) - right_frame[dim.height] = ViewportEntry(Chars.Triangle_down, dim.height, dim.x_end - 1, STYLE.NORMAL) - - return list(right_frame.values()) - - def _get_top( - self, - dim: FrameDim, - h_bar: str, - frame: FrameProperties, - scroll_percentage: int | None = None, - ) -> ViewportEntry: - top = self._replace_str(h_bar, 1, f' {frame.header} ') if frame.header else h_bar - - if scroll_percentage is None: - top = Chars.Upper_left + top + Chars.Upper_right - else: - top = Chars.Upper_left + top[:-1] - - return ViewportEntry(top, 0, dim.x_start, STYLE.NORMAL) - - def _get_bottom( - self, - dim: FrameDim, - h_bar: str, - scroll_pct: int | None = None, - ) -> ViewportEntry: - if scroll_pct is None: - bottom = Chars.Lower_left + h_bar + Chars.Lower_right - else: - bottom = Chars.Lower_left + h_bar[:-1] - - return ViewportEntry(bottom, dim.height, dim.x_start, STYLE.NORMAL) - - def _get_frame_dim( - self, - entries: list[ViewportEntry], - max_width: int, - max_height: int, - frame: FrameProperties, - ) -> FrameDim: - rows = self._assemble_entries(entries).split('\n') - header_len = len(frame.header) if frame.header else 0 - header_len += 3 # for header padding - - if frame.w_frame_style == FrameStyle.MIN: - frame_start = min([e.col for e in entries]) - max_row_cols = [(e.col + len(e.text) + 1) for e in entries] - max_row_cols.append(header_len) - frame_end = max(max_row_cols) - - # 2 for frames, 1 for extra space start away from frame - # must align with def _adjust_entries - # 2 for frame - frame_end += 3 - - frame_height = len(rows) + 1 - if frame_height > max_height: - frame_height = max_height - else: - frame_start = 0 - frame_end = max_width - frame_height = max_height - 1 - - return FrameDim(frame_start, frame_end, frame_height) - - def _adjust_entries( - self, - entries: list[ViewportEntry], - ) -> list[ViewportEntry]: - for entry in entries: - # top row frame offset - entry.row += 1 - # left side frame offset + extra space from frame to start from - entry.col += 2 - - return entries - - def _num_unique_rows(self, entries: list[ViewportEntry]) -> int: - return len(set([e.row for e in entries])) - - def _max_col(self, entries: list[ViewportEntry]) -> int: - values = [len(e.text) + e.col for e in entries] - if not values: - return 0 - return max(values) - - def _replace_str(self, text: str, index: int = 0, replacement: str = '') -> str: - len_replace = len(replacement) - return f'{text[:index]}{replacement}{text[index + len_replace :]}' - - def _assemble_entries(self, entries: list[ViewportEntry]) -> str: - if not entries: - return '' - - max_col = self._max_col(entries) - view = [max_col * ' '] * self._num_unique_rows(entries) - - for e in entries: - view[e.row] = self._replace_str(view[e.row], e.col, e.text) - - view = [v.rstrip() for v in view] - - return '\n'.join(view) - - -class EditViewport(AbstractViewport): - def __init__( - self, - width: int, - edit_width: int, - edit_height: int, - x_start: int, - y_start: int, - process_key: Callable[[int], int], - frame: FrameProperties, - alignment: Alignment = Alignment.CENTER, - hide_input: bool = False, - ) -> None: - super().__init__() - - self._max_height, self._max_width = Tui.t().max_yx - - self._width = width - self._edit_width = edit_width - self._edit_height = edit_height - self.x_start = x_start - self.y_start = y_start - self._process_key_cb = process_key - self._frame = frame - self._alignment = alignment - self._hide_input = hide_input - - self._main_win: curses.window | None = None - self._edit_win: curses.window | None = None - self._textbox: Textbox | None = None - - self._init_wins() - - def _init_wins(self) -> None: - self._main_win = curses.newwin(self._edit_height, self._width, self.y_start, 0) - self._main_win.nodelay(False) - - x_offset = 0 - if self._alignment == Alignment.CENTER: - x_offset = int((self._width / 2) - (self._edit_width / 2)) - - self._edit_win = self._main_win.subwin( - 1, - self._edit_width - 2, - self.y_start + 1, - self.x_start + x_offset + 1, - ) - - def update(self) -> None: - if not self._main_win: - return - - self._main_win.erase() - - framed = self.add_frame( - [ViewportEntry('', 0, 0, STYLE.NORMAL)], - self._edit_width, - 3, - frame=self._frame, - ) - - x_offset = 0 - if self._alignment == Alignment.CENTER: - x_offset = self.align_center(framed, self._width) - - for row in framed: - self.add_str( - self._main_win, - row.row, - row.col + x_offset, - row.text, - row.style, - ) - - self._main_win.refresh() - - def textbox_value(self) -> str: - if not self._textbox: - return '' - return self._textbox.gather().strip() - - def erase(self) -> None: - if self._main_win: - self._main_win.erase() - self._main_win.refresh() - - def edit(self, default_text: str | None = None) -> None: - assert self._edit_win and self._main_win - - self._edit_win.erase() - - if default_text is not None and len(default_text) > 0: - self._edit_win.addstr(0, 0, default_text) - - # if this gets initialized multiple times it will be an overlay - # and ENTER has to be pressed multiple times to accept - if not self._textbox: - self._textbox = Textbox(self._edit_win) - self._main_win.refresh() - - self._textbox.edit(self._process_key_cb) - - -class Viewport(AbstractViewport): - def __init__( - self, - width: int, - height: int, - x_start: int, - y_start: int, - frame: FrameProperties | None = None, - alignment: Alignment = Alignment.LEFT, - ): - super().__init__() - - self.width = width - self.height = height - self.x_start = x_start - self.y_start = y_start - self._frame = frame - self._alignment = alignment - - self._main_win = curses.newwin(self.height, self.width, self.y_start, self.x_start) - self._main_win.nodelay(False) - self._main_win.standout() - - def getch(self) -> int: - return self._main_win.getch() - - def erase(self) -> None: - self._main_win.erase() - self._main_win.refresh() - - def update( - self, - entries: list[ViewportEntry], - cur_pos: int = 0, - scroll_pos: int | None = None, - ) -> None: - # self._state = self._get_viewport_state(lines, cur_pos, scroll_pos) - # visible_entries = self._adjust_entries_row(self._state.displayed_entries) - visible_entries = entries - - if self._frame: - visible_entries = self.add_frame( - visible_entries, - self.width, - self.height, - frame=self._frame, - scroll_pct=scroll_pos, - ) - - x_offset = 0 - if self._alignment == Alignment.CENTER: - x_offset = self.align_center(visible_entries, self.width) - - self._main_win.erase() - - for entry in visible_entries: - self.add_str( - self._main_win, - entry.row, - entry.col + x_offset, - entry.text, - entry.style, - ) - - self._main_win.refresh() - - -class EditMenu(AbstractCurses[str]): - def __init__( - self, - title: str, - edit_width: int = 50, - header: str | None = None, - validator: Callable[[str | None], str | None] | None = None, - allow_skip: bool = False, - allow_reset: bool = False, - reset_warning_msg: str | None = None, - alignment: Alignment = Alignment.CENTER, - default_text: str | None = None, - hide_input: bool = False, - ): - super().__init__() - - self._max_height, self._max_width = Tui.t().max_yx - - self._header = header - - self._header_entries = [] - if header: - self._header_entries = self.get_header_entries(header) - - self._validator = validator - self._allow_skip = allow_skip - self._allow_reset = allow_reset - self._interrupt_warning = reset_warning_msg - self._alignment = alignment - self._edit_width = edit_width - self._default_text = default_text - self._hide_input = hide_input - - if self._interrupt_warning is None: - self._interrupt_warning = tr('Are you sure you want to reset this setting?') + '\n' - - title = f'* {title}' if not self._allow_skip else title - self._frame = FrameProperties(title, FrameStyle.MAX) - - self._title_vp: Viewport | None = None - self._header_vp: Viewport | None = None - self._input_vp: EditViewport | None = None - self._info_vp: Viewport | None = None - - self._set_default_info = True - self._only_ascii_text = ViewportEntry(tr('Only ASCII characters are supported'), 0, 0, STYLE.NORMAL) - - self._init_viewports() - - self._last_state: Result[str] | None = None - self._help_active = False - - self._current_text = default_text or '' - self._real_input = default_text or '' - - def _init_viewports(self) -> None: - y_offset = 0 - - self._title_vp = Viewport(self._max_width, 2, 0, y_offset) - y_offset += 2 - - if self._header_entries: - header_height = len(self._header_entries) - self._header_vp = Viewport(self._max_width, header_height, 0, y_offset, alignment=self._alignment) - y_offset += header_height - - self._input_vp = EditViewport( - self._max_width, - self._edit_width, - 3, - 0, - y_offset, - self._process_edit_key, - frame=self._frame, - alignment=self._alignment, - hide_input=self._hide_input, - ) - - y_offset += 3 - self._info_vp = Viewport(self._max_width, 1, 0, y_offset, alignment=self._alignment) - - def input(self) -> Result[str]: - result = Tui.run(self) - - assert not result.has_item() or isinstance(result.text(), str) - - self._clear_all() - return result - - @override - def resize_win(self) -> None: - self._draw() - - def _clear_all(self) -> None: - if self._title_vp: - self._title_vp.erase() - if self._header_vp: - self._header_vp.erase() - if self._input_vp: - self._input_vp.erase() - if self._info_vp: - self._info_vp.erase() - - def _get_input_text(self) -> str | None: - assert self._input_vp - assert self._info_vp - - text = self._real_input - - self.clear_all() - - if self._validator: - if (err := self._validator(text)) is not None: - self.clear_all() - entry = ViewportEntry(err, 0, 0, STYLE.ERROR) - self._info_vp.update([entry], 0) - self._set_default_info = False - - if self._hide_input: - self._real_input = '' - - return None - - return text - - def _draw(self) -> None: - if self._title_vp: - help_text = self.help_text() - help_entry = ViewportEntry(help_text, 0, 0, STYLE.NORMAL) - self._title_vp.update([help_entry], 0) - - if self._header_entries and self._header_vp: - self._header_vp.update(self._header_entries, 0) - - if self._input_vp: - self._input_vp.update() - - if self._set_default_info and self._info_vp: - self._info_vp.update([self._only_ascii_text], 0) - - self._input_vp.edit(default_text=self._real_input) - - @override - def kickoff(self, win: curses.window) -> Result[str]: - try: - self._draw() - except KeyboardInterrupt: - if not self._handle_interrupt(): - return self.kickoff(win) - else: - self._last_state = Result(ResultType.Reset, None) - - if self._last_state is None: - return self.kickoff(win) - - if self._last_state.type_ == ResultType.Selection: - text = self._get_input_text() - - if text is None: - return self.kickoff(win) - else: - if not text and not self._allow_skip: - return self.kickoff(win) - - return Result(ResultType.Selection, text) - - return self._last_state - - def _process_edit_key(self, key: int) -> int: - key_handles = MenuKeys.from_ord(key) - - if self._help_active: - if MenuKeys.ESC in key_handles: - self._help_active = False - self.clear_help_win() - return 7 - return 0 - - # remove standard keys from the list of key handles - key_handles = [key for key in key_handles if key != MenuKeys.STD_KEYS] - - # regular key stroke should be passed to the editor - if key_handles: - special_key = key_handles[0] - - match special_key: - case MenuKeys.HELP: - assert self._input_vp - self._current_text = self._input_vp.textbox_value() - self._clear_all() - self._help_active = True - self._show_help() - return 0 - case MenuKeys.ESC: - if self._allow_skip: - self._last_state = Result(ResultType.Skip, None) - key = 7 - case MenuKeys.ACCEPT: - self._last_state = Result(ResultType.Selection, None) - key = 7 - case MenuKeys.BACKSPACE: - if len(self._real_input) > 0: - self._real_input = self._real_input[:-1] - case _: - if isprint(key): - self._real_input += chr(key) - if self._hide_input: - key = 42 - else: - try: - if isprint(key): - self._real_input += chr(key) - if self._hide_input: - key = 42 - except Exception: - pass - - return key - - def _handle_interrupt(self) -> bool: - if self._allow_reset: - if self._interrupt_warning: - return self._confirm_interrupt(self._interrupt_warning) - else: - return False - - return True - - -class SelectMenu[ValueT](AbstractCurses[ValueT]): - def __init__( - self, - group: MenuItemGroup, - multi: bool = False, - orientation: Orientation = Orientation.VERTICAL, - alignment: Alignment = Alignment.LEFT, - columns: int = 1, - column_spacing: int = 10, - header: str | None = None, - frame: FrameProperties | None = None, - cursor_char: str = '>', - search_enabled: bool = True, - allow_skip: bool = False, - allow_reset: bool = False, - reset_warning_msg: str | None = None, - preview_style: PreviewStyle = PreviewStyle.NONE, - preview_size: float | Literal['auto'] = 0.2, - preview_frame: FrameProperties | None = None, - additional_title: str | None = None, - ): - super().__init__() - - self._multi = multi - self._cursor_char = f'{cursor_char} ' - self._search_enabled = search_enabled - self._allow_skip = allow_skip - self._allow_reset = allow_reset - self._active_search = False - self._help_active = False - self._item_group = group - self._preview_style = preview_style - self._preview_frame = preview_frame - self._orientation = orientation - self._column_spacing = column_spacing - self._alignment = alignment - self._footers = self._footer_entries() - self._frame = frame - self._interrupt_warning = reset_warning_msg - self._header = header - self._additional_title = additional_title - - self._header_entries = [] - if header: - self._header_entries = self.get_header_entries(header) - - if self._interrupt_warning is None: - self._interrupt_warning = tr('Are you sure you want to reset this setting?') + '\n' - - if self._orientation == Orientation.HORIZONTAL: - self._horizontal_cols = columns - else: - self._horizontal_cols = 1 - - self._prev_scroll_pos: int = 0 - - self._visible_entries: list[ViewportEntry] = [] - self._max_height, self._max_width = Tui.t().max_yx - - self._title_vp: Viewport | None = None - self._header_vp: Viewport | None = None - self._footer_vp: Viewport | None = None - self._menu_vp: Viewport | None = None - self._preview_vp: Viewport | None = None - - self._init_viewports(preview_size) - - assert self._menu_vp is not None - self._items_state: MenuItemsState = MenuItemsState( # type: ignore[unreachable] - self._item_group, - total_cols=self._horizontal_cols, - total_rows=self._menu_vp.height, - with_frame=self._frame is not None, - ) - - def run(self) -> Result[ValueT]: - result = Tui.run(self) - self._clear_all() - return result - - @override - def kickoff(self, win: curses.window) -> Result[ValueT]: - self._draw() - - while True: - try: - if not self._help_active: - self._draw() - - key = win.getch() - - ret = self._process_input_key(key) - - if ret is not None: - return ret - except KeyboardInterrupt: - if self._handle_interrupt(): - return Result(ResultType.Reset, None) - else: - return self.kickoff(win) - - @override - def resize_win(self) -> None: - self._draw() - - def _clear_all(self) -> None: - self.clear_help_win() - - if self._header_vp: - self._header_vp.erase() - if self._menu_vp: - self._menu_vp.erase() - if self._preview_vp: - self._preview_vp.erase() - if self._footer_vp: - self._footer_vp.erase() - if self._title_vp: - self._title_vp.erase() - - def _footer_entries(self) -> list[ViewportEntry]: - if self._active_search: - filter_pattern = self._item_group.filter_pattern - return [ViewportEntry(f'/{filter_pattern}', 0, 0, STYLE.NORMAL)] - - return [] - - def _init_viewports(self, arg_prev_size: float | Literal['auto']) -> None: - footer_height = 2 # possible filter at the bottom - y_offset = 0 - - self._title_vp = Viewport(self._max_width, 2, 0, y_offset) - y_offset += 2 - - if self._header_entries: - header_height = len(self._header_entries) - self._header_vp = Viewport( - self._max_width, - header_height, - 0, - y_offset, - alignment=self._alignment, - ) - y_offset += header_height - - prev_offset = y_offset + footer_height - prev_size = self._determine_prev_size(arg_prev_size, offset=prev_offset) - available_height = self._max_height - y_offset - footer_height - - match self._preview_style: - case PreviewStyle.BOTTOM: - menu_height = available_height - prev_size - - self._menu_vp = Viewport( - self._max_width, - menu_height, - 0, - y_offset, - frame=self._frame, - alignment=self._alignment, - ) - self._preview_vp = Viewport( - self._max_width, - prev_size, - 0, - menu_height + y_offset, - frame=self._preview_frame, - ) - case PreviewStyle.RIGHT: - menu_width = self._max_width - prev_size - - self._menu_vp = Viewport( - menu_width, - available_height, - 0, - y_offset, - frame=self._frame, - alignment=self._alignment, - ) - self._preview_vp = Viewport( - prev_size, - available_height, - menu_width, - y_offset, - frame=self._preview_frame, - alignment=self._alignment, - ) - case PreviewStyle.TOP: - menu_height = available_height - prev_size - - self._menu_vp = Viewport( - self._max_width, - menu_height, - 0, - prev_size + y_offset, - frame=self._frame, - alignment=self._alignment, - ) - self._preview_vp = Viewport( - self._max_width, - prev_size, - 0, - y_offset, - frame=self._preview_frame, - alignment=self._alignment, - ) - case PreviewStyle.NONE: - self._menu_vp = Viewport( - self._max_width, - available_height, - 0, - y_offset, - frame=self._frame, - alignment=self._alignment, - ) - - self._footer_vp = Viewport( - self._max_width, - footer_height, - 0, - self._max_height - footer_height, - ) - - def _determine_prev_size( - self, - preview_size: float | Literal['auto'], - offset: int = 0, - ) -> int: - if not isinstance(preview_size, float) and preview_size != 'auto': - raise ValueError('preview size must be a float or "auto"') - - prev_size: int = 0 - - if preview_size == 'auto': - match self._preview_style: - case PreviewStyle.RIGHT: - menu_width = self._item_group.get_max_width() + 5 - if self._multi: - menu_width += 5 - prev_size = self._max_width - menu_width - case PreviewStyle.BOTTOM: - menu_height = len(self._item_group.items) + 1 # leave empty line between menu and preview - prev_size = self._max_height - offset - menu_height - case PreviewStyle.TOP: - menu_height = len(self._item_group.items) - prev_size = self._max_height - offset - menu_height - else: - match self._preview_style: - case PreviewStyle.RIGHT: - prev_size = int(self._max_width * preview_size) - case PreviewStyle.BOTTOM: - prev_size = int((self._max_height - offset) * preview_size) - case PreviewStyle.TOP: - prev_size = int((self._max_height - offset) * preview_size) - - return prev_size - - def _draw(self) -> None: - footer_entries = self._footer_entries() - - items = self._items_state.get_view_items() - vp_entries = self._item_to_vp_entry(items) - - if self._title_vp: - title_text = self.help_text() - - if self._additional_title is not None: - title_text += f' {self._additional_title}' - - title_vp_entry = ViewportEntry(title_text, 0, 0, STYLE.NORMAL) - - self._update_viewport(self._title_vp, [title_vp_entry]) - - if self._header_vp: - self._update_viewport(self._header_vp, self._header_entries) - - if self._menu_vp: - self._update_viewport(self._menu_vp, vp_entries) - - if vp_entries: - self._update_preview() - elif self._preview_vp: - self._update_viewport(self._preview_vp, []) - - if self._footer_vp: - self._update_viewport(self._footer_vp, footer_entries, 0) - - def _update_viewport( - self, - viewport: Viewport, - entries: list[ViewportEntry], - cur_pos: int = 0, - ) -> None: - if entries: - viewport.update(entries, cur_pos=cur_pos) - else: - viewport.update([]) - - def _get_col_widths(self, items: list[list[MenuItem]]) -> list[int]: - cols_widths = self._calc_col_widths(items, self._horizontal_cols) - return [col_width + len(self._cursor_char) + self._item_distance() for col_width in cols_widths] - - def _item_distance(self) -> int: - if self._horizontal_cols == 1: - return 0 - else: - return self._column_spacing - - def _item_to_vp_entry(self, items: list[list[MenuItem]]) -> list[ViewportEntry]: - entries = [] - cols_widths = self._get_col_widths(items) - - for row_idx, row in enumerate(items): - cur_pos = len(self._cursor_char) - - for col_idx, cell in enumerate(row): - cur_text = '' - style = STYLE.NORMAL - - if cell == self._item_group.focus_item: - cur_text = self._cursor_char - style = STYLE.MENU_STYLE - - entries += [ViewportEntry(cur_text, row_idx, cur_pos - len(self._cursor_char), STYLE.CURSOR_STYLE)] - - menu_item_text = self._menu_item_text(cell) - entries += [ViewportEntry(menu_item_text, row_idx, cur_pos, style)] - cur_pos += len(menu_item_text) - - if col_idx < len(row) - 1: - spacer_len = cols_widths[col_idx] - len(menu_item_text) - entries += [ViewportEntry(' ' * spacer_len, row_idx, cur_pos, STYLE.NORMAL)] - cur_pos += spacer_len - - return entries - - def _calc_col_widths(self, rows: list[list[MenuItem]], columns: int) -> list[int]: - col_widths = [] - - for row in rows: - col_entries = [] - for column in range(columns): - if column < len(row): - col_entries += [len(row[column].text)] - - if col_entries: - col_widths += [max(col_entries)] - - return col_widths - - def _menu_item_text(self, item: MenuItem) -> str: - item_text = '' - - if self._multi and not item.is_empty(): - item_text += self._multi_prefix(item) - - item_text += self._item_group.get_item_text(item) - return item_text - - def _update_preview(self) -> None: - if not self._preview_vp: - return - - focus_item = self._item_group.focus_item - - if not focus_item or focus_item.preview_action is None: - self._preview_vp.update([]) - return - - action_text = focus_item.preview_action(focus_item) - - if not action_text: - self._preview_vp.update([]) - return - - preview_text = action_text.split('\n') - entries = [ViewportEntry(e, idx, 0, STYLE.NORMAL) for idx, e in enumerate(preview_text)] - - total_prev_rows = max([e.row for e in entries]) + 1 # rows start with 0 and we need the count - available_rows = self._preview_vp.height - 2 # for the preview frame - - self._calc_prev_scroll_pos(entries, total_prev_rows) - prev_entries = self._get_scroll_win_prev_entries(entries, total_prev_rows, available_rows) - scroll_pct = self._get_scroll_pct(total_prev_rows, available_rows) - - self._preview_vp.update(prev_entries, scroll_pos=scroll_pct) - - def _get_scroll_pct( - self, - total_prev_rows: int, - available_rows: int, - ) -> int | None: - assert self._preview_vp is not None - - if total_prev_rows <= available_rows: - return None - - pct = int(self._prev_scroll_pos / total_prev_rows * 100) - - if pct + SCROLL_INTERVAL > 100: - pct = 100 - - if pct < 0: - pct = 0 - - return pct - - def _get_scroll_win_prev_entries( - self, - entries: list[ViewportEntry], - total_prev_rows: int, - available_rows: int, - ) -> list[ViewportEntry]: - assert self._preview_vp is not None - - if total_prev_rows <= available_rows: - start_row = 0 - else: - start_row = self._prev_scroll_pos - - end_row = start_row + available_rows - - if end_row > total_prev_rows: - end_row = total_prev_rows - - prev_entries = [e for e in entries if start_row <= e.row < end_row] - - # normalize the rows - for e in prev_entries: - e.row -= start_row - - return prev_entries - - def _calc_prev_scroll_pos( - self, - entries: list[ViewportEntry], - total_prev_rows: int, - ) -> None: - if self._prev_scroll_pos >= total_prev_rows: - self._prev_scroll_pos = total_prev_rows - 2 - elif self._prev_scroll_pos < 0: - self._prev_scroll_pos = 0 - - def _multi_prefix(self, item: MenuItem) -> str: - if item.read_only: - return ' ' - elif self._item_group.is_item_selected(item): - return '[x] ' - else: - return '[ ] ' - - def _handle_interrupt(self) -> bool: - if self._allow_reset and self._interrupt_warning: - return self._confirm_interrupt(self._interrupt_warning) - else: - return False - - def _process_input_key(self, key: int) -> Result[ValueT] | None: - key_handles = MenuKeys.from_ord(key) - - if self._help_active: - if MenuKeys.ESC in key_handles: - self._help_active = False - self.clear_help_win() - self._draw() - return None - - # special case when search is currently active - if self._active_search: - if MenuKeys.STD_KEYS in key_handles: - self._item_group.append_filter(chr(key)) - self._draw() - return None - elif MenuKeys.BACKSPACE in key_handles: - self._item_group.reduce_filter() - self._draw() - return None - - # remove standard keys from the list of key handles - key_handles = [key for key in key_handles if key != MenuKeys.STD_KEYS] - - if len(key_handles) > 1: - decoded = MenuKeys.decode(key) - handles = ', '.join(k.name for k in key_handles) - raise ValueError(f'Multiple key matches for key {decoded}: {handles}') - elif len(key_handles) == 0: - return None - - handle = key_handles[0] - - match handle: - case MenuKeys.HELP: - self._help_active = True - self._clear_all() - self._show_help() - return None - case MenuKeys.ACCEPT: - if self._multi: - if self._item_group.is_mandatory_fulfilled(): - if self._item_group.focus_item is not None: - if self._item_group.focus_item not in self._item_group.selected_items: - self._item_group.selected_items.append(self._item_group.focus_item) - return Result(ResultType.Selection, self._item_group.selected_items) - else: - item = self._item_group.focus_item - if item: - if item.action: - item.value = item.action(item.value) - - if self._item_group.is_mandatory_fulfilled(): - return Result(ResultType.Selection, self._item_group.focus_item) - - return None - case MenuKeys.MENU_DOWN | MenuKeys.MENU_RIGHT: - self._focus_item('next') - case MenuKeys.MENU_UP | MenuKeys.MENU_LEFT: - self._focus_item('prev') - case MenuKeys.MENU_START: - self._focus_item('first') - case MenuKeys.MENU_END: - self._focus_item('last') - case MenuKeys.MULTI_SELECT: - if self._multi: - self._item_group.select_current_item() - case MenuKeys.ENABLE_SEARCH: - if self._search_enabled and not self._active_search: - self._active_search = True - self._item_group.set_filter_pattern('') - case MenuKeys.ESC: - if self._active_search: - self._active_search = False - self._item_group.set_filter_pattern('') - else: - if self._allow_skip: - return Result(ResultType.Skip, None) - case MenuKeys.NUM_KEYS: - self._item_group.focus_index(key - 49) - case MenuKeys.SCROLL_DOWN: - self._prev_scroll_pos += SCROLL_INTERVAL - case MenuKeys.SCROLL_UP: - self._prev_scroll_pos -= SCROLL_INTERVAL - case _: - pass - - return None - - def _focus_item(self, direction: Literal['next', 'prev', 'first', 'last']) -> None: - # reset the preview scroll as the newly focused item - # may have a different preview row count and it'll blow up - self._prev_scroll_pos = 0 - - match direction: - case 'next': - self._item_group.focus_next() - case 'prev': - self._item_group.focus_prev() - case 'first': - self._item_group.focus_first() - case 'last': - self._item_group.focus_last() - - -class Tui: - _t: ClassVar[Self | None] = None - - def __enter__(self) -> None: - if Tui._t is None: - tui = self.init() - Tui._t = tui - - def __exit__(self, exc_type: type[BaseException] | None, exc_value: BaseException | None, traceback: TracebackType | None) -> None: - self.stop() - - @property - def screen(self) -> curses.window: - return self._screen - - @classmethod - def t(cls) -> Self: - assert cls._t is not None - return cls._t - - @staticmethod - def shutdown() -> None: - if Tui._t is None: - return - - Tui.t().stop() - - def init(self) -> Self: - self._screen = curses.initscr() - curses.noecho() - curses.cbreak() - curses.curs_set(0) - curses.set_escdelay(25) - - self._screen.keypad(True) - self._screen.scrollok(True) - - if curses.has_colors(): - curses.start_color() - self._set_up_colors() - - signal.signal(signal.SIGWINCH, self._sig_win_resize) - self._screen.refresh() - - return self - - def stop(self) -> None: - try: - curses.nocbreak() - - try: - self.screen.keypad(False) - except Exception: - pass - - curses.echo() - curses.curs_set(True) - curses.endwin() - except Exception: - # this may happen when curses has not been initialized - pass - - Tui._t = None - - @staticmethod - def print( - text: str, - row: int = 0, - col: int = 0, - endl: str = '\n', - clear_screen: bool = False, - ) -> None: - if clear_screen: - os.system('clear') # type: ignore[deprecated] - - if Tui._t is None: - print(text, end=endl) - sys.stdout.flush() - - return - - # will append the row at the very bottom of the screen - # and also scroll the existing text up by 1 line - if row == -1: - last_row = Tui.t().max_yx[0] - 1 - Tui.t().screen.scroll(1) - Tui.t().screen.addstr(last_row, col, text) - else: - Tui.t().screen.addstr(row, col, text) - - Tui.t().screen.refresh() - - @property - def max_yx(self) -> tuple[int, int]: - return self._screen.getmaxyx() - - @staticmethod - def run[ValueT](component: AbstractCurses[ValueT]) -> Result[ValueT]: - if Tui._t is None: - tui = Tui().init() - tui.screen.clear() - results = tui._main_loop(component) - Tui().stop() - return results - else: - tui = Tui._t - tui.screen.clear() - return Tui.t()._main_loop(component) - - def _sig_win_resize(self, signum: int, frame: FrameType | None) -> None: - if hasattr(self, '_component') and self._component is not None: # pylint: disable=no-member - self._component.resize_win() # pylint: disable=no-member - - def _main_loop[ValueT](self, component: AbstractCurses[ValueT]) -> Result[ValueT]: - self._screen.refresh() - return component.kickoff(self._screen) - - def _reset_terminal(self) -> None: - os.system('reset') # type: ignore[deprecated] - - def _set_up_colors(self) -> None: - curses.init_pair(STYLE.NORMAL.value, curses.COLOR_WHITE, curses.COLOR_BLACK) - curses.init_pair(STYLE.CURSOR_STYLE.value, curses.COLOR_CYAN, curses.COLOR_BLACK) - curses.init_pair(STYLE.MENU_STYLE.value, curses.COLOR_WHITE, curses.COLOR_BLUE) - curses.init_pair(STYLE.MENU_STYLE.value, curses.COLOR_WHITE, curses.COLOR_BLUE) - curses.init_pair(STYLE.HELP.value, curses.COLOR_GREEN, curses.COLOR_BLACK) - curses.init_pair(STYLE.ERROR.value, curses.COLOR_RED, curses.COLOR_BLACK) - - def get_color(self, color: STYLE) -> int: - return curses.color_pair(color.value) diff --git a/archinstall/tui/help.py b/archinstall/tui/help.py deleted file mode 100644 index 2a1ab106..00000000 --- a/archinstall/tui/help.py +++ /dev/null @@ -1,109 +0,0 @@ -from dataclasses import dataclass, field -from enum import Enum - -from archinstall.lib.translationhandler import tr - - -class HelpTextGroupId(Enum): - GENERAL = 'General' - NAVIGATION = 'Navigation' - SELECTION = 'Selection' - SEARCH = 'Search' - - -@dataclass -class HelpText: - description: str - keys: list[str] = field(default_factory=list) - - -@dataclass -class HelpGroup: - group_id: HelpTextGroupId - group_entries: list[HelpText] - - def get_desc_width(self) -> int: - return max([len(e.description) for e in self.group_entries]) - - def get_key_width(self) -> int: - return max([len(', '.join(e.keys)) for e in self.group_entries]) - - -class Help: - # the groups needs to be classmethods not static methods - # because they rely on the DeferredTranslation setup first; - # if they are static methods, they will be called before the - # translation setup is done - - @staticmethod - def general() -> HelpGroup: - return HelpGroup( - group_id=HelpTextGroupId.GENERAL, - group_entries=[ - HelpText(tr('Show help'), ['Ctrl+h']), - HelpText(tr('Exit help'), ['Esc']), - ], - ) - - @staticmethod - def navigation() -> HelpGroup: - return HelpGroup( - group_id=HelpTextGroupId.NAVIGATION, - group_entries=[ - HelpText(tr('Preview scroll up'), ['PgUp']), - HelpText(tr('Preview scroll down'), ['PgDown']), - HelpText(tr('Move up'), ['k', '↑']), - HelpText(tr('Move down'), ['j', '↓']), - HelpText(tr('Move right'), ['l', '→']), - HelpText(tr('Move left'), ['h', '←']), - HelpText(tr('Jump to entry'), ['1..9']), - ], - ) - - @staticmethod - def selection() -> HelpGroup: - return HelpGroup( - group_id=HelpTextGroupId.SELECTION, - group_entries=[ - HelpText(tr('Skip selection (if available)'), ['Esc']), - HelpText(tr('Reset selection (if available)'), ['Ctrl+c']), - HelpText(tr('Select on single select'), ['Enter']), - HelpText(tr('Select on multi select'), ['Space', 'Tab']), - HelpText(tr('Reset'), ['Ctrl-C']), - HelpText(tr('Skip selection menu'), ['Esc']), - ], - ) - - @staticmethod - def search() -> HelpGroup: - return HelpGroup( - group_id=HelpTextGroupId.SEARCH, - group_entries=[ - HelpText(tr('Start search mode'), ['/']), - HelpText(tr('Exit search mode'), ['Esc']), - ], - ) - - @staticmethod - def get_help_text() -> str: - help_output = '' - help_texts = [ - Help.general(), - Help.navigation(), - Help.selection(), - Help.search(), - ] - max_desc_width = max([help.get_desc_width() for help in help_texts]) + 2 - max_key_width = max([help.get_key_width() for help in help_texts]) - - for help_group in help_texts: - help_output += f'{help_group.group_id.value}\n' - divider_len = max_desc_width + max_key_width - help_output += '-' * divider_len + '\n' - - for entry in help_group.group_entries: - help_output += entry.description.ljust(max_desc_width, ' ') + ', '.join(entry.keys) + '\n' - - help_output += '\n' - - return help_output diff --git a/archinstall/tui/menu_item.py b/archinstall/tui/menu_item.py index 418a4409..4c10e275 100644 --- a/archinstall/tui/menu_item.py +++ b/archinstall/tui/menu_item.py @@ -1,18 +1,17 @@ -from collections.abc import Callable +from collections.abc import Awaitable, Callable, Iterable from dataclasses import dataclass, field from enum import Enum from functools import cached_property from typing import Any, ClassVar, Self, override from archinstall.lib.translationhandler import tr -from archinstall.lib.utils.encoding import unicode_ljust @dataclass class MenuItem: text: str value: Any | None = None - action: Callable[[Any], Any] | None = None + action: Callable[[Any], Awaitable[Any]] | None = None enabled: bool = True read_only: bool = False mandatory: bool = False @@ -23,6 +22,7 @@ class MenuItem: key: str | None = None _id: str = '' + _yes: ClassVar[Self | None] = None _no: ClassVar[Self | None] = None @@ -110,6 +110,11 @@ class MenuItemGroup: if self.focus_item not in self.items: raise ValueError(f'Selected item not in menu: {self.focus_item}') + @classmethod + def from_objects(cls, items: list[Any]) -> Self: + items = [MenuItem(str(id(item)), value=item) for item in items] + return cls(items) + def add_item(self, item: MenuItem) -> None: self._menu_items.append(item) del self.items # resetting the cache @@ -143,7 +148,7 @@ class MenuItemGroup: cls, enum_cls: type[Enum], sort_items: bool = False, - preset: Enum | None = None, + preset: Iterable[Enum] | Enum | None = None, ) -> Self: items = [MenuItem(elem.value, value=elem) for elem in enum_cls] group = cls(items, sort_items=sort_items) @@ -198,60 +203,10 @@ class MenuItemGroup: return None - def index_focus(self) -> int | None: - if self.focus_item and self.items: - try: - return self.items.index(self.focus_item) - except ValueError: - # on large menus (15k+) when filtering very quickly - # the index search is too slow while the items are reduced - # by the filter and it will blow up as it cannot find the - # focus item - pass - - return None - - @property - def size(self) -> int: - return len(self.items) - - def get_max_width(self) -> int: - # use the menu_items not the items here otherwise the preview - # will get resized all the time when a filter is applied - return max([len(self.get_item_text(item)) for item in self._menu_items]) - @cached_property def _max_items_text_width(self) -> int: return max([len(item.text) for item in self._menu_items]) - def get_item_text(self, item: MenuItem) -> str: - if item.is_empty(): - return '' - - max_width = self._max_items_text_width - display_text = item.get_display_value() - - default_text = self._default_suffix(item) - - text = unicode_ljust(str(item.text), max_width, ' ') - spacing = ' ' * 4 - - if display_text: - text = f'{text}{spacing}{display_text}' - elif self._checkmarks: - from archinstall.tui.types import Chars - - if item.has_value(): - if item.get_value() is not False: - text = f'{text}{spacing}{Chars.Check}' - else: - text = item.text - - if default_text: - text = f'{text} {default_text}' - - return text.rstrip(' ') - def _default_suffix(self, item: MenuItem) -> str: if self.default_item == item: return tr(' (default)') @@ -274,45 +229,11 @@ class MenuItemGroup: return 0 return 1 - @property - def filter_pattern(self) -> str: - return self._filter_pattern - - def has_filter(self) -> bool: - return self._filter_pattern != '' - def set_filter_pattern(self, pattern: str) -> None: self._filter_pattern = pattern del self.items # resetting the cache self.focus_first() - def append_filter(self, pattern: str) -> None: - self._filter_pattern += pattern - del self.items # resetting the cache - self.focus_first() - - def reduce_filter(self) -> None: - self._filter_pattern = self._filter_pattern[:-1] - del self.items # resetting the cache - self.focus_first() - - def _reload_focus_item(self) -> None: - if len(self.items) > 0: - if self.focus_item not in self.items: - self.focus_first() - else: - self.focus_item = None - - def is_item_selected(self, item: MenuItem) -> bool: - return item in self.selected_items - - def select_current_item(self) -> None: - if self.focus_item: - if self.focus_item in self.selected_items: - self.selected_items.remove(self.focus_item) - else: - self.selected_items.append(self.focus_item) - def focus_index(self, index: int) -> None: enabled = self.get_enabled_items() self.focus_item = enabled[index] @@ -379,12 +300,6 @@ class MenuItemGroup: return None - def is_mandatory_fulfilled(self) -> bool: - for item in self._menu_items: - if item.mandatory and not item.value: - return False - return True - def max_item_width(self) -> int: spaces = [len(str(it.text)) for it in self.items] if spaces: @@ -417,99 +332,3 @@ class MenuItemGroup: return False return True - - -class MenuItemsState: - def __init__( - self, - item_group: MenuItemGroup, - total_cols: int, - total_rows: int, - with_frame: bool, - ) -> None: - self._item_group = item_group - self._total_cols = total_cols - self._total_rows = total_rows - 2 if with_frame else total_rows - - self._prev_row_idx: int = -1 - self._prev_visible_rows: list[int] = [] - self._view_items: list[list[MenuItem]] = [] - - def _determine_focus_row(self) -> int | None: - focus_index = self._item_group.index_focus() - - if focus_index is None: - return None - - row_index = focus_index // self._total_cols - return row_index - - def get_view_items(self) -> list[list[MenuItem]]: - enabled_items = self._item_group.get_enabled_items() - focus_row_idx = self._determine_focus_row() - - if focus_row_idx is None: - return [] - - start, end = 0, 0 - - if len(self._view_items) == 0 or self._prev_row_idx == -1 or focus_row_idx == 0: # initial setup - if focus_row_idx < self._total_rows: - start = 0 - end = self._total_rows - elif focus_row_idx > len(enabled_items) - self._total_rows: - start = len(enabled_items) - self._total_rows - end = len(enabled_items) - else: - start = focus_row_idx - end = focus_row_idx + self._total_rows - elif len(enabled_items) <= self._total_rows: # the view can handle all items - start = 0 - end = self._total_rows - elif not self._item_group.has_filter() and focus_row_idx in self._prev_visible_rows: # focus is in the same view - self._prev_row_idx = focus_row_idx - return self._view_items - else: - if self._item_group.has_filter(): - start = focus_row_idx - end = focus_row_idx + self._total_rows - else: - delta = focus_row_idx - self._prev_row_idx - - if delta > 0: # cursor is on the bottom most row - start = focus_row_idx - self._total_rows + 1 - end = focus_row_idx + 1 - else: # focus is on the top most row - start = focus_row_idx - end = focus_row_idx + self._total_rows - - self._view_items = self._get_view_items(enabled_items, start, end) - self._prev_visible_rows = list(range(start, end)) - self._prev_row_idx = focus_row_idx - - return self._view_items - - def _get_view_items( - self, - items: list[MenuItem], - start_row: int, - total_rows: int, - ) -> list[list[MenuItem]]: - groups: list[list[MenuItem]] = [] - nr_items = self._total_cols * min(total_rows, len(items)) - - for x in range(start_row, nr_items, self._total_cols): - groups.append( - items[x : x + self._total_cols], - ) - - return groups - - def _max_visible_items(self) -> int: - return self._total_cols * self._total_rows - - def _remaining_next_spots(self) -> int: - return self._max_visible_items() - self._prev_row_idx - - def _remaining_prev_spots(self) -> int: - return self._max_visible_items() - self._remaining_next_spots() diff --git a/archinstall/tui/result.py b/archinstall/tui/result.py index 13f12794..a2232a4f 100644 --- a/archinstall/tui/result.py +++ b/archinstall/tui/result.py @@ -1,5 +1,6 @@ from dataclasses import dataclass from enum import Enum, auto +from typing import Self, cast from archinstall.tui.menu_item import MenuItem @@ -13,25 +14,58 @@ class ResultType(Enum): @dataclass class Result[ValueT]: type_: ResultType - _item: MenuItem | list[MenuItem] | str | None + _data: ValueT | list[ValueT] | None = None + _item: MenuItem | list[MenuItem] | None = None - def has_item(self) -> bool: + @classmethod + def true(cls) -> Self: + return cls(ResultType.Selection, _data=True) # type: ignore[arg-type] + + @classmethod + def false(cls) -> Self: + return cls(ResultType.Selection, _data=False) # type: ignore[arg-type] + + @classmethod + def reset(cls) -> Self: + return cls(ResultType.Reset) + + @classmethod + def selection(cls, value: ValueT | list[ValueT] | None) -> Self: + return cls(ResultType.Selection, _data=value) + + @classmethod + def skip(cls) -> Self: + return cls(ResultType.Skip) + + def has_data(self) -> bool: + return self._data is not None + + def has_value(self) -> bool: return self._item is not None - def get_value(self) -> ValueT: - return self.item().get_value() # type: ignore[no-any-return] - - def get_values(self) -> list[ValueT]: - return [i.get_value() for i in self.items()] - def item(self) -> MenuItem: - assert self._item is not None and isinstance(self._item, MenuItem) + if isinstance(self._item, list) or self._item is None: + raise ValueError('Invalid item type') return self._item def items(self) -> list[MenuItem]: - assert self._item is not None and isinstance(self._item, list) - return self._item + if isinstance(self._item, list): + return self._item - def text(self) -> str: - assert self._item is not None and isinstance(self._item, str) - return self._item + raise ValueError('Invalid item type') + + def get_value(self) -> ValueT: + if self._item is not None: + return self.item().get_value() # type: ignore[no-any-return] + + if type(self._data) is not list and self._data is not None: + return cast(ValueT, self._data) + + raise ValueError('No value found') + + def get_values(self) -> list[ValueT]: + if self._item is not None: + return [i.get_value() for i in self.items()] + + assert type(self._data) is list + return cast(list[ValueT], self._data) diff --git a/archinstall/tui/rich.py b/archinstall/tui/rich.py new file mode 100644 index 00000000..055ec22c --- /dev/null +++ b/archinstall/tui/rich.py @@ -0,0 +1,25 @@ +from io import StringIO + +from rich import box +from rich.console import Console +from rich.table import Table as RichTable + + +class BaseRichTable(RichTable): + def __init__(self) -> None: + super().__init__( + box=box.SIMPLE, + show_header=False, + pad_edge=False, + show_edge=False, + ) + + def stringify(self) -> str: + string_io = StringIO() + buf = Console(file=string_io, highlight=False) + buf.print(self) + + _ = string_io.seek(0) + output = string_io.read() + + return output diff --git a/archinstall/tui/types.py b/archinstall/tui/types.py deleted file mode 100644 index d57123ae..00000000 --- a/archinstall/tui/types.py +++ /dev/null @@ -1,144 +0,0 @@ -import curses -from dataclasses import dataclass -from enum import Enum, auto -from typing import Self - -SCROLL_INTERVAL = 10 - - -class STYLE(Enum): - NORMAL = 1 - CURSOR_STYLE = 2 - MENU_STYLE = 3 - HELP = 4 - ERROR = 5 - - -class MenuKeys(Enum): - # latin keys - STD_KEYS = frozenset(range(32, 127)) - # numbers - NUM_KEYS = frozenset(range(49, 58)) - # Menu up: up, k - MENU_UP = frozenset({259, 107}) - # Menu down: down, j - MENU_DOWN = frozenset({258, 106}) - # Menu left: left, h - MENU_LEFT = frozenset({260, 104}) - # Menu right: right, l - MENU_RIGHT = frozenset({261, 108}) - # Menu start: home CTRL-a - MENU_START = frozenset({262, 1}) - # Menu end: end CTRL-e - MENU_END = frozenset({360, 5}) - # Enter - ACCEPT = frozenset({10}) - # Selection: space, tab - MULTI_SELECT = frozenset({32, 9}) - # Search: / - ENABLE_SEARCH = frozenset({47}) - # ESC - ESC = frozenset({27}) - # BACKSPACE (search) - BACKSPACE = frozenset({127, 263}) - # Help view: ctrl+h - HELP = frozenset({8}) - # Scroll up: PGUP - SCROLL_UP = frozenset({339}) - # Scroll down: PGDOWN - SCROLL_DOWN = frozenset({338}) - - @classmethod - def from_ord(cls, key: int) -> list[Self]: - matches: list[Self] = [] - - for group in cls: - if key in group.value: - matches.append(group) - - return matches - - @classmethod - def decode(cls, key: int) -> str: - byte_str = curses.keyname(key) - return byte_str.decode('utf-8') - - -class FrameStyle(Enum): - MAX = auto() - MIN = auto() - - -@dataclass -class FrameProperties: - header: str - w_frame_style: FrameStyle = FrameStyle.MAX - h_frame_style: FrameStyle = FrameStyle.MAX - - @classmethod - def max(cls, header: str) -> Self: - return cls( - header, - FrameStyle.MAX, - FrameStyle.MAX, - ) - - @classmethod - def min(cls, header: str) -> Self: - return cls( - header, - FrameStyle.MIN, - FrameStyle.MIN, - ) - - -class Orientation(Enum): - VERTICAL = auto() - HORIZONTAL = auto() - - -class PreviewStyle(Enum): - NONE = auto() - BOTTOM = auto() - RIGHT = auto() - TOP = auto() - - -# https://www.compart.com/en/unicode/search?q=box+drawings#characters -# https://en.wikipedia.org/wiki/Box-drawing_characters -class Chars: - Horizontal = '─' - Vertical = '│' - Upper_left = '┌' - Upper_right = '┐' - Lower_left = '└' - Lower_right = '┘' - Block = '█' - Triangle_up = '▲' - Triangle_down = '▼' - Check = '+' - Cross = 'x' - Right_arrow = '←' - - -@dataclass -class ViewportEntry: - text: str - row: int - col: int - style: STYLE - - -class Alignment(Enum): - LEFT = auto() - CENTER = auto() - - -@dataclass -class FrameDim: - x_start: int - x_end: int - height: int - - def x_delta(self) -> int: - return self.x_end - self.x_start diff --git a/archinstall/tui/ui/menu_item.py b/archinstall/tui/ui/menu_item.py deleted file mode 100644 index ed5a16ec..00000000 --- a/archinstall/tui/ui/menu_item.py +++ /dev/null @@ -1,334 +0,0 @@ -from collections.abc import Awaitable, Callable -from dataclasses import dataclass, field -from enum import Enum -from functools import cached_property -from typing import Any, ClassVar, Self, override - -from archinstall.lib.translationhandler import tr - - -@dataclass -class MenuItem: - text: str - value: Any | None = None - action: Callable[[Any], Awaitable[Any]] | None = None - enabled: bool = True - read_only: bool = False - mandatory: bool = False - dependencies: list[str | Callable[[], bool]] = field(default_factory=list) - dependencies_not: list[str] = field(default_factory=list) - display_action: Callable[[Any], str] | None = None - preview_action: Callable[[Self], str | None] | None = None - key: str | None = None - - _id: str = '' - - _yes: ClassVar[Self | None] = None - _no: ClassVar[Self | None] = None - - def __post_init__(self) -> None: - if self.key is not None: - self._id = self.key - else: - self._id = str(id(self)) - - @override - def __hash__(self) -> int: - return hash(self._id) - - def get_id(self) -> str: - return self._id - - def get_value(self) -> Any: - assert self.value is not None - return self.value - - @classmethod - def yes(cls, action: Callable[[Any], Any] | None = None) -> Self: - if cls._yes is None: - cls._yes = cls(tr('Yes'), value=True, key='yes', action=action) - - return cls._yes - - @classmethod - def no(cls, action: Callable[[Any], Any] | None = None) -> Self: - if cls._no is None: - cls._no = cls(tr('No'), value=False, key='no', action=action) - - return cls._no - - def is_empty(self) -> bool: - return self.text == '' or self.text is None - - def has_value(self) -> bool: - if self.value is None: - return False - elif isinstance(self.value, list) and len(self.value) == 0: - return False - elif isinstance(self.value, dict) and len(self.value) == 0: - return False - else: - return True - - def get_display_value(self) -> str | None: - if self.display_action is not None: - return self.display_action(self.value) - - return None - - -class MenuItemGroup: - def __init__( - self, - menu_items: list[MenuItem], - focus_item: MenuItem | None = None, - default_item: MenuItem | None = None, - sort_items: bool = False, - sort_case_sensitive: bool = True, - checkmarks: bool = False, - ) -> None: - if len(menu_items) < 1: - raise ValueError('Menu must have at least one item') - - if sort_items: - if sort_case_sensitive: - menu_items = sorted(menu_items, key=lambda x: x.text) - else: - menu_items = sorted(menu_items, key=lambda x: x.text.lower()) - - self._filter_pattern: str = '' - self._checkmarks: bool = checkmarks - - self._menu_items: list[MenuItem] = menu_items - self.focus_item: MenuItem | None = focus_item - self.selected_items: list[MenuItem] = [] - self.default_item: MenuItem | None = default_item - - if not focus_item: - self.focus_first() - - if self.focus_item not in self.items: - raise ValueError(f'Selected item not in menu: {self.focus_item}') - - @classmethod - def from_objects(cls, items: list[Any]) -> Self: - items = [MenuItem(str(id(item)), value=item) for item in items] - return cls(items) - - def add_item(self, item: MenuItem) -> None: - self._menu_items.append(item) - del self.items # resetting the cache - - def find_by_id(self, item_id: str) -> MenuItem: - for item in self._menu_items: - if item.get_id() == item_id: - return item - - raise ValueError(f'No item found for id: {item_id}') - - def find_by_key(self, key: str) -> MenuItem: - for item in self._menu_items: - if item.key == key: - return item - - raise ValueError(f'No item found for key: {key}') - - def get_enabled_items(self) -> list[MenuItem]: - return [it for it in self.items if self.is_enabled(it)] - - @classmethod - def yes_no(cls) -> Self: - return cls( - [MenuItem.yes(), MenuItem.no()], - sort_items=True, - ) - - @classmethod - def from_enum( - cls, - enum_cls: type[Enum], - sort_items: bool = False, - preset: Enum | None = None, - ) -> Self: - items = [MenuItem(elem.value, value=elem) for elem in enum_cls] - group = cls(items, sort_items=sort_items) - - if preset is not None: - group.set_selected_by_value(preset) - - return group - - def set_preview_for_all(self, action: Callable[[Any], str | None]) -> None: - for item in self.items: - item.preview_action = action - - def set_focus_by_value(self, value: Any) -> None: - for item in self._menu_items: - if item.value == value: - self.focus_item = item - break - - def set_default_by_value(self, value: Any) -> None: - for item in self._menu_items: - if item.value == value: - self.default_item = item - break - - def set_selected_by_value(self, values: Any | list[Any] | None) -> None: - if values is None: - return - - if not isinstance(values, list): - values = [values] - - for item in self._menu_items: - if item.value in values: - self.selected_items.append(item) - - if values: - self.set_focus_by_value(values[0]) - - def get_focused_index(self) -> int | None: - items = self.get_enabled_items() - - if self.focus_item and items: - try: - return items.index(self.focus_item) - except ValueError: - # on large menus (15k+) when filtering very quickly - # the index search is too slow while the items are reduced - # by the filter and it will blow up as it cannot find the - # focus item - pass - - return None - - @cached_property - def _max_items_text_width(self) -> int: - return max([len(item.text) for item in self._menu_items]) - - def _default_suffix(self, item: MenuItem) -> str: - if self.default_item == item: - return tr(' (default)') - return '' - - def set_action_for_all(self, action: Callable[[Any], Any]) -> None: - for item in self.items: - item.action = action - - @cached_property - def items(self) -> list[MenuItem]: - pattern = self._filter_pattern.lower() - items = filter(lambda item: item.is_empty() or pattern in item.text.lower(), self._menu_items) - l_items = sorted(items, key=self._items_score) - return l_items - - def _items_score(self, item: MenuItem) -> int: - pattern = self._filter_pattern.lower() - if item.text.lower().startswith(pattern): - return 0 - return 1 - - def set_filter_pattern(self, pattern: str) -> None: - self._filter_pattern = pattern - del self.items # resetting the cache - self.focus_first() - - def focus_index(self, index: int) -> None: - enabled = self.get_enabled_items() - self.focus_item = enabled[index] - - def focus_first(self) -> None: - if len(self.items) == 0: - return - - first_item: MenuItem | None = self.items[0] - - if first_item and not self._is_selectable(first_item): - first_item = self._find_next_selectable_item(self.items, first_item, 1) - - if first_item is not None: - self.focus_item = first_item - - def focus_last(self) -> None: - if len(self.items) == 0: - return - - last_item: MenuItem | None = self.items[-1] - - if last_item and not self._is_selectable(last_item): - last_item = self._find_next_selectable_item(self.items, last_item, -1) - - if last_item is not None: - self.focus_item = last_item - - def focus_prev(self, skip_empty: bool = True) -> None: - # e.g. when filter shows no items - if self.focus_item is None: - return - - item = self._find_next_selectable_item(self.items, self.focus_item, -1) - - if item is not None: - self.focus_item = item - - def focus_next(self, skip_not_enabled: bool = True) -> None: - # e.g. when filter shows no items - if self.focus_item is None: - return - - item = self._find_next_selectable_item(self.items, self.focus_item, 1) - - if item is not None: - self.focus_item = item - - def _find_next_selectable_item( - self, - items: list[MenuItem], - start_item: MenuItem, - direction: int, - ) -> MenuItem | None: - start_index = self.items.index(start_item) - n = len(items) - - current_index = start_index - for _ in range(n): - current_index = (current_index + direction) % n - - if self._is_selectable(items[current_index]): - return items[current_index] - - return None - - def max_item_width(self) -> int: - spaces = [len(str(it.text)) for it in self.items] - if spaces: - return max(spaces) - return 0 - - def _is_selectable(self, item: MenuItem) -> bool: - if item.is_empty(): - return False - elif item.read_only: - return False - - return self.is_enabled(item) - - def is_enabled(self, item: MenuItem) -> bool: - if not item.enabled: - return False - - for dep in item.dependencies: - if isinstance(dep, str): - item = self.find_by_key(dep) - if not item.value or not self.is_enabled(item): - return False - else: - return dep() - - for dep_not in item.dependencies_not: - item = self.find_by_key(dep_not) - if item.value is not None: - return False - - return True diff --git a/archinstall/tui/ui/result.py b/archinstall/tui/ui/result.py deleted file mode 100644 index 6258bccf..00000000 --- a/archinstall/tui/ui/result.py +++ /dev/null @@ -1,71 +0,0 @@ -from dataclasses import dataclass -from enum import Enum, auto -from typing import Self, cast - -from archinstall.tui.ui.menu_item import MenuItem - - -class ResultType(Enum): - Selection = auto() - Skip = auto() - Reset = auto() - - -@dataclass -class Result[ValueT]: - type_: ResultType - _data: ValueT | list[ValueT] | None = None - _item: MenuItem | list[MenuItem] | None = None - - @classmethod - def true(cls) -> Self: - return cls(ResultType.Selection, _data=True) # type: ignore[arg-type] - - @classmethod - def false(cls) -> Self: - return cls(ResultType.Selection, _data=False) # type: ignore[arg-type] - - @classmethod - def reset(cls) -> Self: - return cls(ResultType.Reset) - - @classmethod - def selection(cls, value: ValueT | list[ValueT] | None) -> Self: - return cls(ResultType.Selection, _data=value) - - @classmethod - def skip(cls) -> Self: - return cls(ResultType.Skip) - - def has_data(self) -> bool: - return self._data is not None - - def has_value(self) -> bool: - return self._item is not None - - def item(self) -> MenuItem: - if isinstance(self._item, list) or self._item is None: - raise ValueError('Invalid item type') - return self._item - - def items(self) -> list[MenuItem]: - if isinstance(self._item, list): - return self._item - - raise ValueError('Invalid item type') - - def get_value(self) -> ValueT: - if self._item is not None: - return self.item().get_value() # type: ignore[no-any-return] - - if type(self._data) is not list and self._data is not None: - return cast(ValueT, self._data) - - raise ValueError('No value found') - - def get_values(self) -> list[ValueT]: - if self._item is not None: - return [i.get_value() for i in self.items()] - - assert type(self._data) is list - return cast(list[ValueT], self._data) diff --git a/docs/help/known_issues.rst b/docs/help/known_issues.rst index bf039dcb..90945894 100644 --- a/docs/help/known_issues.rst +++ b/docs/help/known_issues.rst @@ -22,7 +22,7 @@ Restarting ``systemd-timesyncd.service`` might work but most often you need to c Waiting for Arch Linux keyring sync (archlinux-keyring-wkd-sync) to complete. `#2679`_ ------------------------------ -The ``archlinux-keyring-wkd-sync.service`` or ``archlinux-keyring-wkd-sync.timer`` can hang "indefinitely" some times. +The ``archlinux-keyring-wkd-sync.service`` or ``archlinux-keyring-wkd-sync.timer`` can hang "indefinitely" sometimes. This is usually due to an inability to reach the key servers, or a slow connection towards key servers. The script ``/usr/bin/archlinux-keyring-wkd-sync`` can be run manually, to verify if it's executing slowly or not. @@ -65,7 +65,7 @@ ARM, 32bit and other CPU types error out `#1686`_, `#2185`_ This is a bit of a catch-all known issue. Officially `x86_64`_ is only supported by Arch Linux. -Hence little effort have been put into supporting other platforms. +Hence little effort has been put into supporting other platforms. In theory, other architectures should work but small quirks might arise. @@ -79,10 +79,10 @@ Missing key-issues tend to be that the `archlinux-keyring`_ package is out of da There is an attempt from upstream to fix this issue, and it's the `archlinux-keyring-wkd-sync.service`_ The service starts almost immediately during boot, and if network is not configured in time — the service will fail. -Subsequently the ``archinstall`` run might operate on a old keyring despite there being an update service for this. +Subsequently the ``archinstall`` run might operate on an old keyring despite there being an update service for this. There is really no way to reliably over time work around this issue in ``archinstall``. -Instead, efforts to the upstream service should be considered the way forward. And/or keys not expiring between a sane amount of ISO's. +Instead, efforts to the upstream service should be considered the way forward. And/or keys not expiring between a sane amount of ISOs. .. note:: diff --git a/docs/help/report_bug.rst b/docs/help/report_bug.rst index bacaeb4c..b11027ab 100644 --- a/docs/help/report_bug.rst +++ b/docs/help/report_bug.rst @@ -15,7 +15,7 @@ When submitting a help ticket, please include the :code:`/var/log/archinstall/in It can be found both on the live ISO but also in the installed filesystem if the base packages were strapped in. .. tip:: - | An easy way to submit logs is ``curl -F 'file=@/var/log/archinstall/install.log' https://0x0.st``. + | An easy way to submit logs is ``archinstall share-log``, which uploads ``install.log`` to paste.rs and prints a shareable URL. | Use caution when submitting other log files, but ``archinstall`` pledges to keep ``install.log`` safe for posting publicly! There are additional log files under ``/var/log/archinstall/`` that can be useful: diff --git a/pyproject.toml b/pyproject.toml index dd42c642..ccbee27b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,9 +19,9 @@ classifiers = [ ] dependencies = [ "pyparted==3.13.0", - "pydantic==2.12.5", - "cryptography==46.0.7", - "textual==8.2.4", + "pydantic==2.13.4", + "cryptography==48.0.0", + "textual==8.2.7", "markdown-it-py==4.0.0", "linkify-it-py==2.1.0", ] @@ -34,12 +34,13 @@ Source = "https://github.com/archlinux/archinstall" [project.optional-dependencies] log = ["systemd_python==235"] dev = [ - "mypy==1.20.2", + "mypy==2.1.0", "flake8==7.3.0", "pre-commit==4.6.0", - "ruff==0.15.11", + "ruff==0.15.14", "pylint==4.0.5", "pytest==9.0.3", + "hypothesis>=6.152.4", ] doc = ["sphinx"] @@ -60,6 +61,7 @@ include-package-data = true "**/*.po", "**/*.pot", "**/*.json", + "**/*.kdl", ] [tool.setuptools.package-dir] @@ -68,7 +70,10 @@ archinstall = "archinstall" [tool.mypy] python_version = "3.14" files = "." -exclude = "^build/" +exclude = [ + "^build/", + "^test_tooling/", +] disallow_any_explicit = false disallow_any_expr = false disallow_any_unimported = true @@ -172,6 +177,23 @@ score = false [tool.pylint.variables] init-import = true +[tool.pyrefly] +python-version = "3.14" + +replace-imports-with-any = [ + "parted", # pyparted doesn't have type hints +] + +[tool.pyrefly.errors] +# Enable some additional rules that are disabled by default +implicit-abstract-class = true +missing-override-decorator = true +missing-source = true +not-required-key-access = true +open-unpacking = true +unannotated-parameter = true +unused-ignore = true + [tool.ruff] target-version = "py314" line-length = 160 diff --git a/build_iso.sh b/test_tooling/mkarchiso/build_iso.sh similarity index 100% rename from build_iso.sh rename to test_tooling/mkarchiso/build_iso.sh diff --git a/test_tooling/mkosi/README.md b/test_tooling/mkosi/README.md new file mode 100644 index 00000000..d26d0d9f --- /dev/null +++ b/test_tooling/mkosi/README.md @@ -0,0 +1,12 @@ +# To build + + mkosi build -B + +# To run + + mkosi qemu \ + --drive=archinstall_small:25G \ + -- \ + -device nvme,serial=archinstall_small,drive=archinstall_small + +*note: in order to boot the installation, we need to disable UKI being added to -kernel. I don't know of a way to do this yet, unless we tinker with mkosi/qemu.py - https://github.com/Torxed/mkosi/commit/6f3c20802bd73f88b672cc96ef0db1e542084316 - in which case we could do: `mkosi qemu --drive=archinstall_small:25G -- -device nvme,serial=archinstall_small,drive=archinstall_small,bootindex=0 -kernel none` but it still won't boot properly.* \ No newline at end of file diff --git a/archinstall/tui/ui/__init__.py b/test_tooling/mkosi/mkosi.cache/.gitkeep similarity index 100% rename from archinstall/tui/ui/__init__.py rename to test_tooling/mkosi/mkosi.cache/.gitkeep diff --git a/test_tooling/mkosi/mkosi.conf b/test_tooling/mkosi/mkosi.conf new file mode 100644 index 00000000..fdc36613 --- /dev/null +++ b/test_tooling/mkosi/mkosi.conf @@ -0,0 +1,50 @@ +[Distribution] +Distribution=arch +# LocalMirror=file:///var/lib/localmirror + +[Output] +Format=uki +# Format=disk + +[Include] +Include=mkosi-vm + +[Validation] +SecureBoot=false +SecureBootAutoEnroll=false +Sign=false +# Signing artifacts (hashsums etc) using a GPG key: +# Key=D4B58E897A929F2E +# Signing secure boot using PIV on yubikey: +# SecureBoot=true +# SecureBootKey=pkcs11: +# SecureBootCertificate=secureboot.crt + +[Content] +Packages= + pacman + archlinux-keyring + amd-ucode + intel-ucode +# tpm2-tss +# libfido2 +# libp11-kit +WithDocs=false +RootPassword=toor +Timezone=Europe/Stockholm +Keymap=sv-latin1 +InitrdProfiles=network + +[Config] +Profiles=archinstall + +[Build] +Incremental=true +ToolsTree=default +ToolsTreeProfiles=devel,misc,package-manager,runtime,gui +WithNetwork=yes + +[Runtime] +Console=gui +CPUs=4 +RAM=8G diff --git a/test_tooling/mkosi/mkosi.extra/etc/systemd/network/20-ethernet.network b/test_tooling/mkosi/mkosi.extra/etc/systemd/network/20-ethernet.network new file mode 100644 index 00000000..478a55da --- /dev/null +++ b/test_tooling/mkosi/mkosi.extra/etc/systemd/network/20-ethernet.network @@ -0,0 +1,24 @@ +[Match] +# Matching with "Type=ether" causes issues with containers because it also matches virtual Ethernet interfaces (veth*). +# See https://bugs.archlinux.org/task/70892 +# Instead match by globbing the network interface name. +Name=en* +Name=eth* + +[Link] +RequiredForOnline=routable + +[Network] +DHCP=yes +MulticastDNS=yes + +# systemd-networkd does not set per-interface-type default route metrics +# https://github.com/systemd/systemd/issues/17698 +# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband. +# Use values from NetworkManager. From nm_device_get_route_metric_default in +# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c +[DHCPv4] +RouteMetric=100 + +[IPv6AcceptRA] +RouteMetric=100 \ No newline at end of file diff --git a/test_tooling/mkosi/mkosi.extra/etc/systemd/system/getty@tty1.service.d/autologin.conf b/test_tooling/mkosi/mkosi.extra/etc/systemd/system/getty@tty1.service.d/autologin.conf new file mode 100644 index 00000000..161d4952 --- /dev/null +++ b/test_tooling/mkosi/mkosi.extra/etc/systemd/system/getty@tty1.service.d/autologin.conf @@ -0,0 +1,3 @@ +[Service] +ExecStart= +ExecStart=-/usr/bin/agetty --noreset --noclear --autologin root - ${TERM} \ No newline at end of file diff --git a/test_tooling/mkosi/mkosi.extra/root/.profile b/test_tooling/mkosi/mkosi.extra/root/.profile new file mode 100644 index 00000000..c8d1791b --- /dev/null +++ b/test_tooling/mkosi/mkosi.extra/root/.profile @@ -0,0 +1,5 @@ +cd archinstall-git +rm -rf dist + +uv build --no-build-isolation --wheel +uv pip install dist/*.whl --break-system-packages --system --no-build --no-deps \ No newline at end of file diff --git a/test_tooling/mkosi/mkosi.extra/usr/lib/systemd/system-preset/5-archinstall.preset b/test_tooling/mkosi/mkosi.extra/usr/lib/systemd/system-preset/5-archinstall.preset new file mode 100644 index 00000000..8423c627 --- /dev/null +++ b/test_tooling/mkosi/mkosi.extra/usr/lib/systemd/system-preset/5-archinstall.preset @@ -0,0 +1 @@ +enable systemd-networkd.service \ No newline at end of file diff --git a/test_tooling/mkosi/mkosi.output/.gitkeep b/test_tooling/mkosi/mkosi.output/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/test_tooling/mkosi/mkosi.postinst.chroot b/test_tooling/mkosi/mkosi.postinst.chroot new file mode 100755 index 00000000..096857e8 --- /dev/null +++ b/test_tooling/mkosi/mkosi.postinst.chroot @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +git clone https://github.com/archlinux/archinstall.git /root/archinstall-git +(cd /root/archinstall-git && git checkout master) + +# TODO: Set geo-mirrors statically instead +curl -s "https://archlinux.org/mirrorlist/?country=SE&protocol=https&use_mirror_status=on" | sed -e 's/^#Server/Server/' -e '/^#/d' | rankmirrors -n 5 - > /etc/pacman.d/mirrorlist + +pacman-key --init +pacman-key --populate archlinux \ No newline at end of file diff --git a/test_tooling/mkosi/mkosi.profiles/archinstall b/test_tooling/mkosi/mkosi.profiles/archinstall new file mode 100644 index 00000000..75628b61 --- /dev/null +++ b/test_tooling/mkosi/mkosi.profiles/archinstall @@ -0,0 +1,56 @@ +[Content] +Packages= + acpid + intel-media-driver + linux-firmware + linux-firmware-intel + ca-certificates-mozilla + ca-certificates-utils + nano + gvfs + noto-fonts + cantarell-fonts + ttf-dejavu + polkit + bash + bzip2 + coreutils + file + filesystem + findutils + gawk + gcc-libs + gettext + glibc + grep + gzip + iproute2 + iputils + licenses + pciutils + procps-ng + psmisc + sed + tar + linux + diffutils + less + strace + util-linux + xz + pacman-contrib + gcc + git + pkgconfig + python + python-pip + python-uv + python-setuptools + python-pyparted + python-pydantic + python-textual + dosfstools + btrfs-progs + arch-install-scripts +WithDocs=false +KernelCommandLine=quiet splash \ No newline at end of file diff --git a/test_tooling/mkosi/mkosi.version b/test_tooling/mkosi/mkosi.version new file mode 100644 index 00000000..ca7bf83a --- /dev/null +++ b/test_tooling/mkosi/mkosi.version @@ -0,0 +1 @@ +13 \ No newline at end of file diff --git a/test_tooling/qemu/README.md b/test_tooling/qemu/README.md new file mode 100644 index 00000000..e36ccfa1 --- /dev/null +++ b/test_tooling/qemu/README.md @@ -0,0 +1,18 @@ +# Qemu helper + +Can be used with the `mkosi` test tooling + +After `mkosi -B build` has been executed, run the following: + + python test_tooling/qemu/qemu.py \ + --uki ./test_tooling/mkosi/mkosi.output/image_13.efi \ + --harddrive ~/test.qcow2:15G \ + --harddrive ~/test_large.qcow2:25G + +And install using `archinstall`, after the machine has been shutdown, run: + + python test_tooling/qemu/qemu.py \ + --harddrive ~/test.qcow2:15G \ + --harddrive ~/test_large.qcow2:25G + +As this will boot EFI mode with just the harddrives to verify the installation. \ No newline at end of file diff --git a/test_tooling/qemu/qemu.py b/test_tooling/qemu/qemu.py new file mode 100644 index 00000000..c8307771 --- /dev/null +++ b/test_tooling/qemu/qemu.py @@ -0,0 +1,483 @@ +import getpass +import grp +import hashlib +import os +import pathlib +import re +import shlex +import shutil +import subprocess +import sys +import time +from argparse import ArgumentParser +from collections.abc import Iterator +from select import EPOLLHUP, EPOLLIN, epoll +from shutil import which +from types import TracebackType +from typing import Any, Self, override + + +class RequirementError(Exception): + pass + + +class ArgumentError(Exception): + pass + + +def get_master(interface): + master_path = pathlib.Path(f'/sys/class/net/{interface}/master') + return master_path.readlink().name if master_path.exists() else None + + +def gray(text): + return f'\033[38;5;246m{text}\033[0m' + + +def orange(text): + return f'\033[38;5;208m{text}\033[0m' + + +def red(text): + return f'\033[31m{text}\033[0m' + + +sudo_password = None # Gets populated later +harddrives = {} +username = getpass.getuser() +groupname = grp.getgrgid(os.getgid()).gr_name + +# https://stackoverflow.com/a/43627833/929999 +_VT100_ESCAPE_REGEX = r'\x1B\[[?0-9;]*[a-zA-Z]' +_VT100_ESCAPE_REGEX_BYTES = _VT100_ESCAPE_REGEX.encode() + +parser = ArgumentParser(description='A set of common parameters for the tooling', add_help=True) + +# Defaults to the order of which the harddrives are defined. +boot_option = parser.add_mutually_exclusive_group() +boot_option.add_argument('--uki', help='Boot a UKI (EFI) image') +boot_option.add_argument('--kernel', help='Boot a Linux kernel') +boot_option.add_argument('--iso', help='Boot a ISO 9660') + +networking = parser.add_argument_group('Networking', "Disables the default '-net nic -net user' network behavior of Qemu.") +networking.add_argument('--tap', nargs='?', help='Configures a TAP interface and passes it in as a virtio-net-pci.', default=None, type=str) +networking.add_argument('--tap-mac', nargs='?', help='MAC for the --tap interface', default='52:54:00:00:00:02') +networking.add_argument('--bridge', nargs='?', help='Configures a bridge, to which the --tap is added.', default=None, type=str) +networking.add_argument('--bridge-mac', nargs='?', help='MAC for the interface', default=None) +networking.add_argument('--bridge-master', nargs='?', help="Which interface to set as 'master' on the bridge.", default=None, type=str) + +hardware = parser.add_argument_group('Hardware', 'General hardware specs for the virtual machine') +# To override the use of EFI boot (will not work with --uki for obvious reasons) +hardware.add_argument('--bios', action='store_true', help='Disables EFI (edk2/ovmf) and uses BIOS support instead', default=False) +hardware.add_argument('--memory', nargs='?', help='Ammount of memory to supply the machine', default=8192) +hardware.add_argument('--harddrive', action='append', help='Sets up one or more virtio-scsi-pci, size is defined by --harddrive test.qcow2:15G', type=str) +hardware.add_argument('--cpu', help='Sets the number of cores to allocate (default nproc -1)', type=str, default=os.cpu_count() - 1 if os.cpu_count() else 1) +hardware.add_argument('--resolution', help="Sets Qemu's VGA resolution", type=str, default='1920x1107') + +kernel = parser.add_argument_group('Kernel', '--kernel specific arguments') +kernel.add_argument('--initrd', nargs='?', help='Defines which ISO to run (skips build all together)', default=None, type=pathlib.Path) + +args, unknowns = parser.parse_known_args() # pylint: disable=redefined-outer-name + +if args.bios and args.uki: + raise ArgumentError('Cannot boot a --uki image with --bios mode (at least not that I know of).') + +if args.uki is None and args.kernel is None and args.iso is None and args.harddrive is None: + raise ArgumentError('Cannot boot this machine, define at least one of: --uki, --kernel, --iso, --harddrive') + +if args.bridge is None and args.bridge_master: + raise ArgumentError('Cannot use --bridge-master without defining --bridge') + +if args.bridge is None and args.bridge_mac: + raise ArgumentError('Cannot use --bridge-mac without defining --bridge') +elif args.bridge and args.bridge_mac is None: + args.bridge_mac = '52:54:00:00:00:1' + +if args.tap and not args.bridge and get_master(args.tap) is None: + # We'll allow it, because maybe we're tesing what happens without networking, but the NIC exists. + # Or the user has some creative iptables/nftables forwarding. + print(orange('--tap does not have a master, consider adding --bridge or manual set a master using ip-link(8).')) + +if args.tap is None and args.bridge: + print(orange("--bridge* arguments will be ignored since there's no --tap defined")) +elif args.tap and args.tap_mac is None: + args.tap_mac = '52:54:00:00:00:2' + + +class SysCallError(Exception): + def __init__(self, message: str, exit_code: int | None = None, worker_log: bytes = b'') -> None: + super().__init__(message) + self.message = message + self.exit_code = exit_code + self.worker_log = worker_log + + +def clear_vt100_escape_codes(data: bytes) -> bytes: + return re.sub(_VT100_ESCAPE_REGEX_BYTES, b'', data) + + +def locate_binary(name: str) -> str: + if path := which(name): + return path + raise RequirementError(f'Binary {name} does not exist.') + + +def _pid_exists(pid: int) -> bool: + try: + return any(subprocess.check_output(['ps', '--no-headers', '-o', 'pid', '-p', str(pid)]).strip()) + except subprocess.CalledProcessError: + return False + + +class SysCommandWorker: + def __init__( + self, + cmd: str | list[str], + peek_output: bool | None = False, + environment_vars: dict[str, str] | None = None, + working_directory: str = './', + remove_vt100_escape_codes_from_lines: bool = True, + ): + if isinstance(cmd, str): + cmd = shlex.split(cmd) + + if cmd and not cmd[0].startswith(('/', './')): # Path() does not work well + cmd[0] = locate_binary(cmd[0]) + + self.cmd = cmd + self.peek_output = peek_output + # define the standard locale for command outputs. For now the C ascii one. Can be overridden + self.environment_vars = {'LC_ALL': 'C'} + if environment_vars: + self.environment_vars.update(environment_vars) + + self.working_directory = working_directory + + self.exit_code: int | None = None + self._trace_log = b'' + self._trace_log_pos = 0 + self.poll_object = epoll() + self.child_fd: int | None = None + self.started = False + self.ended = False + self.remove_vt100_escape_codes_from_lines: bool = remove_vt100_escape_codes_from_lines + + def __contains__(self, key: bytes) -> bool: + """ + Contains will also move the current buffert position forward. + This is to avoid re-checking the same data when looking for output. + """ + assert isinstance(key, bytes) + + index = self._trace_log.find(key, self._trace_log_pos) + if index >= 0: + self._trace_log_pos += index + len(key) + return True + + return False + + def __iter__(self, *args: str, **kwargs: dict[str, Any]) -> Iterator[bytes]: # pylint: disable=redefined-outer-name + last_line = self._trace_log.rfind(b'\n') + lines = filter(None, self._trace_log[self._trace_log_pos : last_line].splitlines()) + for line in lines: + if self.remove_vt100_escape_codes_from_lines: + line = clear_vt100_escape_codes(line) + + yield line + b'\n' + + self._trace_log_pos = last_line + + @override + def __repr__(self) -> str: + self.make_sure_we_are_executing() + return str(self._trace_log) + + @override + def __str__(self) -> str: + try: + return self._trace_log.decode('utf-8') + except UnicodeDecodeError: + return str(self._trace_log) + + def __enter__(self) -> Self: + return self + + def __exit__(self, exc_type: type[BaseException] | None, exc_value: BaseException | None, traceback: TracebackType | None) -> None: + # b''.join(sys_command('sync')) # No need to, since the underlying fs() object will call sync. + # TODO: https://stackoverflow.com/questions/28157929/how-to-safely-handle-an-exception-inside-a-context-manager + + if self.child_fd: + try: + os.close(self.child_fd) + except Exception: + pass + + if self.peek_output: + # To make sure any peaked output didn't leave us hanging + # on the same line we were on. + sys.stdout.write('\n') + sys.stdout.flush() + + if exc_type is not None: + print(gray(str(exc_value))) + + if self.exit_code != 0: + raise SysCallError( + f'{self.cmd} exited with abnormal exit code [{self.exit_code}]: {str(self)[-500:]}', + self.exit_code, + worker_log=self._trace_log, + ) + + def is_alive(self) -> bool: + self.poll() + + if self.started and not self.ended: + return True + + return False + + def write(self, data: bytes, line_ending: bool = True) -> int: + assert isinstance(data, bytes) # TODO: Maybe we can support str as well and encode it + + self.make_sure_we_are_executing() + + if self.child_fd: + return os.write(self.child_fd, data + (b'\n' if line_ending else b'')) + + return 0 + + def make_sure_we_are_executing(self) -> bool: + if not self.started: + return self.execute() + return True + + def tell(self) -> int: + self.make_sure_we_are_executing() + return self._trace_log_pos + + def seek(self, pos: int) -> None: + self.make_sure_we_are_executing() + # Safety check to ensure 0 < pos < len(tracelog) + self._trace_log_pos = min(max(0, pos), len(self._trace_log)) + + def peak(self, output: str | bytes) -> bool: + if self.peek_output: + if isinstance(output, bytes): + try: + output = output.decode('UTF-8') + except UnicodeDecodeError: + return False + + sys.stdout.write(output) + sys.stdout.flush() + + return True + + def poll(self) -> None: + self.make_sure_we_are_executing() + + if self.child_fd: + got_output = False + for _fileno, _event in self.poll_object.poll(0.1): + try: + output = os.read(self.child_fd, 8192) + got_output = True + self.peak(output) + self._trace_log += output + except OSError: + self.ended = True + break + + if self.ended or (not got_output and not _pid_exists(self.pid)): + self.ended = True + try: + wait_status = os.waitpid(self.pid, 0)[1] + self.exit_code = os.waitstatus_to_exitcode(wait_status) + except ChildProcessError: + try: + wait_status = os.waitpid(self.child_fd, 0)[1] + self.exit_code = os.waitstatus_to_exitcode(wait_status) + except ChildProcessError: + self.exit_code = 1 + + def execute(self) -> bool: + import pty + + if (old_dir := os.getcwd()) != self.working_directory: + os.chdir(str(self.working_directory)) + + # Note: If for any reason, we get a Python exception between here + # and until os.close(), the traceback will get locked inside + # stdout of the child_fd object. `os.read(self.child_fd, 8192)` is the + # only way to get the traceback without losing it. + + self.pid, self.child_fd = pty.fork() + + # https://stackoverflow.com/questions/4022600/python-pty-fork-how-does-it-work + if not self.pid: + try: + os.execve(self.cmd[0], list(self.cmd), {**os.environ, **self.environment_vars}) + except FileNotFoundError: + print(red(f'{self.cmd[0]} does not exist.')) + self.exit_code = 1 + return False + else: + # Only parent process moves back to the original working directory + os.chdir(old_dir) + + self.started = True + self.poll_object.register(self.child_fd, EPOLLIN | EPOLLHUP) + + return True + + def decode(self, encoding: str = 'UTF-8') -> str: + return self._trace_log.decode(encoding) + + +def ensure_sudo(): + global sudo_password # pylint: disable=global-statement + + if sudo_password is None: + if (sudo_password := getpass.getpass(f'[sudo] password for {username}: ')) == '': + raise ValueError('Certain commands need sudo to work and no sudo password was given.') + + +def setup_networking(): + if args.tap: + if pathlib.Path(f'/sys/class/net/{args.tap}').exists() is False: + print(gray(f'Creating {args.tap} for user {username} and group {groupname}')) + handle, pw_prompted = SysCommandWorker(f'sudo ip tuntap add dev {args.tap} mode tap user {username} group {groupname}'), False + while handle.is_alive(): + if b'password for' in handle and pw_prompted is False: + ensure_sudo() + handle.write(bytes(sudo_password, 'UTF-8')) + pw_prompted = True + + if args.bridge: + if pathlib.Path(f'/sys/class/net/{args.bridge}').exists() is False: + print(gray(f'Creating {args.bridge}')) + handle, pw_prompted = SysCommandWorker(f'sudo ip link add name {args.bridge} type bridge'), False + while handle.is_alive(): + if b'password for' in handle and pw_prompted is False: + ensure_sudo() + handle.write(bytes(sudo_password, 'UTF-8')) + pw_prompted = True + + if args.bridge_mac: + handle, pw_prompted = SysCommandWorker(f'sudo ip link set dev {args.bridge} address {args.bridge_mac}'), False + print(gray(f'Setting bridge {args.bridge} MAC address to {args.bridge_mac}')) + while handle.is_alive(): + if b'password for' in handle and pw_prompted is False: + ensure_sudo() + handle.write(bytes(sudo_password, 'UTF-8')) + pw_prompted = True + + if args.bridge_master and get_master(args.bridge) != args.bridge_master: + handle, pw_prompted = SysCommandWorker(f'sudo ip link set dev {args.bridge_master} master {args.bridge}'), False + print(gray(f'Setting interface {args.bridge_master} master to {args.bridge}')) + while handle.is_alive(): + if b'password for' in handle and pw_prompted is False: + ensure_sudo() + handle.write(bytes(sudo_password, 'UTF-8')) + pw_prompted = True + + print(gray(f'Setting interface {args.tap} master to {args.bridge}')) + handle, pw_prompted = SysCommandWorker(f'sudo ip link set dev {args.tap} master {args.bridge}'), False + while handle.is_alive(): + if b'password for' in handle and pw_prompted is False: + ensure_sudo() + handle.write(bytes(sudo_password, 'UTF-8')) + pw_prompted = True + + print(gray(f'Bringing up bridge {args.bridge}')) + handle, pw_prompted = SysCommandWorker(f'sudo ip link set dev {args.bridge} up'), False + while handle.is_alive(): + if b'password for' in handle and pw_prompted is False: + ensure_sudo() + handle.write(bytes(sudo_password, 'UTF-8')) + pw_prompted = True + + print(gray(f'Bringing interface {args.tap} up')) + handle, pw_prompted = SysCommandWorker(f'sudo ip link set dev {args.tap} up'), False + while handle.is_alive(): + if b'password for' in handle and pw_prompted is False: + ensure_sudo() + handle.write(bytes(sudo_password, 'UTF-8')) + pw_prompted = True + + +def setup_disks(): + if args.harddrive: + for harddrive_arg in args.harddrive: + path, size = harddrive_arg.split(':') + path = pathlib.Path(path.strip()).expanduser().resolve().absolute() + harddrives[path] = size.strip() + + if path.exists() is False: + handle = SysCommandWorker(f'qemu-img create -f qcow2 {hdd} {size}') + while handle.is_alive(): + time.sleep(0.01) + + if handle.exit_code != 0: + raise ValueError(f'Could not create harddrive {hdd}: {handle}') + + +setup_networking() +setup_disks() + +if args.uki or args.bios is False: + disk_paths_hash = hashlib.sha1((''.join(sorted([str(x) for x in harddrives.keys()]))).encode()).hexdigest() + + shutil.copy2('/usr/share/ovmf/x64/OVMF_CODE.secboot.4m.fd', f'./OVMF_CODE.secboot.4m.fd.{disk_paths_hash}') + shutil.copy2('/usr/share/ovmf/x64/OVMF_VARS.4m.fd', f'./OVMF_VARS.4m.fd.{disk_paths_hash}') + +boot_index = 0 +qemu = 'qemu-system-x86_64' +qemu += ' -cpu host' +qemu += ' -enable-kvm' +qemu += ' -machine q35,accel=kvm' +qemu += ' -object rng-random,filename=/dev/urandom,id=rng0' +qemu += ' -device virtio-rng-pci,rng=rng0' +qemu += ' -global driver=cfi.pflash01,property=secure,value=on' +qemu += f' -smp {args.cpu},sockets=1,dies=1,cores={args.cpu},threads=1' +# qemu += f' -vga vga' +qemu += f' -device VGA,edid=on,xres={args.resolution.split("x")[0]},yres={args.resolution.split("x")[1]}' +qemu += ' -device intel-iommu,device-iotlb=on,caching-mode=on' +qemu += f' -m {args.memory}' +if args.bios is False: + qemu += f' -drive if=pflash,format=raw,readonly=on,file=./OVMF_CODE.secboot.4m.fd.{disk_paths_hash}' + qemu += f' -drive if=pflash,format=raw,file=./OVMF_VARS.4m.fd.{disk_paths_hash}' +if args.uki: + qemu += f' -kernel {args.uki}' + boot_index += 1 +scsi_index = 0 +for scsi_index, hdd in enumerate(harddrives.keys()): + # qemu += f' -device virtio-scsi-pci,bus=pcie.0,id=scsi{index}' + # qemu += f' -device scsi-hd,drive=hdd{index},bus=scsi{index}.0,id=scsi{index}.0,bootindex={hdd_boot_priority+index}' + # qemu += f' -drive file={hdd},if=none,format=qcow2,discard=unmap,aio=native,cache=none,id=hdd{index}' + qemu += f' -device virtio-scsi-pci,bus=pcie.0,id=scsi{scsi_index},addr=0x{scsi_index + 8}' + qemu += f' -device scsi-hd,drive=libvirt-{scsi_index}-format,bus=scsi{scsi_index}.0,id=scsi{scsi_index}-0-0-0,channel=0,scsi-id=0,lun=0,device_id=drive-scsi0-0-0-0,bootindex={boot_index},write-cache=on' # noqa: E501 + qemu += f' -blockdev \'{{"driver":"file","filename":"{hdd}","aio":"threads","node-name":"libvirt-{scsi_index}-storage","cache":{{"direct":false,"no-flush":false}},"auto-read-only":true,"discard":"unmap"}}\'' # noqa: E501 + qemu += f' -blockdev \'{{"node-name":"libvirt-{scsi_index}-format","read-only":false,"discard":"unmap","cache":{{"direct":true,"no-flush":false}},"driver":"qcow2","file":"libvirt-{scsi_index}-storage","backing":null}}\'' # noqa: E501 + boot_index += 1 +if args.iso: + qemu += f' -device virtio-scsi-pci,bus=pcie.0,id=scsi{scsi_index + 1}' + qemu += f' -device scsi-cd,drive=cdrom0,bus=scsi{scsi_index + 1}.0,bootindex={boot_index}' + qemu += f' -drive file={args.iso},media=cdrom,if=none,format=raw,cache=none,id=cdrom0' + boot_index += 1 + +# if args.vfio: +# qemu += f' -drive file={args.vfio},index=2,media=cdrom' + +if args.tap: + qemu += f' -device virtio-net-pci,mac={args.tap_mac},id=network0,netdev=network0.0,status=on,bus=pcie.0' + qemu += f' -netdev tap,ifname={args.tap},id=network0.0,script=no,downscript=no' + +print(gray(qemu)) + +qemu_session = subprocess.run(shlex.split(qemu), check=True, capture_output=True) + +if qemu_session.stdout: + print(qemu_session.stdout.decode()) +if qemu_session.returncode != 0: + print(red(qemu_session.stderr.decode())) diff --git a/tests/test_share_log.py b/tests/test_share_log.py new file mode 100644 index 00000000..1a19ba26 --- /dev/null +++ b/tests/test_share_log.py @@ -0,0 +1,127 @@ +# pylint: disable=redefined-outer-name +import string +import urllib.error +from io import BytesIO +from pathlib import Path +from unittest.mock import patch + +import pytest +from hypothesis import HealthCheck, given, settings +from hypothesis import strategies as st + +from archinstall.lib.log import share_install_log + +urls = st.builds( + '{}://{}.{}/{}'.format, + st.sampled_from(['http', 'https']), + st.text(alphabet=string.ascii_lowercase, min_size=3, max_size=10), + st.sampled_from(['com', 'net', 'org', 'rs']), + st.text(alphabet=string.ascii_lowercase + string.digits, min_size=0, max_size=8), +) + +max_bytes = st.one_of(st.none(), st.integers(min_value=1, max_value=130)) + +random_paths = st.lists( + st.text( + alphabet=string.ascii_lowercase + string.digits, + min_size=1, + max_size=10, + ), + min_size=1, + max_size=5, +).map(lambda parts: Path(*parts)) + + +@pytest.fixture +def log_file(tmp_path: Path) -> Path: + log_dir = tmp_path / 'archinstall' + log_dir.mkdir() + return log_dir / 'install.log' + + +# def _fake_logger(log_file: Path) -> MagicMock: +# mock = MagicMock() +# mock.path = log_file +# return mock + + +@given(paste_url=urls, max_byte=max_bytes, sub_path=random_paths) +@settings(max_examples=3, suppress_health_check=[HealthCheck.function_scoped_fixture]) +def test_file_not_found( + tmp_path: Path, + sub_path: Path, + paste_url: str, + max_byte: int | None, +) -> None: + missing_log = tmp_path / sub_path / 'install.log' + + with patch('archinstall.lib.log.logger._path', new=missing_log): + assert share_install_log(paste_url, max_byte) is None + + +@given(paste_url=urls, max_byte=max_bytes) +@settings(max_examples=3, suppress_health_check=[HealthCheck.function_scoped_fixture]) +def test_empty_file(log_file: Path, paste_url: str, max_byte: int | None) -> None: + log_file.write_bytes(b'') + + with patch('archinstall.lib.log.logger._path', new=log_file.parent): + # with patch('archinstall.lib.log.logger', _fake_logger(log_file)): + assert share_install_log(paste_url, max_byte) is None + + +@given(paste_url=urls, resp_url=urls, max_byte=max_bytes) +@settings(max_examples=3, suppress_health_check=[HealthCheck.function_scoped_fixture]) +def test_successful_upload(log_file: Path, resp_url: str, paste_url: str, max_byte: int | None) -> None: + log_file.write_text('some log content') + fake_response = BytesIO(resp_url.encode()) + + with ( + patch('archinstall.lib.log.logger._path', new=log_file.parent), + patch('urllib.request.urlopen', return_value=fake_response), + ): + result = share_install_log(paste_url, max_byte) + assert result == resp_url + + +@given(paste_url=urls, resp_url=urls, max_byte=max_bytes) +@settings(max_examples=3, suppress_health_check=[HealthCheck.function_scoped_fixture]) +def test_truncation(log_file: Path, resp_url: str, paste_url: str, max_byte: int | None) -> None: + content = b'A' * 50 + b'B' * 80 + log_file.write_bytes(content) + fake_response = BytesIO(resp_url.encode()) + + exptected_byte = len(content) if max_byte is None else max_byte + + with ( + patch('archinstall.lib.log.logger._path', new=log_file.parent), + patch('urllib.request.urlopen', return_value=fake_response) as mock_open, + ): + _ = share_install_log(paste_url, max_byte) + req = mock_open.call_args[0][0] + assert len(req.data) == exptected_byte + assert req.data == content[-exptected_byte:] + + +@given(paste_url=urls, max_byte=max_bytes) +@settings(max_examples=3, suppress_health_check=[HealthCheck.function_scoped_fixture]) +def test_network_error(log_file: Path, paste_url: str, max_byte: int | None) -> None: + log_file.write_text('some log content') + + with ( + patch('archinstall.lib.log.logger._path', new=log_file.parent), + patch('urllib.request.urlopen', side_effect=urllib.error.URLError('no network')), + ): + assert share_install_log(paste_url, max_byte) is None + + +@given(paste_url=urls, max_byte=max_bytes) +@settings(max_examples=3, suppress_health_check=[HealthCheck.function_scoped_fixture]) +def test_unexpected_response(log_file: Path, paste_url: str, max_byte: int | None) -> None: + log_file.write_text('some log content') + fake_response = BytesIO(b'ERROR: something went wrong') + + with ( + patch('archinstall.lib.log.logger._path', new=log_file.parent), + patch('urllib.request.urlopen', return_value=fake_response), + ): + assert share_install_log(paste_url, max_byte) is None