config: Fix offer_disk_encryption legacy handling

This fixes a focus issue when navigating back and forth from language page.

README.md

@@ -12,7 +12,7 @@ Help with translations is always welcome! The simplest way is via [__Weblate__](
 Alternatively you could try the autonomous way:
 * Fork, clone and build this repository.
 * Add your [language code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) `xx` to the `po/LINGUAS` file.
-* Generate a new translation file with `ninja -C build os-installer-update-po` and [edit it](https://gitlab.gnome.org/GNOME/gtranslator/).
+* Generate a new translation file with `ninja -C build os-installer-update-po` and [edit it](https://flathub.org/apps/org.gnome.Gtranslator).
 * Test the translation, commit and push the changes to your fork and create a merge request. Thank you!
 
 # Testing

data/resources/ui/pages/summary.blp

@@ -83,6 +83,7 @@ template $SummaryPage : Box {
     }
 
     Adw.ActionRow software_row {
+      margin-top: 6;
       name: "software";
       activatable: true;
 
@@ -100,6 +101,7 @@ template $SummaryPage : Box {
         }
 
         Stack software_stack {
+          margin-bottom: 6;
           vhomogeneous: false;
           transition-type: crossfade;
 
@@ -137,6 +139,7 @@ template $SummaryPage : Box {
 
       [prefix]
       Box {
+        margin-top: 6;
         orientation: vertical;
         halign: start;
         spacing: 3;
@@ -150,6 +153,7 @@ template $SummaryPage : Box {
 
 
         Stack feature_stack {
+          margin-bottom: 6;
           vhomogeneous: false;
           transition-type: crossfade;
 

po/LINGUAS

@@ -20,3 +20,4 @@ ur
 ar
 da
 vi
+fa

po/de.po

@@ -10,15 +10,15 @@ msgstr ""
 "Project-Id-Version: os-installer\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-10-16 14:26-0400\n"
-"PO-Revision-Date: 2024-10-16 18:27+0000\n"
+"PO-Revision-Date: 2024-11-10 05:00+0000\n"
-"Last-Translator: Prefill add-on <noreply-addon-prefill@weblate.org>\n"
+"Last-Translator: Peter Eisenmann <p3732@disroot.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8-rc\n"
+"X-Generator: Weblate 5.8.2\n"
 
 msgid "OS-Installer"
 msgstr "OS-Installer"
@@ -59,9 +59,8 @@ msgid "_Confirm"
 msgstr "_Bestätigen"
 
 #. Translators: On button, brackets will be replaced with desktop name.
-#, fuzzy
 msgid "_Use {}"
-msgstr "_Use {}"
+msgstr "_Nutze {}"
 
 #. Translators: Button label to open disk management tool.
 msgid "_Manage Disks"
@@ -100,9 +99,8 @@ msgid "Encryption PIN"
 msgstr "Verschlüsselungs-PIN"
 
 #. Translators: Disk encryption pin confirmation entry field
-#, fuzzy
 msgid "Confirm PIN"
-msgstr "_Bestätigen"
+msgstr "PIN bestätigen"
 
 #. Translators: Hint for disk encryption
 msgid ""
@@ -126,17 +124,15 @@ msgstr "Keine Ergebnisse"
 msgid "Try a different search"
 msgstr "Versuchen Sie eine andere Suche"
 
-#, fuzzy
 msgid "No connection detected"
-msgstr "Keine Verbindung."
+msgstr "Keine Verbindung erkannt."
 
 #. Translators: On button for opening wifi settings.
 msgid "_Open Settings"
 msgstr "_Einstellungen öffnen"
 
-#, fuzzy
 msgid "Connection detected"
-msgstr "Connection detected"
+msgstr "Verbindung erkannt"
 
 #. selectable: false;
 #. Translators: Followed by a language name.
@@ -194,19 +190,18 @@ msgid "  • BIOS boot partition"
 msgstr "  • BIOS Boot-Partition"
 
 #. Translators: Title of a hint page
-#, fuzzy
 msgid "Disk Not Found"
-msgstr "Disk Not Found"
+msgstr "Laufwerk nicht gefunden"
 
 #. Translators: Body of a hint page
-#, fuzzy
 msgid "Assure that the disk is still avaliable and has not been removed."
-msgstr "Assure that the disk is still avaliable and has not been removed."
+msgstr ""
+"Stellen Sie sicher, dass das Laufwerk noch verfügbar ist und nicht entfernt "
+"wurde."
 
 #. Translators: On button.
-#, fuzzy
 msgid "_Return to Disk List"
-msgstr "_Return to Disk List"
+msgstr "_Zurück zur Laufwerksauswahl"
 
 #. Translators: Description of selected language.
 msgid "Language"
@@ -246,9 +241,8 @@ msgid "_Name"
 msgstr "_Name"
 
 #. Translators: Used with entry field for linux username
-#, fuzzy
 msgid "_Username"
-msgstr "User"
+msgstr "Nutzername"
 
 #. Translators: Used with option to enable automatic login of user upon booting
 msgid "Automatic Login"
@@ -259,9 +253,8 @@ msgid "_Password"
 msgstr "_Passwort"
 
 #. Translators: Used password confirmation entry field
-#, fuzzy
 msgid "_Confirm Password"
-msgstr "_Passwort"
+msgstr "_Passwort Bestätigen"
 
 #. Translators: Default welcome text. Squiggly brackets are replaced by distribution name.
 msgid ""
@@ -284,9 +277,8 @@ msgid "Confirmation"
 msgstr "Bestätigung"
 
 #. Translators: Page title
-#, fuzzy
 msgid "Desktop Selection"
-msgstr "Laufwerksauswahl"
+msgstr "Desktop-Auswahl"
 
 #. Translators: Page title
 msgid "Disk Selection"
@@ -341,9 +333,8 @@ msgid "Welcome"
 msgstr "Willkommen"
 
 #. Translators: Notification text
-#, fuzzy
 msgid "Finished Installation"
-msgstr "Installation _fortsetzen"
+msgstr "Installation beendet"
 
 #, fuzzy
 #~ msgid "Disk"

po/et.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: os-installer\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-10-16 14:26-0400\n"
-"PO-Revision-Date: 2024-10-16 18:27+0000\n"
+"PO-Revision-Date: 2024-11-12 23:05+0000\n"
-"Last-Translator: Prefill add-on <noreply-addon-prefill@weblate.org>\n"
+"Last-Translator: Priit Jõerüüt <hwlate@joeruut.com>\n"
 "Language-Team: Estonian <https://hosted.weblate.org/projects/os-installer/"
 "os-installer/et/>\n"
 "Language: et\n"
@@ -17,18 +17,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8-rc\n"
+"X-Generator: Weblate 5.9-dev\n"
 
 msgid "OS-Installer"
 msgstr "OS-Installer"
 
 msgid "Install an Operating System"
-msgstr "Paigaldage opsüsteemi"
+msgstr "Paigalda opsüsteem"
 
 #. Translators: Dialog title
-#, fuzzy
 msgid "Installation Running"
-msgstr "Paigaldamine ebaõnnestus"
+msgstr "Paigaldamine on käimas"
 
 #. Translators: Text in dialog shown if user wants to close app with installation running
 msgid ""
@@ -52,37 +51,35 @@ msgstr "_Jätka"
 
 #. Translators: Followed by a disk or partition name
 msgid "This will delete all data on"
-msgstr "See kustutab kõik andmed"
+msgstr "Järgnevaga kustutame siin kõik andmed"
 
 #. Translators: On button.
 msgid "_Confirm"
 msgstr "_Kinnita"
 
 #. Translators: On button, brackets will be replaced with desktop name.
-#, fuzzy
 msgid "_Use {}"
-msgstr "_Use {}"
+msgstr "Kas_uta {}"
 
 #. Translators: Button label to open disk management tool.
 msgid "_Manage Disks"
-msgstr "_Ketaste haldamine"
+msgstr "_Halda kettaid"
 
 #. Translators: Title of a hint page
 msgid "No Disks avaliable"
-msgstr "Ühtegi ketast ei ole saadaval"
+msgstr "Ühtegi ketast ei leidu"
 
 #. Translators: Body of a hint page
 msgid "Connect a disk and reload this page."
-msgstr "Ühenda ketas ja värskenda see lehekülg."
+msgstr "Ühenda ketas ja laadi see leht uuesti."
 
 #. Translators: On button.
-#, fuzzy
 msgid "_Reload"
-msgstr "_Reload"
+msgstr "_Laadi uuesti"
 
 #. Translators: Button label to restart system directly after successful installation. Underscore can not be for same letter as 'Restart Later'.
 msgid "_Restart System"
-msgstr "_Taaskäivita süsteem"
+msgstr "_Taaskäivita arvuti"
 
 #. Translators: Button label to delay restart after successful installation. Underscore can not be for same letter as 'Restart System'.
 msgid "Restart _Later"
@@ -94,16 +91,15 @@ msgstr "Näita terminali väljundit"
 
 #. Translators: Used with option to enable disk encryption
 msgid "Encrypt Files"
-msgstr "Failide krüpteerimine"
+msgstr "Krüpti failid"
 
 #. Translators: Disk encryption pin confirmation entry field
 msgid "Encryption PIN"
-msgstr "Krüpteerimise PIN-kood"
+msgstr "Krüptimise PIN-kood"
 
 #. Translators: Disk encryption pin confirmation entry field
-#, fuzzy
 msgid "Confirm PIN"
-msgstr "_Kinnita"
+msgstr "Kinnita PIN-kood"
 
 #. Translators: Hint for disk encryption
 msgid ""
@@ -115,31 +111,26 @@ msgstr ""
 msgid "Search for Help on the Internet"
 msgstr "Otsi abi internetist"
 
-#, fuzzy
 msgid "Filter"
 msgstr "Filter"
 
 #. Translators: Empty result placeholder title
-#, fuzzy
 msgid "No Results"
-msgstr "No Results"
+msgstr "Tulemused puuduvad"
 
 #. Translators: Empty result placeholder, meant as a suggestion
-#, fuzzy
 msgid "Try a different search"
-msgstr "Try a different search"
+msgstr "Proovi teistsugust otsingut"
 
-#, fuzzy
 msgid "No connection detected"
-msgstr "Ei ole võrguga ühendatud."
+msgstr "Võrguühendust ei õnnestunud tuvastada"
 
 #. Translators: On button for opening wifi settings.
 msgid "_Open Settings"
 msgstr "_Ava sätted"
 
-#, fuzzy
 msgid "Connection detected"
-msgstr "Connection detected"
+msgstr "Võrguühendus on tuvastatud"
 
 #. selectable: false;
 #. Translators: Followed by a language name.
@@ -149,7 +140,7 @@ msgstr "Sisestuskeel"
 
 #. Translators: Used as placeholder in a entry field to try out a keyboard layout
 msgid "Test the Keyboard Layout Here"
-msgstr "Testi klaviatuuri siin"
+msgstr "Testi klaviatuuri paigutust siin"
 
 #. Translators: Presented next to the current Timezone.
 #. Translators: Description of selected timezone.
@@ -173,9 +164,8 @@ msgstr "Kasuta tervet ketast"
 msgid "Partitions"
 msgstr "Partitsioonid"
 
-#, fuzzy
 msgid "Disk has no partitions."
-msgstr "Disk has no partitions."
+msgstr "Kettal ei ole partitsioone."
 
 #. Translators: Shown if a disk is currently not compatible with the way a system was booted.
 msgid "Selecting a partition is not possible."
@@ -198,30 +188,25 @@ msgid "  • BIOS boot partition"
 msgstr "  • BIOS boot partitsiooni"
 
 #. Translators: Title of a hint page
-#, fuzzy
 msgid "Disk Not Found"
-msgstr "Disk Not Found"
+msgstr "Ketast ei leidu"
 
 #. Translators: Body of a hint page
-#, fuzzy
 msgid "Assure that the disk is still avaliable and has not been removed."
-msgstr "Assure that the disk is still avaliable and has not been removed."
+msgstr "Palun kontrolli, et ketas on jätkuvalt olemas, ega pole eemaldatud."
 
 #. Translators: On button.
-#, fuzzy
 msgid "_Return to Disk List"
-msgstr "_Return to Disk List"
+msgstr "_Tagasi ketaste loendisse"
 
 #. Translators: Description of selected language.
-#, fuzzy
 msgid "Language"
-msgstr "Sisestuskeel"
+msgstr "Keel"
 
 #. Translators: Description of selected keyboard layout.
 #. Translators: Page title
-#, fuzzy
 msgid "Keyboard Layout"
-msgstr "Klaviatuuri paigutuse valik"
+msgstr "Klaviatuuri paigutus"
 
 #. Translators: Description of defined user account name and autologin status.
 #. Translators: Page title
@@ -229,9 +214,8 @@ msgid "User Account"
 msgstr "Kasutajakonto"
 
 #. Translators: Gets shown when autologin is enabled.
-#, fuzzy
 msgid "(Automatic Login)"
-msgstr "Automaatne sisselogimine"
+msgstr "(Automaatne sisselogimine)"
 
 #. Translators: Description of selected additional software.
 #. Translators: Page title
@@ -240,45 +224,39 @@ msgstr "Lisa tarkvara"
 
 #. Translators: Shown when list of selected software is empty.
 #. Translators: Shown when list of selected features is empty.
-#, fuzzy
 msgid "None"
-msgstr "None"
+msgstr "Puudub"
 
 #. Translators: Description of selected additional software.
 #. Translators: Page title
-#, fuzzy
 msgid "Additional Features"
-msgstr "Lisa tarkvara"
+msgstr "Lisatarkvara"
 
 #. Translators: Used with entry field for User's name
-#, fuzzy
 msgid "_Name"
-msgstr "Nimi"
+msgstr "_Nimi"
 
 #. Translators: Used with entry field for linux username
-#, fuzzy
 msgid "_Username"
-msgstr "User"
+msgstr "Kas_utajanimi"
 
 #. Translators: Used with option to enable automatic login of user upon booting
 msgid "Automatic Login"
-msgstr "Automaatne sisselogimine"
+msgstr "Logi sisse automaatselt"
 
 #. Translators: User password entry field
-#, fuzzy
 msgid "_Password"
-msgstr "Parool"
+msgstr "_Salasõna"
 
 #. Translators: Used password confirmation entry field
-#, fuzzy
 msgid "_Confirm Password"
-msgstr "Parool"
+msgstr "_Kinnita salasõna"
 
 #. Translators: Default welcome text. Squiggly brackets are replaced by distribution name.
 msgid ""
 "This application will guide you through the installation of {} onto your "
 "system."
-msgstr "See rakendus juhendab teid läbi {} paigaldamise."
+msgstr "See rakendus juhendab sind läbi {} paigaldamise."
 
 #. Translators: Fallback name for partitions that don't have a name.
 msgid "Unnamed Partition"
@@ -286,18 +264,16 @@ msgstr "Nimetu partitsioon"
 
 #. Translators: Shown for partitions that are not big enough to be installed on.
 #. * "{}" is replaced by a disk size value, e.g. "21.3 GB".
-#, fuzzy
 msgid "Not enough space for installation ({} required)"
-msgstr "Paigaldamiseks ei ole piisavalt ruumi"
+msgstr "Paigaldamiseks ei ole piisavalt ruumi (vajalik on {})"
 
 #. Translators: Page title
 msgid "Confirmation"
 msgstr "Kinnitus"
 
 #. Translators: Page title
-#, fuzzy
 msgid "Desktop Selection"
-msgstr "Ketta valik"
+msgstr "Töölaua valik"
 
 #. Translators: Page title
 msgid "Disk Selection"
@@ -305,15 +281,15 @@ msgstr "Ketta valik"
 
 #. Translators: Page title
 msgid "Installation Complete"
-msgstr "Paigaldamine lõpetatud"
+msgstr "Paigaldamine lõppenud"
 
 #. Translators: Page title
 msgid "Disk Encryption"
-msgstr "Ketta krüpteerimine"
+msgstr "Ketta krüptimine"
 
 #. Translators: Page title
 msgid "Installation Failed"
-msgstr "Paigaldamine ebaõnnestus"
+msgstr "Paigaldamine ei õnnestunud"
 
 #. Translators: Page title
 msgid "Select Region"
@@ -333,16 +309,15 @@ msgstr "Klaviatuuri paigutuse valik"
 
 #. Translators: Page title
 msgid "Adapt to Location"
-msgstr "Asukoha sätted"
+msgstr "Asukoha valikud"
 
 #. Translators: Page title
 msgid "Restarting"
 msgstr "Taaskäivitamine"
 
 #. Translators: Page title
-#, fuzzy
 msgid "Summary"
-msgstr "Summary"
+msgstr "Kokkuvõte"
 
 #. Translators: Page title
 msgid "Select Location"
@@ -353,9 +328,8 @@ msgid "Welcome"
 msgstr "Tere tulemast"
 
 #. Translators: Notification text
-#, fuzzy
 msgid "Finished Installation"
-msgstr "_Jätka paigaldamist"
+msgstr "Paigaldamine on lõppenud"
 
 #, fuzzy
 #~ msgid "Disk"

po/fa.po

@@ -0,0 +1,411 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the os-installer package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: os-installer\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-10-16 14:26-0400\n"
+"PO-Revision-Date: 2024-11-24 14:00+0000\n"
+"Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>\n"
+"Language-Team: none\n"
+"Language: fa\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 5.9-dev\n"
+
+#: data/com.github.p3732.OS-Installer.desktop.in
+msgid "OS-Installer"
+msgstr "نصب کنندهٔ سیستم‌عامل"
+
+#: data/com.github.p3732.OS-Installer.desktop.in
+#: data/com.github.p3732.OS-Installer.appdata.xml.in
+msgid "Install an Operating System"
+msgstr "نصب سیستم‌عامل"
+
+#. Translators: Dialog title
+#: data/resources/ui/confirm_quit_dialog.blp
+msgid "Installation Running"
+msgstr "اجرا شدن نصب"
+
+#. Translators: Text in dialog shown if user wants to close app with installation running
+#: data/resources/ui/confirm_quit_dialog.blp
+msgid ""
+"Stopping a running installation will leave the disk in an undefined state "
+"that might potentially be harmful"
+msgstr ""
+"توقّف نصب در حال انجام، دیسک را در وضعیتی تعریف نشده قرار داده و می‌تواند آسیب‌"
+"زا باشد"
+
+#. Translators: Underscore can not be the same as for 'Stop Installation'.
+#: data/resources/ui/confirm_quit_dialog.blp
+msgid "_Continue Installation"
+msgstr "_ادامهٔ نصب"
+
+#. Translators: Underscore can not be the same as for 'Continue Installation'.
+#: data/resources/ui/confirm_quit_dialog.blp
+msgid "_Stop Installation"
+msgstr "_توقّف نصب"
+
+#. Translators: On button.
+#: data/resources/ui/pages/choices.blp data/resources/ui/pages/encrypt.blp
+#: data/resources/ui/pages/internet.blp
+#: data/resources/ui/pages/keyboard_overview.blp
+#: data/resources/ui/pages/locale.blp data/resources/ui/pages/user.blp
+#: data/resources/ui/pages/welcome.blp
+msgid "_Continue"
+msgstr "_ادامه‌"
+
+#. Translators: Followed by a disk or partition name
+#: data/resources/ui/pages/confirm.blp
+msgid "This will delete all data on"
+msgstr "این کار همهٔ داده‌های دیسک یا افراز زیر را حذف خواهد کرد"
+
+#. Translators: On button.
+#: data/resources/ui/pages/confirm.blp data/resources/ui/pages/summary.blp
+msgid "_Confirm"
+msgstr "_تأیید"
+
+#. Translators: On button, brackets will be replaced with desktop name.
+#: data/resources/ui/pages/desktop.blp
+msgid "_Use {}"
+msgstr "_استفاده از {}"
+
+#. Translators: Button label to open disk management tool.
+#: data/resources/ui/pages/disk.blp
+msgid "_Manage Disks"
+msgstr "_مدیریت دیسک‌ه"
+
+#. Translators: Title of a hint page
+#: data/resources/ui/pages/disk.blp
+msgid "No Disks avaliable"
+msgstr "هیچ دیسکی موجود نیست"
+
+#. Translators: Body of a hint page
+#: data/resources/ui/pages/disk.blp
+msgid "Connect a disk and reload this page."
+msgstr "وصل کردن دیسک و بازخوانی این صفحه."
+
+#. Translators: On button.
+#: data/resources/ui/pages/disk.blp
+msgid "_Reload"
+msgstr "_‌بازخوانی"
+
+#. Translators: Button label to restart system directly after successful installation. Underscore can not be for same letter as 'Restart Later'.
+#: data/resources/ui/pages/done.blp
+msgid "_Restart System"
+msgstr "_آغاز دوبارهٔ سامانه"
+
+#. Translators: Button label to delay restart after successful installation. Underscore can not be for same letter as 'Restart System'.
+#: data/resources/ui/pages/done.blp
+msgid "Restart _Later"
+msgstr "_بعداً دوباره آغاز شود"
+
+#. Translators: Hover information on toggle button that shows terminal output during installation.
+#: data/resources/ui/pages/done.blp data/resources/ui/pages/install.blp
+msgid "Show Terminal Output"
+msgstr "نمایش خروجی پایانه"
+
+#. Translators: Used with option to enable disk encryption
+#: data/resources/ui/pages/encrypt.blp
+msgid "Encrypt Files"
+msgstr "رمزنگاری پرونده‌ها"
+
+#. Translators: Disk encryption pin confirmation entry field
+#: data/resources/ui/pages/encrypt.blp
+msgid "Encryption PIN"
+msgstr "پین رمزنگاری"
+
+#. Translators: Disk encryption pin confirmation entry field
+#: data/resources/ui/pages/encrypt.blp
+msgid "Confirm PIN"
+msgstr "تأیید پین"
+
+#. Translators: Hint for disk encryption
+#: data/resources/ui/pages/encrypt.blp
+msgid ""
+"Memorize this PIN well. Without it you will not be able to access your files."
+msgstr ""
+"این پین را خوب به خاطر بسپارید. بدون آن قادر به دسترسی به پرونده‌هایتان "
+"نخواهید بود."
+
+#. Translators: Shown if installation fails.
+#: data/resources/ui/pages/failed.blp
+msgid "Search for Help on the Internet"
+msgstr "جست‌وجوی راهنمایی روی اینترنت"
+
+#: data/resources/ui/pages/filter.blp
+msgid "Filter"
+msgstr "پالایش"
+
+#. Translators: Empty result placeholder title
+#: data/resources/ui/pages/filter.blp
+msgid "No Results"
+msgstr "بدون نتیجه"
+
+#. Translators: Empty result placeholder, meant as a suggestion
+#: data/resources/ui/pages/filter.blp
+msgid "Try a different search"
+msgstr "جست‌وجویی دیگر را بیازمایید"
+
+#: data/resources/ui/pages/internet.blp
+msgid "No connection detected"
+msgstr "اتّصالی تشخیص داده نشد"
+
+#. Translators: On button for opening wifi settings.
+#: data/resources/ui/pages/internet.blp
+msgid "_Open Settings"
+msgstr "_گشودن تنظیمات"
+
+#: data/resources/ui/pages/internet.blp
+msgid "Connection detected"
+msgstr "اتّصال تشخیص داده شد"
+
+#. selectable: false;
+#. Translators: Followed by a language name.
+#. Translators: Page title
+#: data/resources/ui/pages/keyboard_layout.blp src/ui/page_wrapper.py
+msgid "Keyboard Language"
+msgstr "زبان صفحه‌کلید"
+
+#. Translators: Used as placeholder in a entry field to try out a keyboard layout
+#: data/resources/ui/pages/keyboard_overview.blp
+msgid "Test the Keyboard Layout Here"
+msgstr "آزمایش چیدمان صفحه‌کلید در این‌جا"
+
+#. Translators: Presented next to the current Timezone.
+#. Translators: Description of selected timezone.
+#: data/resources/ui/pages/locale.blp data/resources/ui/pages/summary.blp
+msgid "Timezone"
+msgstr "منطقهٔ زمانی"
+
+#. Translators: Presented next to the current Formats.
+#. Translators: Description of selected format.
+#: data/resources/ui/pages/locale.blp data/resources/ui/pages/summary.blp
+msgid "Formats"
+msgstr "قالب‌ها"
+
+#. Translators: Description of what is covered by formats.
+#: data/resources/ui/pages/locale.blp
+msgid "Defines the default format used for dates, times, numbers, etc."
+msgstr "قالب پیش‌گزیده برای تاریخ، زبان، اعداد و… را تعریف می‌کند."
+
+#. Translators: Label to use whole disk rather than a single partition.
+#: data/resources/ui/pages/partition.blp
+msgid "Use Whole Disk"
+msgstr "استفاده از کل دیسک"
+
+#. Translators: Heading of list of partitions
+#: data/resources/ui/pages/partition.blp
+msgid "Partitions"
+msgstr "افرازها"
+
+#: data/resources/ui/pages/partition.blp
+msgid "Disk has no partitions."
+msgstr "دیسک هیچ افرازی ندارد."
+
+#. Translators: Shown if a disk is currently not compatible with the way a system was booted.
+#: data/resources/ui/pages/partition.blp
+msgid "Selecting a partition is not possible."
+msgstr "گزینش افراز ممکن نیست."
+
+#. Translators: Followed by a list of requirements
+#: data/resources/ui/pages/partition.blp
+msgid "The disk requires:"
+msgstr "نیازمندی‌های دیسک:"
+
+#. Translators: Bullet point listing.
+#: data/resources/ui/pages/partition.blp
+msgid ""
+"  • GPT partitioning\n"
+"  • EFI partition"
+msgstr ""
+"  • افرازش GPT\n"
+"  • افراز EFI"
+
+#. Translators: Bullet point listing.
+#: data/resources/ui/pages/partition.blp
+msgid "  • BIOS boot partition"
+msgstr "  • افراز راه‌اندازی بایوس"
+
+#. Translators: Title of a hint page
+#: data/resources/ui/pages/partition.blp
+msgid "Disk Not Found"
+msgstr "دیسک پیدا نشد"
+
+#. Translators: Body of a hint page
+#: data/resources/ui/pages/partition.blp
+msgid "Assure that the disk is still avaliable and has not been removed."
+msgstr "اطمینان از موجود بودن و برداشته نشدن دیسک."
+
+#. Translators: On button.
+#: data/resources/ui/pages/partition.blp
+msgid "_Return to Disk List"
+msgstr "_بازگشت به سیاههٔ‌دیسک‌ها"
+
+#. Translators: Description of selected language.
+#: data/resources/ui/pages/summary.blp
+msgid "Language"
+msgstr "زبان"
+
+#. Translators: Description of selected keyboard layout.
+#. Translators: Page title
+#: data/resources/ui/pages/summary.blp src/ui/page_wrapper.py
+msgid "Keyboard Layout"
+msgstr "چیدمان صفحه‌کلید"
+
+#. Translators: Description of defined user account name and autologin status.
+#. Translators: Page title
+#: data/resources/ui/pages/summary.blp src/ui/page_wrapper.py
+msgid "User Account"
+msgstr "حساب کاربری"
+
+#. Translators: Gets shown when autologin is enabled.
+#: data/resources/ui/pages/summary.blp
+msgid "(Automatic Login)"
+msgstr "(ورود خودکار)"
+
+#. Translators: Description of selected additional software.
+#. Translators: Page title
+#: data/resources/ui/pages/summary.blp src/ui/page_wrapper.py
+msgid "Additional Software"
+msgstr "نرم‌افزارهای اضافی"
+
+#. Translators: Shown when list of selected software is empty.
+#. Translators: Shown when list of selected features is empty.
+#: data/resources/ui/pages/summary.blp
+msgid "None"
+msgstr "هیچ‌کدام"
+
+#. Translators: Description of selected additional software.
+#. Translators: Page title
+#: data/resources/ui/pages/summary.blp src/ui/page_wrapper.py
+msgid "Additional Features"
+msgstr "ویژگی‌های اضافی"
+
+#. Translators: Used with entry field for User's name
+#: data/resources/ui/pages/user.blp
+msgid "_Name"
+msgstr "_نام"
+
+#. Translators: Used with entry field for linux username
+#: data/resources/ui/pages/user.blp
+msgid "_Username"
+msgstr "_نام کاربری"
+
+#. Translators: Used with option to enable automatic login of user upon booting
+#: data/resources/ui/pages/user.blp
+msgid "Automatic Login"
+msgstr "ورود خودکار"
+
+#. Translators: User password entry field
+#: data/resources/ui/pages/user.blp
+msgid "_Password"
+msgstr "_گذر‌واژه"
+
+#. Translators: Used password confirmation entry field
+#: data/resources/ui/pages/user.blp
+msgid "_Confirm Password"
+msgstr "تأیید _گذرواژه"
+
+#. Translators: Default welcome text. Squiggly brackets are replaced by distribution name.
+#: data/resources/ui/pages/welcome.blp
+msgid ""
+"This application will guide you through the installation of {} onto your "
+"system."
+msgstr "این برنامه در طول نصب {} روی سامانه راهنماییتان خواهد کرد."
+
+#. Translators: Fallback name for partitions that don't have a name.
+#: data/resources/ui/widgets/device_row.blp
+msgid "Unnamed Partition"
+msgstr "افراز بی‌نام"
+
+#. Translators: Shown for partitions that are not big enough to be installed on.
+#. * "{}" is replaced by a disk size value, e.g. "21.3 GB".
+#: data/resources/ui/widgets/device_row.blp
+msgid "Not enough space for installation ({} required)"
+msgstr "بدون فضای کافی برای نصب ({} لازم)"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Confirmation"
+msgstr "تایید"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Desktop Selection"
+msgstr "گزینش میزکار"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Disk Selection"
+msgstr "گزینش دیسک"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Installation Complete"
+msgstr "نصب کامل شد"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Disk Encryption"
+msgstr "رمزنگاری دیسک"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Installation Failed"
+msgstr "نصب شکست خورد"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Select Region"
+msgstr "گزینش ناحیه"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Installing"
+msgstr "نصب کردن"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Internet Connection Check"
+msgstr "بررسی اتّصال اینترنتی"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Keyboard Layout Selection"
+msgstr "گزینش چیدمان صفحه‌کلید"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Adapt to Location"
+msgstr "سازگاری با مکان"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Restarting"
+msgstr "راه انداختن دوباره"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Summary"
+msgstr "خلاصه"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Select Location"
+msgstr "گزینش مکان"
+
+#. Translators: Page title
+#: src/ui/page_wrapper.py
+msgid "Welcome"
+msgstr "خوش آمدید"
+
+#. Translators: Notification text
+#: src/util/installation_scripting.py
+msgid "Finished Installation"
+msgstr "نصب پایان یافت"

po/pt.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: os-installer\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-10-16 14:26-0400\n"
-"PO-Revision-Date: 2024-10-16 18:27+0000\n"
+"PO-Revision-Date: 2024-11-21 23:42+0000\n"
-"Last-Translator: Prefill add-on <noreply-addon-prefill@weblate.org>\n"
+"Last-Translator: Gabriel Elyas <gabrielelyas@protonmail.com>\n"
 "Language-Team: none\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.8-rc\n"
+"X-Generator: Weblate 5.9-dev\n"
 
 msgid "OS-Installer"
 msgstr "Instalador de SO"
@@ -25,9 +25,8 @@ msgid "Install an Operating System"
 msgstr "Instale um Sistema Operacional"
 
 #. Translators: Dialog title
-#, fuzzy
 msgid "Installation Running"
-msgstr "Instalação Falhada"
+msgstr "Instalação em execução"
 
 #. Translators: Text in dialog shown if user wants to close app with installation running
 msgid ""
@@ -58,7 +57,6 @@ msgid "_Confirm"
 msgstr "_Confirmar"
 
 #. Translators: On button, brackets will be replaced with desktop name.
-#, fuzzy
 msgid "_Use {}"
 msgstr "_Use {}"
 
@@ -75,9 +73,8 @@ msgid "Connect a disk and reload this page."
 msgstr "Conecte um disco e recarregue essa página."
 
 #. Translators: On button.
-#, fuzzy
 msgid "_Reload"
-msgstr "_Reload"
+msgstr "_Recarregar"
 
 #. Translators: Button label to restart system directly after successful installation. Underscore can not be for same letter as 'Restart Later'.
 msgid "_Restart System"
@@ -100,9 +97,8 @@ msgid "Encryption PIN"
 msgstr "Palavra-passe de criptografia"
 
 #. Translators: Disk encryption pin confirmation entry field
-#, fuzzy
 msgid "Confirm PIN"
-msgstr "_Confirmar"
+msgstr "Confirmar PIN"
 
 #. Translators: Hint for disk encryption
 msgid ""
@@ -126,17 +122,15 @@ msgstr "Nenhum resultado"
 msgid "Try a different search"
 msgstr "Tente uma pesquisa diferente"
 
-#, fuzzy
 msgid "No connection detected"
-msgstr "Nenhuma conexão."
+msgstr "Nenhuma conexão detectada"
 
 #. Translators: On button for opening wifi settings.
 msgid "_Open Settings"
 msgstr "_Abrir Configurações"
 
-#, fuzzy
 msgid "Connection detected"
-msgstr "Connection detected"
+msgstr "Conexão detectada"
 
 #. selectable: false;
 #. Translators: Followed by a language name.
@@ -194,19 +188,18 @@ msgid "  • BIOS boot partition"
 msgstr "  • Partição de boot BIOS"
 
 #. Translators: Title of a hint page
-#, fuzzy
 msgid "Disk Not Found"
-msgstr "Disk Not Found"
+msgstr "Disco não encontrado"
 
 #. Translators: Body of a hint page
-#, fuzzy
 msgid "Assure that the disk is still avaliable and has not been removed."
-msgstr "Assure that the disk is still avaliable and has not been removed."
+msgstr ""
+"Certifique-se de que o disco ainda esteja disponível e não tenha sido "
+"removido."
 
 #. Translators: On button.
-#, fuzzy
 msgid "_Return to Disk List"
-msgstr "_Return to Disk List"
+msgstr "_Retornar à lista de discos"
 
 #. Translators: Description of selected language.
 msgid "Language"
@@ -223,9 +216,8 @@ msgid "User Account"
 msgstr "Conta do utilizador"
 
 #. Translators: Gets shown when autologin is enabled.
-#, fuzzy
 msgid "(Automatic Login)"
-msgstr "Login automático"
+msgstr "(Login automático)"
 
 #. Translators: Description of selected additional software.
 #. Translators: Page title
@@ -247,9 +239,8 @@ msgid "_Name"
 msgstr "_Nome"
 
 #. Translators: Used with entry field for linux username
-#, fuzzy
 msgid "_Username"
-msgstr "User"
+msgstr "_Nome do Usuário"
 
 #. Translators: Used with option to enable automatic login of user upon booting
 msgid "Automatic Login"
@@ -260,9 +251,8 @@ msgid "_Password"
 msgstr "_Senha"
 
 #. Translators: Used password confirmation entry field
-#, fuzzy
 msgid "_Confirm Password"
-msgstr "_Senha"
+msgstr "_Confime a senha"
 
 #. Translators: Default welcome text. Squiggly brackets are replaced by distribution name.
 msgid ""
@@ -276,18 +266,16 @@ msgstr "Partição sem nome"
 
 #. Translators: Shown for partitions that are not big enough to be installed on.
 #. * "{}" is replaced by a disk size value, e.g. "21.3 GB".
-#, fuzzy
 msgid "Not enough space for installation ({} required)"
-msgstr "Não há espaço suficiente para a instalação"
+msgstr "Não há espaço suficiente para a instalação ({} necessário)"
 
 #. Translators: Page title
 msgid "Confirmation"
 msgstr "Confirmação"
 
 #. Translators: Page title
-#, fuzzy
 msgid "Desktop Selection"
-msgstr "Seleção de disco"
+msgstr "Seleção de Desktop"
 
 #. Translators: Page title
 msgid "Disk Selection"
@@ -342,9 +330,8 @@ msgid "Welcome"
 msgstr "Bem-vindo"
 
 #. Translators: Notification text
-#, fuzzy
 msgid "Finished Installation"
-msgstr "_Continuar a Instalação"
+msgstr "Instalação Finalizada"
 
 #, fuzzy
 #~ msgid "Disk"

po/pt_BR.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: os-installer\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-10-16 14:26-0400\n"
-"PO-Revision-Date: 2024-10-16 18:27+0000\n"
+"PO-Revision-Date: 2024-11-21 23:42+0000\n"
-"Last-Translator: Prefill add-on <noreply-addon-prefill@weblate.org>\n"
+"Last-Translator: Gabriel Elyas <gabrielelyas@protonmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "os-installer/os-installer/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8-rc\n"
+"X-Generator: Weblate 5.9-dev\n"
 
 msgid "OS-Installer"
 msgstr "Instalador de SO"
@@ -26,9 +26,8 @@ msgid "Install an Operating System"
 msgstr "Instale um Sistema Operacional"
 
 #. Translators: Dialog title
-#, fuzzy
 msgid "Installation Running"
-msgstr "Instalação Falhada"
+msgstr "Instalação em execução"
 
 #. Translators: Text in dialog shown if user wants to close app with installation running
 msgid ""
@@ -59,7 +58,6 @@ msgid "_Confirm"
 msgstr "_Confirmar"
 
 #. Translators: On button, brackets will be replaced with desktop name.
-#, fuzzy
 msgid "_Use {}"
 msgstr "_Use {}"
 
@@ -76,9 +74,8 @@ msgid "Connect a disk and reload this page."
 msgstr "Conecte um disco e recarregue essa página."
 
 #. Translators: On button.
-#, fuzzy
 msgid "_Reload"
-msgstr "_Reload"
+msgstr "_Recarregar"
 
 #. Translators: Button label to restart system directly after successful installation. Underscore can not be for same letter as 'Restart Later'.
 msgid "_Restart System"
@@ -101,9 +98,8 @@ msgid "Encryption PIN"
 msgstr "Senha de criptografia"
 
 #. Translators: Disk encryption pin confirmation entry field
-#, fuzzy
 msgid "Confirm PIN"
-msgstr "_Confirmar"
+msgstr "Confirmar PIN"
 
 #. Translators: Hint for disk encryption
 msgid ""
@@ -126,17 +122,15 @@ msgstr "Nenhum resultado"
 msgid "Try a different search"
 msgstr "Tente uma pesquisa diferente"
 
-#, fuzzy
 msgid "No connection detected"
-msgstr "Nenhuma conexão."
+msgstr "Nenhuma conexão detectada"
 
 #. Translators: On button for opening wifi settings.
 msgid "_Open Settings"
 msgstr "_Abrir Configurações"
 
-#, fuzzy
 msgid "Connection detected"
-msgstr "Connection detected"
+msgstr "Conexão detectada"
 
 #. selectable: false;
 #. Translators: Followed by a language name.
@@ -194,19 +188,18 @@ msgid "  • BIOS boot partition"
 msgstr "  • Partição de boot BIOS"
 
 #. Translators: Title of a hint page
-#, fuzzy
 msgid "Disk Not Found"
-msgstr "Disk Not Found"
+msgstr "Disco não encontrado"
 
 #. Translators: Body of a hint page
-#, fuzzy
 msgid "Assure that the disk is still avaliable and has not been removed."
-msgstr "Assure that the disk is still avaliable and has not been removed."
+msgstr ""
+"Certifique-se de que o disco ainda esteja disponível e não tenha sido "
+"removido."
 
 #. Translators: On button.
-#, fuzzy
 msgid "_Return to Disk List"
-msgstr "_Return to Disk List"
+msgstr "_Retornar à lista de discos"
 
 #. Translators: Description of selected language.
 msgid "Language"
@@ -223,9 +216,8 @@ msgid "User Account"
 msgstr "Conta do usuário"
 
 #. Translators: Gets shown when autologin is enabled.
-#, fuzzy
 msgid "(Automatic Login)"
-msgstr "Login automático"
+msgstr "(Login automático)"
 
 #. Translators: Description of selected additional software.
 #. Translators: Page title
@@ -247,9 +239,8 @@ msgid "_Name"
 msgstr "_Nome"
 
 #. Translators: Used with entry field for linux username
-#, fuzzy
 msgid "_Username"
-msgstr "User"
+msgstr "_Nome do usuário"
 
 #. Translators: Used with option to enable automatic login of user upon booting
 msgid "Automatic Login"
@@ -260,9 +251,8 @@ msgid "_Password"
 msgstr "_Senha"
 
 #. Translators: Used password confirmation entry field
-#, fuzzy
 msgid "_Confirm Password"
-msgstr "_Senha"
+msgstr "_Confirmar senha"
 
 #. Translators: Default welcome text. Squiggly brackets are replaced by distribution name.
 msgid ""
@@ -276,18 +266,16 @@ msgstr "Partição sem nome"
 
 #. Translators: Shown for partitions that are not big enough to be installed on.
 #. * "{}" is replaced by a disk size value, e.g. "21.3 GB".
-#, fuzzy
 msgid "Not enough space for installation ({} required)"
-msgstr "Não há espaço suficiente para a instalação"
+msgstr "Não há espaço suficiente para a instalação ({} necessário)"
 
 #. Translators: Page title
 msgid "Confirmation"
 msgstr "Confirmação"
 
 #. Translators: Page title
-#, fuzzy
 msgid "Desktop Selection"
-msgstr "Seleção de disco"
+msgstr "Seleção de Desktop"
 
 #. Translators: Page title
 msgid "Disk Selection"
@@ -342,9 +330,8 @@ msgid "Welcome"
 msgstr "Bem-vindo"
 
 #. Translators: Notification text
-#, fuzzy
 msgid "Finished Installation"
-msgstr "_Continuar a Instalação"
+msgstr "Instalação finalizada"
 
 #, fuzzy
 #~ msgid "Disk"

po/tr.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: os-installer\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-10-16 14:26-0400\n"
-"PO-Revision-Date: 2024-10-16 18:27+0000\n"
+"PO-Revision-Date: 2024-11-23 12:50+0000\n"
-"Last-Translator: Prefill add-on <noreply-addon-prefill@weblate.org>\n"
+"Last-Translator: Samed ÖZDEMİR <samedozdemirr@gmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8-rc\n"
+"X-Generator: Weblate 5.9-dev\n"
 
 msgid "OS-Installer"
 msgstr "İşletim Sistemi Kurucu"
@@ -112,7 +112,7 @@ msgid "Search for Help on the Internet"
 msgstr "İnternet'te yardım ara"
 
 msgid "Filter"
-msgstr "Süzgeç"
+msgstr "Filtre"
 
 #. Translators: Empty result placeholder title
 msgid "No Results"

src/config.py

@@ -44,8 +44,8 @@ default_config = {
 legacy_values = {
     'offer_disk_encryption': ('disk_encryption',
                               True,
-                              {'offered': True, 'forced': False, 'min_length': 1},
+                              {'offered': True, 'forced': False, 'min_length': 1, 'confirmation': False},
-                              {'offered': False, 'forced': False, 'min_length': 1}),
+                              {'offered': False, 'forced': False, 'min_length': 1, 'confirmation': False}),
 }
 
 # not configurable via config file
@@ -84,7 +84,7 @@ def _match(variables, var, *ok_types):
         return False
     elif type(variables[var]) not in ok_types:
         print(f'Config error: {var} not of expected type (expected ',
-              f'{ok_types}, but got {has_type})')
+              f'{ok_types}, but got {type(variables[var])})')
         return False
     else:
         return True
@@ -152,9 +152,9 @@ class Config:
                 self.variables[config_property] = config_from_file[config_property]
 
     def _handle_legacy(self, legacy_prop, legacy_val):
+        new_var, compare_val, new1, new2 = legacy_values[legacy_prop]
         print(f'Developer hint: "{legacy_prop}" is deprecated, '
               f'use "{new_var}" instead')
-        new_var, compare_val, new1, new2 = legacy_values[legacy_prop]
         self.variables[new_var] = new1 if legacy_val == compare_val else new2
 
     def _preprocess_values(self):

src/provider/choices_provider.py

@@ -29,8 +29,8 @@ class Choice(GObject.Object):
 
 def handle_choice(choice):
     name = choice['name']
-    description = choice['description'] if 'description' in choice else ''
+    description = choice.get('description', '')
-    icon_path = choice['icon_path'] if 'icon_path' in choice else ''
+    icon_path = choice.get('icon_path', '')
 
     if 'options' in choice:
         if 'keyword' in choice or 'suggested' in choice:
@@ -43,7 +43,7 @@ def handle_choice(choice):
             if not 'option' in option:
                 print(f'Option for {name} not correctly configured: {option}')
                 continue
-            option_name = option['name'] if 'name' in option else option['option']
+            option_name = option.get('name', option['option'])
             options.append(Option(option_name, option['option']))
 
         if len(options) == 0:
@@ -53,7 +53,7 @@ def handle_choice(choice):
             return Choice(name, description, icon_path, options=options)
     else:
         if 'keyword' in choice:
-            suggested = choice['suggested'] if 'suggested' in choice else False
+            suggested = choice.get('suggested', False)
             return Choice(name, description, icon_path, suggested=suggested, keyword=choice['keyword'])
         else:
             print(f'No keyword found for {name}')

src/provider/desktop_provider.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from typing import NamedTuple
+import os
 
 from gi.repository import Gdk
 
@@ -25,8 +26,13 @@ class DesktopProvider(Preloadable):
             if not set(entry).issuperset(['name', 'keyword', 'image_path']):
                 print(f'Desktop choice not correctly configured: {entry}')
                 continue
-            description = entry['description'] if 'description' in entry else ''
+            description = entry.get('description', '')
-            texture = Gdk.Texture.new_from_filename(entry['image_path'])
+            image_path = entry['image_path']
+
+            if not os.path.exists(image_path):
+                print(f'Could not find desktop image "{image_path}"')
+                continue
+            texture = Gdk.Texture.new_from_filename(image_path)
             desktop = Desktop(entry['name'], description,
                               texture, entry['keyword'])
             self.desktops.append(desktop)

src/provider/disk_provider.py

@@ -112,7 +112,7 @@ class DiskProvider(Preloadable):
                            "/dev/sda_yes"),
                 DeviceInfo(None, 20000000000, "30 GB", "/dev/sda_unnamed"),
                 DeviceInfo(None, 20000000000, "20 GB", "/dev/sda_unnamed2"),
-                DeviceInfo("Swap", 20000000000, "8 GB", None),
+                DeviceInfo("Swap", 20000000000, "8 GB", '/dev/sda_swap'),
             ]),
             Disk("VERY BIG DISK", 1000000000000000, "1000 TB",
                  "/dev/sdb_very_big", []),

src/provider/language_provider.py

@@ -122,6 +122,8 @@ class LanguageProvider(Preloadable):
                     self.suggested.append(language_info)
                 else:
                     self.other.append(language_info)
+        else:
+            self.other = self.all_languages
 
     ### public methods ###
 

src/provider/welcome_provider.py

@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+import os
+
 from gi.repository import Gdk
 
 from .config import config
@@ -13,9 +15,13 @@ class WelcomeProvider(Preloadable):
     def _load_image(self):
         welcome = config.get('welcome_page')
 
-        if welcome['logo']:
+        if logo := welcome['logo']:
-            texture = Gdk.Texture.new_from_filename(welcome['logo'])
+            if os.path.exists(logo):
-            config.set('welcome_page_image', texture)
+                texture = Gdk.Texture.new_from_filename(logo)
+                config.set('welcome_page_image', texture)
+            else:
+                print(f'Could not find welcome logo "{logo}"')
+
 
 
 welcome_provider = WelcomeProvider()

src/ui/window.py

@@ -56,11 +56,9 @@ class OsInstallerWindow(Adw.ApplicationWindow):
         self._update_page()
 
     def _initialize_first_page(self):
-        self._remove_all_pages()
+        initial_page = PageWrapper(self.available_pages[0])
-        page_name = self.available_pages[0]
-        initial_page = PageWrapper(page_name)
         initial_page.permanent = True
-        self.navigation_view.replace([initial_page])
+        self.navigation_view.add(initial_page)
 
     def _add_action(self, action_name, callback, keybinding):
         action = Gio.SimpleAction.new(action_name, None)
@@ -84,8 +82,11 @@ class OsInstallerWindow(Adw.ApplicationWindow):
         self._add_action('quit', self._show_confirm_dialog, '<Ctl>q')
 
         if config.get('test_mode'):
-            def show_failed(_, __): return self._load_page('failed')
+            def show_failed(_, __):
+                with self.navigation_lock:
+                    return self._load_page('failed', permanent=False)
             self._add_action('fail-page', show_failed, '<Alt>F')
+
             def skip_page(_, __):
                 with self.navigation_lock:
                     return self._advance(None)
@@ -124,15 +125,18 @@ class OsInstallerWindow(Adw.ApplicationWindow):
                 config.set('fixed_language', '')
         return True
 
-    def _remove_all_pages(self):
+    def _remove_all_pages(self, exception=None):
         for page_name in self.available_pages:
+            if page_name == exception:
+                continue
             if page := self.navigation_view.find_page(page_name):
                 self.navigation_view.remove(page)
                 del page
-        self.navigation_view.replace([])
 
-        if page := self.navigation_view.find_page('language'):
+        replacement = []
-            self.navigation_view.replace([page])
+        if exception:
+            replacement = [self.navigation_view.find_page(exception)]
+        self.navigation_view.replace(replacement)
 
     def _get_next_page_name(self, offset: int = forward):
         current_page = self.navigation_view.get_visible_page()
@@ -153,7 +157,7 @@ class OsInstallerWindow(Adw.ApplicationWindow):
                 case 'no_return':
                     self._remove_all_pages()
                 case 'retranslate':
-                    self._initialize_first_page()
+                    self._remove_all_pages('language')
 
             self._load_page(next_page_name)
 
@@ -204,7 +208,7 @@ class OsInstallerWindow(Adw.ApplicationWindow):
 
     def _change_page(self, value):
         with self.navigation_lock:
-            match value:
+            match value := config.steal('displayed-page'):
                 case 'next', page:
                     self._advance(page)
                 case _: