From 41d0baa5e4988ca06f0a94a2be57d045bce7ed68 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sun, 18 Aug 2024 18:00:56 +0300 Subject: [PATCH] --- locales/ar_SA.json | 2 +- locales/bg_BG.json | 2 +- locales/cs_CZ.json | 2 +- locales/de_DE.json | 2 +- locales/en_US.json | 2 +- locales/fr_FR.json | 2 +- locales/it_IT.json | 2 +- locales/nl_NL.json | 2 +- locales/sv_SE.json | 2 +- locales/tr_TR.json | 2 +- src/drive_mount_row/imp.rs | 8 ++++---- src/drive_mount_row/mod.rs | 2 +- src/main.rs | 3 +-- src/partitioning_page/mod.rs | 2 +- 14 files changed, 17 insertions(+), 18 deletions(-) diff --git a/locales/ar_SA.json b/locales/ar_SA.json index 7ba9768..fb92104 100644 --- a/locales/ar_SA.json +++ b/locales/ar_SA.json @@ -76,7 +76,7 @@ "exit_button_label": "", "subtitle_partition": "", "title_mountpoint": "", - "title_mountopt": "", + "title_mountopts": "", "pika_install_good": "", "reboot": "", "pika_install_bad": "", diff --git a/locales/bg_BG.json b/locales/bg_BG.json index fc0af78..e0b927d 100644 --- a/locales/bg_BG.json +++ b/locales/bg_BG.json @@ -76,7 +76,7 @@ "exit_button_label": "Изход", "subtitle_partition": "Дял", "title_mountpoint": "Точка за монтиране", - "title_mountopt": "Допълнителни Точки за Монтиране", + "title_mountopts": "Допълнителни Точки за Монтиране", "pika_install_good": "Инсталацията на PikaOS беше завършена успешно.", "reboot": "Рестартирай", "pika_install_bad": "PikaOS се провали!\nПроверете логовете за повече информация.", diff --git a/locales/cs_CZ.json b/locales/cs_CZ.json index 0228e62..d1d52b5 100644 --- a/locales/cs_CZ.json +++ b/locales/cs_CZ.json @@ -76,7 +76,7 @@ "exit_button_label": "", "subtitle_partition": "", "title_mountpoint": "", - "title_mountopt": "", + "title_mountopts": "", "pika_install_good": "", "reboot": "", "pika_install_bad": "", diff --git a/locales/de_DE.json b/locales/de_DE.json index c0f8fd8..e2b0b8b 100644 --- a/locales/de_DE.json +++ b/locales/de_DE.json @@ -76,7 +76,7 @@ "exit_button_label": "Beenden", "subtitle_partition": "Partition", "title_mountpoint": "Einhängepunkt", - "title_mountopt": "Zusätzliche Einhängeoptionen", + "title_mountopts": "Zusätzliche Einhängeoptionen", "pika_install_good": "Die Installation von PikaOS wurde erfolgreich abgeschlossen.", "reboot": "Neu starten", "pika_install_bad": "PikaOS installation ist gescheitert!\nWeitere Informationen findest du in den Protokollen.", diff --git a/locales/en_US.json b/locales/en_US.json index 33f9c46..40b1145 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -77,7 +77,7 @@ "exit_button_label": "exit_button_label", "subtitle_partition": "Partition", "title_mountpoint": "Mountpoint", - "title_mountopt": "Additional Mount Options", + "title_mountopts": "Additional Mount Options", "pika_install_good": "The installation of PikaOS has been completed sucessfully.", "reboot": "Reboot", "pika_install_bad": "PikaOS has Failed!\nCheck logs for further info.", diff --git a/locales/fr_FR.json b/locales/fr_FR.json index f983551..8b30bdd 100644 --- a/locales/fr_FR.json +++ b/locales/fr_FR.json @@ -76,7 +76,7 @@ "exit_button_label": "Sortir", "subtitle_partition": "Partition", "title_mountpoint": "Point de Montage", - "title_mountopt": "Options additionnelles de montage", + "title_mountopts": "Options additionnelles de montage", "pika_install_good": "L'installation de PikaOS a bien complété.", "reboot": "Redémarrer", "pika_install_bad": "PikaOS a échoué!\nVeuillez voir les logs pour plus d'info.", diff --git a/locales/it_IT.json b/locales/it_IT.json index c8f5e81..428e536 100644 --- a/locales/it_IT.json +++ b/locales/it_IT.json @@ -76,7 +76,7 @@ "exit_button_label": "", "subtitle_partition": "", "title_mountpoint": "", - "title_mountopt": "", + "title_mountopts": "", "pika_install_good": "", "reboot": "", "pika_install_bad": "", diff --git a/locales/nl_NL.json b/locales/nl_NL.json index feb9f7b..5de81fd 100644 --- a/locales/nl_NL.json +++ b/locales/nl_NL.json @@ -76,7 +76,7 @@ "exit_button_label": "", "subtitle_partition": "", "title_mountpoint": "", - "title_mountopt": "", + "title_mountopts": "", "pika_install_good": "", "reboot": "", "pika_install_bad": "", diff --git a/locales/sv_SE.json b/locales/sv_SE.json index 43874c5..adf4b3c 100644 --- a/locales/sv_SE.json +++ b/locales/sv_SE.json @@ -76,7 +76,7 @@ "exit_button_label": "", "subtitle_partition": "", "title_mountpoint": "", - "title_mountopt": "", + "title_mountopts": "", "pika_install_good": "", "reboot": "", "pika_install_bad": "", diff --git a/locales/tr_TR.json b/locales/tr_TR.json index feb9f7b..5de81fd 100644 --- a/locales/tr_TR.json +++ b/locales/tr_TR.json @@ -76,7 +76,7 @@ "exit_button_label": "", "subtitle_partition": "", "title_mountpoint": "", - "title_mountopt": "", + "title_mountopts": "", "pika_install_good": "", "reboot": "", "pika_install_bad": "", diff --git a/src/drive_mount_row/imp.rs b/src/drive_mount_row/imp.rs index 0232b72..343a476 100644 --- a/src/drive_mount_row/imp.rs +++ b/src/drive_mount_row/imp.rs @@ -87,8 +87,8 @@ impl ObjectImpl for DriveMountRow { .width_request(300) .build(); - let mountopt_entry_row = gtk::Entry::builder() - .placeholder_text(t!("title_mountopt")) + let mountopts_entry_row = gtk::Entry::builder() + .placeholder_text(t!("title_mountopts")) .hexpand(true) .vexpand(true) .margin_start(10) @@ -126,7 +126,7 @@ impl ObjectImpl for DriveMountRow { action_row_content_box.append(&mountpoint_entry_row); - action_row_content_box.append(&mountopt_entry_row); + action_row_content_box.append(&mountopts_entry_row); obj.add_prefix(&action_row_content_box); @@ -145,7 +145,7 @@ impl ObjectImpl for DriveMountRow { .bidirectional() .build(); - obj.bind_property("mountopt", &mountopt_entry_row, "text") + obj.bind_property("mountopts", &mountopts_entry_row, "text") .sync_create() .bidirectional() .build(); diff --git a/src/drive_mount_row/mod.rs b/src/drive_mount_row/mod.rs index 4c70d91..93daf1b 100644 --- a/src/drive_mount_row/mod.rs +++ b/src/drive_mount_row/mod.rs @@ -24,7 +24,7 @@ impl DriveMountRow { FstabEntry{ partition: self.partition(), mountpoint: self.mountpoint(), - mountopt: self.mountopts() + mountopts: self.mountopts() } } } diff --git a/src/main.rs b/src/main.rs index e7c8834..b18fb2c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ use std::env; -use gtk::{CssProvider, gdk, STYLE_PROVIDER_PRIORITY_APPLICATION, prelude::*}; +use gtk::{CssProvider, gdk, STYLE_PROVIDER_PRIORITY_APPLICATION, prelude::*, glib as glib}; use gdk::{Display}; mod config; mod build_ui; @@ -16,7 +16,6 @@ mod timezone_page; mod partitioning_page; mod automatic_partitioning_page; mod manual_partitioning_page; -mod fstab_entry; mod drive_mount_row; #[macro_use] diff --git a/src/partitioning_page/mod.rs b/src/partitioning_page/mod.rs index f50f6cd..f648eda 100644 --- a/src/partitioning_page/mod.rs +++ b/src/partitioning_page/mod.rs @@ -151,7 +151,7 @@ pub struct Partition { pub struct FstabEntry { pub partition: String, pub mountpoint: String, - pub mountopt: String, + pub mountopts: String, } pub struct CrypttabEntry {