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": "",

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Проверете логовете за повече информация.",

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": "",

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.",

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.",

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.",

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": "",

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": "",

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": "",

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": "",

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()
+        let mountopts_entry_row = gtk::Entry::builder()
-            .placeholder_text(t!("title_mountopt"))
+            .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();

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()
         }
     }
 }

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]

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 {