diff --git a/common/DBusStructures.vala b/common/DBusStructures.vala index 388e2b9ed..1ca14fb0f 100644 --- a/common/DBusStructures.vala +++ b/common/DBusStructures.vala @@ -31,10 +31,58 @@ public struct InstallerDaemon.Disk { Partition[] partitions; } +public enum InstallerDaemon.FileSystem { + NONE, + BTRFS, + EXT2, + EXT3, + EXT4, + F2FS, + FAT16, + FAT32, + NTFS, + SWAP, + XFS, + LVM, + LUKS; + + public unowned string to_string () { + switch (this) { + case BTRFS: + return "btrfs"; + case EXT2: + return "ext2"; + case EXT3: + return "ext3"; + case EXT4: + return "ext4"; + case F2FS: + return "f2fs"; + case FAT16: + return "fat16"; + case FAT32: + return "fat32"; + case NTFS: + return "ntfs"; + case SWAP: + return "swap"; + case XFS: + return "xfs"; + case LVM: + return "lvm"; + case LUKS: + return "luks"; + case NONE: + default: + return "none"; + } + } +} + public struct InstallerDaemon.Partition { string device_path; - Distinst.FileSystem filesystem; + FileSystem filesystem; uint64 start_sector; uint64 end_sector; @@ -62,18 +110,18 @@ public struct InstallerDaemon.Mount { string parent_disk; string mount_point; uint64 sectors; - Distinst.FileSystem filesystem; + FileSystem filesystem; MountFlags flags; public bool is_valid_boot_mount () { - return filesystem == Distinst.FileSystem.FAT16 - || filesystem == Distinst.FileSystem.FAT32; + return filesystem == FileSystem.FAT16 + || filesystem == FileSystem.FAT32; } public bool is_valid_root_mount () { - return filesystem != Distinst.FileSystem.FAT16 - && filesystem != Distinst.FileSystem.FAT32 - && filesystem != Distinst.FileSystem.NTFS; + return filesystem != FileSystem.FAT16 + && filesystem != FileSystem.FAT32 + && filesystem != FileSystem.NTFS; } public bool is_lvm () { diff --git a/daemon/Daemon.vala b/daemon/Daemon.vala index 2a93ea6c0..04a53fe55 100644 --- a/daemon/Daemon.vala +++ b/daemon/Daemon.vala @@ -69,7 +69,7 @@ public class InstallerDaemon.Daemon : GLib.Object { partitions += Partition () { device_path = string_from_utf8 (part.get_device_path ()), - filesystem = part.get_file_system (), + filesystem = to_common_fs (part.get_file_system ()), start_sector = part.get_start_sector (), end_sector = part.get_end_sector (), sectors_used = part.sectors_used (disk.get_sector_size ()), @@ -103,7 +103,7 @@ public class InstallerDaemon.Daemon : GLib.Object { partitions += Partition () { device_path = string_from_utf8 (part.get_device_path ()), - filesystem = part.get_file_system (), + filesystem = to_common_fs (part.get_file_system ()), start_sector = part.get_start_sector (), end_sector = part.get_end_sector (), sectors_used = part.sectors_used (disk.get_sector_size ()), @@ -149,7 +149,7 @@ public class InstallerDaemon.Daemon : GLib.Object { partitions += Partition () { device_path = string_from_utf8 (part.get_device_path ()), - filesystem = part.get_file_system (), + filesystem = to_common_fs (part.get_file_system ()), start_sector = part.get_start_sector (), end_sector = part.get_end_sector (), sectors_used = part.sectors_used (disk.get_sector_size ()), @@ -451,7 +451,7 @@ public class InstallerDaemon.Daemon : GLib.Object { if (m.mount_point == "/boot/efi") { if (m.is_valid_boot_mount ()) { if (m.should_format ()) { - partition.format_with (m.filesystem); + partition.format_with (to_distinst_fs (m.filesystem)); } partition.set_mount (m.mount_point); @@ -460,7 +460,7 @@ public class InstallerDaemon.Daemon : GLib.Object { throw new GLib.IOError.FAILED ("Unreachable code path -- EFI partition is invalid"); } } else { - if (m.filesystem != Distinst.FileSystem.SWAP) { + if (m.filesystem != SWAP) { partition.set_mount (m.mount_point); } @@ -469,7 +469,7 @@ public class InstallerDaemon.Daemon : GLib.Object { } if (m.should_format ()) { - partition.format_with (m.filesystem); + partition.format_with (to_distinst_fs (m.filesystem)); } } } @@ -498,12 +498,12 @@ public class InstallerDaemon.Daemon : GLib.Object { throw new GLib.IOError.FAILED ("could not find %s", m.partition_path); } - if (m.filesystem != Distinst.FileSystem.SWAP) { + if (m.filesystem != SWAP) { partition.set_mount (m.mount_point); } if (m.should_format ()) { - partition.format_and_keep_name (m.filesystem); + partition.format_and_keep_name (to_distinst_fs (m.filesystem)); } } } @@ -513,6 +513,72 @@ public class InstallerDaemon.Daemon : GLib.Object { builder.append_len ((string) input, input.length); return (owned) builder.str; } + + private InstallerDaemon.FileSystem to_common_fs (Distinst.FileSystem fs) { + switch (fs) { + case BTRFS: + return InstallerDaemon.FileSystem.BTRFS; + case EXT2: + return InstallerDaemon.FileSystem.EXT2; + case EXT3: + return InstallerDaemon.FileSystem.EXT3; + case EXT4: + return InstallerDaemon.FileSystem.EXT4; + case F2FS: + return InstallerDaemon.FileSystem.F2FS; + case FAT16: + return InstallerDaemon.FileSystem.FAT16; + case FAT32: + return InstallerDaemon.FileSystem.FAT32; + case NONE: + return InstallerDaemon.FileSystem.NONE; + case NTFS: + return InstallerDaemon.FileSystem.NTFS; + case SWAP: + return InstallerDaemon.FileSystem.SWAP; + case XFS: + return InstallerDaemon.FileSystem.XFS; + case LVM: + return InstallerDaemon.FileSystem.LVM; + case LUKS: + return InstallerDaemon.FileSystem.LUKS; + default: + return InstallerDaemon.FileSystem.NONE; + } + } + + private Distinst.FileSystem to_distinst_fs (InstallerDaemon.FileSystem fs) { + switch (fs) { + case BTRFS: + return Distinst.FileSystem.BTRFS; + case EXT2: + return Distinst.FileSystem.EXT2; + case EXT3: + return Distinst.FileSystem.EXT3; + case EXT4: + return Distinst.FileSystem.EXT4; + case F2FS: + return Distinst.FileSystem.F2FS; + case FAT16: + return Distinst.FileSystem.FAT16; + case FAT32: + return Distinst.FileSystem.FAT32; + case NONE: + return Distinst.FileSystem.NONE; + case NTFS: + return Distinst.FileSystem.NTFS; + case SWAP: + return Distinst.FileSystem.SWAP; + case XFS: + return Distinst.FileSystem.XFS; + case LVM: + return Distinst.FileSystem.LVM; + case LUKS: + return Distinst.FileSystem.LUKS; + default: + return Distinst.FileSystem.NONE; + } + } } private void on_bus_acquired (GLib.DBusConnection connection, string name) { diff --git a/data/io.elementary.installer.gresource.xml b/data/io.elementary.installer.gresource.xml index 307b4b93c..66defa4d0 100644 --- a/data/io.elementary.installer.gresource.xml +++ b/data/io.elementary.installer.gresource.xml @@ -7,5 +7,7 @@ caution.svg emblem-downloads.svg + io.elementary.settings.svg + io.elementary.settings.svg diff --git a/data/io.elementary.settings.svg b/data/io.elementary.settings.svg new file mode 100644 index 000000000..a4cf400de --- /dev/null +++ b/data/io.elementary.settings.svg @@ -0,0 +1,56 @@ + +image/svg+xml diff --git a/po/ca.po b/po/ca.po index b6eab5cb0..c9eb39850 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-08-08 10:16+0000\n" +"PO-Revision-Date: 2024-09-12 22:16+0000\n" "Last-Translator: David M \n" "Language-Team: Catalan \n" @@ -171,17 +171,13 @@ msgstr "" "NVIDIA®." #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." msgstr "" -"Els controladors de propietat es poden instal·lar més tard mitjançant el " -"Centre d'aplicacions, però caldrà una connexió a Internet per a tots els " -"controladors." +"Els controladors de propietat es poden instal·lar més tard mitjançant " +"l'apartat de Sistema dels Paràmetres del sistema, però caldrà una connexió a " +"Internet per a tots els controladors." #: src/Views/DriversView.vala:55 msgid "" diff --git a/po/de.po b/po/de.po index de42e430e..627591537 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: pantheon-calculator\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-08-17 20:21+0000\n" +"PO-Revision-Date: 2024-09-16 17:16+0000\n" "Last-Translator: Uwe S \n" "Language-Team: German \n" @@ -177,16 +177,13 @@ msgstr "" "Zur Installation der NVIDIA®-Treiber wird eine Internet-Verbindung benötigt." #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." msgstr "" -"Proprietäre Treiber können später im AppCenter installiert werden, " -"allerdings wird für alle Treiber eine Internet-Verbindung benötigt." +"Proprietäre Treiber können später über Systemeinstellungen → System " +"installiert werden, allerdings wird für alle Treiber eine Internet-" +"Verbindung benötigt." #: src/Views/DriversView.vala:55 msgid "" diff --git a/po/es.po b/po/es.po index 176773e11..d555f8e22 100644 --- a/po/es.po +++ b/po/es.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-08-09 22:16+0000\n" +"PO-Revision-Date: 2024-09-12 22:16+0000\n" "Last-Translator: Italo Felipe Capasso Ballesteros \n" "Language-Team: Spanish \n" @@ -171,17 +171,13 @@ msgstr "" "los procesadores gráficos de NVIDIA®." #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." msgstr "" -"Los controladores de propietarios se pueden instalar después a través del " -"Centro de Aplicaciones, pero se requiere de una conexión a Internet para " -"todos los controladores." +"Los controladores de propietarios se pueden instalar después a través de " +"Configuración del Sistema → Sistema, pero se requiere de una conexión a " +"Internet para todos los controladores." #: src/Views/DriversView.vala:55 msgid "" diff --git a/po/fr.po b/po/fr.po index 7bd1d8aa1..085338557 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-08-27 08:16+0000\n" -"Last-Translator: Nathan \n" +"PO-Revision-Date: 2024-09-12 22:16+0000\n" +"Last-Translator: Corentin Noël \n" "Language-Team: French \n" "Language: fr\n" @@ -173,17 +173,13 @@ msgstr "" "cartes graphiques NVIDIA®." #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." msgstr "" -"Les pilotes propriétaires peuvent être installés ultérieurement par " -"l'intermédiaire du centre d'applications, mais une connexion Internet sera " -"requise pour tous les pilotes." +"Les pilotes propriétaires peuvent être installés ultérieurement via " +"Paramètres du système → Système, mais une connexion Internet sera requise " +"pour tous les pilotes." #: src/Views/DriversView.vala:55 msgid "" diff --git a/po/he.po b/po/he.po index e7a746d5c..ea43d54af 100644 --- a/po/he.po +++ b/po/he.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-08-08 10:16+0000\n" +"PO-Revision-Date: 2024-09-12 22:16+0000\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" @@ -164,16 +164,12 @@ msgid "An Internet connection is required to install NVIDIA® graphics drivers." msgstr "צריך חיבור לאינטרנט כדי להתקין מנהלי התקנים של NVIDIA®‎." #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." msgstr "" -"אפשר להתקין מנהלי התקנים קנייניים מאוחר יותר דרך מרכז היישומים אך צריך חיבור " -"לאינטרנט לכל מנהלי ההתקנים." +"אפשר להתקין מנהלי התקנים קנייניים מאוחר יותר דרך הגדרת מערכת ← מערכת אך צריך " +"חיבור לאינטרנט לטובת גישה לכל מנהלי ההתקנים." #: src/Views/DriversView.vala:55 msgid "" diff --git a/po/hu.po b/po/hu.po index 65d817a05..3c4903580 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-08-15 10:16+0000\n" +"PO-Revision-Date: 2024-09-14 09:16+0000\n" "Last-Translator: TomiOhl \n" "Language-Team: Hungarian \n" @@ -169,16 +169,13 @@ msgstr "" "Az NVIDIA® grafikus illesztőprogramok letöltése internetkapcsolatot igényel." #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." msgstr "" -"A zárt forráskódú illesztőprogramok később is telepíthetőek az " -"Appközpontból, de ehhez internetkapcsolatra lesz szüksége." +"A zárt forráskódú illesztőprogramok később is telepíthetőek a " +"Rendszerbeállítások → Rendszer menüpontban, de ehhez internetkapcsolatra " +"lesz szüksége." #: src/Views/DriversView.vala:55 msgid "" diff --git a/po/ja.po b/po/ja.po index 27ae03ffd..48fcda620 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-09-01 01:16+0000\n" +"PO-Revision-Date: 2024-09-12 22:16+0000\n" "Last-Translator: Ryo Nakano \n" "Language-Team: Japanese \n" @@ -172,17 +172,13 @@ msgstr "" "必要です。" #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." msgstr "" -"プロプライエタリードライバーは後からでも AppCenter 経由でインストール可能です" -"が、NVIDIA® グラフィックス以外のドライバーでもインターネット接続が必要になり" -"ます。" +"プロプライエタリードライバーは後からでも“システム設定” → " +"“システム”経由でインストール可能ですが、NVIDIA® " +"グラフィックス以外のドライバーでもインターネット接続が必要になります。" #: src/Views/DriversView.vala:55 msgid "" diff --git a/po/ka.po b/po/ka.po index ca775528d..f4443b149 100644 --- a/po/ka.po +++ b/po/ka.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-06-19 05:16+0000\n" +"PO-Revision-Date: 2024-09-12 22:16+0000\n" "Last-Translator: NorwayFun \n" "Language-Team: Georgian \n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.5.5\n" +"X-Generator: Weblate 5.6.2\n" "X-Launchpad-Export-Date: 2016-09-27 06:40+0000\n" #: src/Application.vala:44 @@ -315,15 +315,15 @@ msgid "Currently active language" msgstr "ამჟამად აქტიური ენა" #: src/Views/PartitioningView.vala:53 -#, fuzzy -#| msgid "Use Partition" msgid "Select Partitions" -msgstr "დანაყოფის გამოყენება" +msgstr "აირჩიეთ დანაყოფები" #: src/Views/PartitioningView.vala:58 msgid "" "Selecting “Format” will erase all data on the selected partition." msgstr "" +"თუ \"დაფორმატებას\" აირჩევთ, ეს მონიშნულ დანაყოფზე ყველა მონაცემებს " +"წაშლის." #. Device is in BIOS mode, so we just require a root partition #: src/Views/PartitioningView.vala:67 @@ -368,10 +368,8 @@ msgid "Show log" msgstr "ჟურნალის ჩვენება" #: src/Views/ProgressView.vala:90 -#, fuzzy -#| msgid "Before Installing" msgid "Installing" -msgstr "დაყენებამდე" +msgstr "დაყენება" #: src/Views/ProgressView.vala:95 msgid "Hide log" diff --git a/po/nl.po b/po/nl.po index d6082972c..7edb329a3 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-08-17 10:16+0000\n" +"PO-Revision-Date: 2024-09-14 09:16+0000\n" "Last-Translator: DutchVipperloid \n" "Language-Team: Dutch \n" @@ -171,24 +171,22 @@ msgstr "" "installeren." #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." msgstr "" -"Propriëtaire drivers kunnen later geïnstalleerd worden in AppCenter, maar " -"een internetverbinding is vereist voor alle drivers." +"Propriëtaire drivers kunnen later geïnstalleerd worden in " +"Systeeminstellingen → Systeem, maar een internetverbinding is vereist voor " +"alle drivers." #: src/Views/DriversView.vala:55 msgid "" "Include third-party proprietary drivers when installing. I agree to their " "respective licenses and terms of use." msgstr "" -"Installeer propriëtaire drivers van derde partijen mee tijdens installatie. " -"Ik ga akkoord met hun respectieve licenties en gebruikersvoorwaarden." +"Installeer propriëtaire drivers van derde partijen tijdens installatie van " +"het systeem. Ik ga akkoord met hun respectieve licenties en " +"gebruikersvoorwaarden." #: src/Views/DriversView.vala:78 src/Views/EncryptView.vala:147 #: src/Views/KeyboardLayoutView.vala:55 src/Views/PartitioningView.vala:143 diff --git a/po/pl.po b/po/pl.po index 0120c5314..763428753 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-08-12 08:16+0000\n" -"Last-Translator: Marcin Serwin \n" +"PO-Revision-Date: 2024-09-12 22:16+0000\n" +"Last-Translator: Piotr Strebski \n" "Language-Team: Polish \n" "Language: pl\n" @@ -173,17 +173,13 @@ msgstr "" "graficznych kart NVIDIA®." #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." msgstr "" -"Własnościowe sterowniki mogą zostać zainstalowane później przez AppCenter, " -"jednak działające połączenie z internetem będzie wymagane dla każdego " -"sterownika." +"Własnościowe sterowniki można zainstalować później w Ustawienia systemu → " +"System, ale w przypadku wszystkich sterowników wymagane będzie połączenie z " +"Internetem." #: src/Views/DriversView.vala:55 msgid "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0987d8f48..de32fe35b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3,9 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-09-02 00:57+0000\n" -"Last-Translator: Bruno Costa Castro Alves \n" +"PO-Revision-Date: 2024-09-15 16:16+0000\n" +"Last-Translator: José Rafael \n" "Language-Team: Portuguese (Brazil) \n" "Language: pt_BR\n" @@ -170,16 +169,12 @@ msgstr "" "Uma conexão à internet é necessária para instalar drivers gráficos NVIDIA® ." #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." msgstr "" -"Os drivers proprietários podem ser instalados depois pela Central de " -"Aplicativos, mas será necessária uma conexão à Internet para todos os " +"Os drivers proprietários podem ser instalados depois em Configurações do " +"Sistema → Sistema, mas será necessária uma conexão à Internet para todos os " "drivers." #: src/Views/DriversView.vala:55 diff --git a/po/ru.po b/po/ru.po index 6f4ac617b..360b93f4a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-08-09 22:16+0000\n" +"PO-Revision-Date: 2024-09-14 09:16+0000\n" "Last-Translator: кубик круглый \n" "Language-Team: Russian \n" @@ -171,16 +171,12 @@ msgstr "" "соединение." #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." msgstr "" -"Проприетарные драйверы можно установить позже через AppCenter, но для этого " -"потребуется Интернет-соединение." +"Проприетарные драйверы можно установить позже в Параметры системы → Система, " +"но для этого потребуется Интернет-соединение." #: src/Views/DriversView.vala:55 msgid "" diff --git a/po/uk.po b/po/uk.po index 1d7d8dc4c..7c09d6439 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-08-15 10:16+0000\n" +"PO-Revision-Date: 2024-09-14 09:16+0000\n" "Last-Translator: Ihor Hordiichuk \n" "Language-Team: Ukrainian \n" @@ -171,16 +171,12 @@ msgstr "" "Для встановлення графічних драйверів NVIDIA® потрібне інтернет-з'єднання." #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." msgstr "" -"Власницькі драйвери можна встановити пізніше через Центр застосунків, але " -"інтернет-з'єднання буде необхідним для всіх драйверів." +"Власницькі драйвери можна встановити пізніше через Налаштування системи → " +"Система, але інтернет-з'єднання буде необхідним для всіх драйверів." #: src/Views/DriversView.vala:55 msgid "" diff --git a/po/zh_TW.po b/po/zh_TW.po index bc5b82e21..73bb506f4 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-11 22:12+0000\n" -"PO-Revision-Date: 2024-09-07 17:04+0000\n" +"PO-Revision-Date: 2024-09-13 00:58+0000\n" "Last-Translator: Kisaragi Hiu \n" "Language-Team: Chinese (Traditional) \n" @@ -161,16 +161,11 @@ msgid "An Internet connection is required to install NVIDIA® graphics drivers." msgstr "需要網際網路連線才能安裝 NVIDIA® 顯示卡驅動程式。" #: src/Views/DriversView.vala:50 -#, fuzzy -#| msgid "" -#| "Proprietary drivers can be installed later through AppCenter, but an " -#| "Internet connection will be required for all drivers." msgid "" "Proprietary drivers can be installed later through System Settings → System, " "but an Internet connection will be required for all drivers." -msgstr "" -"私有驅動程式可以之後到《應用程式中心》安裝，但所有驅動程式在安裝時都需要網際" -"網路連線。" +msgstr "私有驅動程式可以之後到「系統設定值」→「系統」進行安裝，但所有驅動程式在安裝時" +"都需要網際網路連線。" #: src/Views/DriversView.vala:55 msgid "" diff --git a/src/Objects/Mount.vala b/src/Objects/Mount.vala index 6896f0ac6..b20ac7a21 100644 --- a/src/Objects/Mount.vala +++ b/src/Objects/Mount.vala @@ -23,12 +23,12 @@ public class Installer.Mount { public string parent_disk; public string mount_point; public uint64 sectors; - public Distinst.FileSystem filesystem; + public InstallerDaemon.FileSystem filesystem; public InstallerDaemon.MountFlags flags; public PartitionMenu menu; public Mount (string partition, string parent_disk, string mount, - uint64 sectors, InstallerDaemon.MountFlags flags, Distinst.FileSystem fs, + uint64 sectors, InstallerDaemon.MountFlags flags, InstallerDaemon.FileSystem fs, PartitionMenu menu) { filesystem = fs; mount_point = mount; @@ -40,14 +40,14 @@ public class Installer.Mount { } public bool is_valid_boot_mount () { - return filesystem == Distinst.FileSystem.FAT16 - || filesystem == Distinst.FileSystem.FAT32; + return filesystem == FAT16 + || filesystem == FAT32; } public bool is_valid_root_mount () { - return filesystem != Distinst.FileSystem.FAT16 - && filesystem != Distinst.FileSystem.FAT32 - && filesystem != Distinst.FileSystem.NTFS; + return filesystem != FAT16 + && filesystem != FAT32 + && filesystem != NTFS; } public bool is_lvm () { diff --git a/src/Views/DriversView.vala b/src/Views/DriversView.vala index 4f1dfe2a9..a0f4523e2 100644 --- a/src/Views/DriversView.vala +++ b/src/Views/DriversView.vala @@ -46,8 +46,8 @@ var install_later_row = new DescriptionRow ( _("Proprietary drivers can be installed later through System Settings → System, but an Internet connection will be required for all drivers."), - "system-software-install-symbolic", - "purple" + "io.elementary.settings-symbolic", + "slate" ); var checkbutton_label = new Gtk.Label (_("Include third-party proprietary drivers when installing. I agree to their respective licenses and terms of use.")) { diff --git a/src/Views/PartitioningView.vala b/src/Views/PartitioningView.vala index 404a98b4d..af2ac3fd7 100644 --- a/src/Views/PartitioningView.vala +++ b/src/Views/PartitioningView.vala @@ -253,7 +253,7 @@ public class Installer.PartitioningView : AbstractInstallerView { m.parent_disk, m.partition_path, m.mount_point, - Distinst.strfilesys (m.filesystem), + m.filesystem.to_string (), m.should_format () ? "true" : "false" ); diff --git a/src/Widgets/DiskBar.vala b/src/Widgets/DiskBar.vala index 3641d11e5..a0c3a26ec 100644 --- a/src/Widgets/DiskBar.vala +++ b/src/Widgets/DiskBar.vala @@ -41,7 +41,7 @@ public class Installer.DiskBar: Gtk.Box { add_legend ( p.partition.device_path, p.get_partition_size () * 512, - Distinst.strfilesys (p.partition.filesystem), + p.partition.filesystem.to_string (), p.volume_group, p.menu ); diff --git a/src/Widgets/PartitionBar.vala b/src/Widgets/PartitionBar.vala index 219ec8518..0ae7c8743 100644 --- a/src/Widgets/PartitionBar.vala +++ b/src/Widgets/PartitionBar.vala @@ -65,7 +65,7 @@ public class Installer.PartitionBar : Gtk.Box { hexpand = true; tooltip_text = partition.device_path; - add_css_class (Distinst.strfilesys (partition.filesystem)); + add_css_class (partition.filesystem.to_string ()); bind_property ("icon", image, "gicon", SYNC_CREATE); } diff --git a/src/Widgets/PartitionMenu.vala b/src/Widgets/PartitionMenu.vala index 659ada23d..4fa4b446d 100644 --- a/src/Widgets/PartitionMenu.vala +++ b/src/Widgets/PartitionMenu.vala @@ -28,7 +28,7 @@ public class Installer.PartitionMenu : Gtk.Popover { private bool is_lvm; private string parent_disk; private string partition_path; - private Distinst.FileSystem original_filesystem; + private InstallerDaemon.FileSystem original_filesystem; private Granite.SwitchModelButton format_partition; private Granite.SwitchModelButton use_partition; @@ -40,7 +40,7 @@ public class Installer.PartitionMenu : Gtk.Popover { // A reference to the parent which owns this menu. private PartitionBar partition_bar; - public PartitionMenu (string path, string parent, Distinst.FileSystem fs, + public PartitionMenu (string path, string parent, InstallerDaemon.FileSystem fs, bool lvm, SetMount set_mount, UnsetMount unset_mount, MountSetFn mount_set, PartitionBar partition_bar) { this.partition_bar = partition_bar; @@ -205,13 +205,13 @@ public class Installer.PartitionMenu : Gtk.Popover { disable_signals = false; int select = 0; - if (fs == Distinst.FileSystem.FAT16 || fs == Distinst.FileSystem.FAT32) { + if (fs == InstallerDaemon.FileSystem.FAT16 || fs == InstallerDaemon.FileSystem.FAT32) { if (mount_set (boot_partition)) { select = 4; } else { select = 2; } - } else if (fs == Distinst.FileSystem.SWAP) { + } else if (fs == InstallerDaemon.FileSystem.SWAP) { select = 3; } else if (mount_set ("/")) { if (mount_set ("/home" )) { @@ -258,7 +258,7 @@ public class Installer.PartitionMenu : Gtk.Popover { private void update_values (SetMount set_mount) { var mount = get_mount (); var filesystem = mount == "swap" - ? Distinst.FileSystem.SWAP + ? InstallerDaemon.FileSystem.SWAP : get_file_system (); string? error = null; @@ -290,22 +290,22 @@ public class Installer.PartitionMenu : Gtk.Popover { return original_filesystem == get_file_system (); } - private Distinst.FileSystem get_file_system () { + private InstallerDaemon.FileSystem get_file_system () { switch (type.active) { case 0: - return Distinst.FileSystem.EXT4; + return InstallerDaemon.FileSystem.EXT4; case 1: - return Distinst.FileSystem.FAT16; + return InstallerDaemon.FileSystem.FAT16; case 2: - return Distinst.FileSystem.FAT32; + return InstallerDaemon.FileSystem.FAT32; case 3: - return Distinst.FileSystem.BTRFS; + return InstallerDaemon.FileSystem.BTRFS; case 4: - return Distinst.FileSystem.XFS; + return InstallerDaemon.FileSystem.XFS; case 5: - return Distinst.FileSystem.NTFS; + return InstallerDaemon.FileSystem.NTFS; default: - return Distinst.FileSystem.NONE; + return InstallerDaemon.FileSystem.NONE; } }