Merge branch 'master' into danirabbit/gtk4

elementary · Mar 11, 2024 · aeb3dbf · aeb3dbf
2 parents de05f55 + ad6fb18
commit aeb3dbf
Show file tree

Hide file tree

Showing 19 changed files with 217 additions and 184 deletions.
diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml
@@ -40,7 +40,7 @@ jobs:
           cp ../*.deb output/
 
       - name: Save .deb package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: deb-files
           path: output/*.deb
diff --git 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: 2023-08-24 17:42+0000\n"
-"PO-Revision-Date: 2023-03-12 12:25+0000\n"
+"PO-Revision-Date: 2024-03-08 08:12+0000\n"
 "Last-Translator: NorwayFun <[email protected]>\n"
 "Language-Team: Georgian <https://l10n.elementary.io/projects/installer/"
 "installer/ka/>\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 4.14.2\n"
+"X-Generator: Weblate 5.0.2\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:40+0000\n"
 
 #: src/Application.vala:42
@@ -21,10 +21,8 @@ msgid "Install %s"
 msgstr "%s-ის დაყენება"
 
 #: src/Application.vala:61
-#, fuzzy
-#| msgid "%s has been installed"
 msgid "operating system is being installed"
-msgstr "\"%s\" დაყენებულია"
+msgstr "მიმდინარეობს ოპერაციული სისტემის დაყენება"
 
 #: src/MainWindow.vala:262
 msgid "Connect to a Power Source"
@@ -84,6 +82,8 @@ msgstr "ვირტუალური მანქანა"
 #, c-format
 msgid "Some parts of %s may run slowly, freeze, or not function properly."
 msgstr ""
+"%s-ის ზოგიერთი ნაწილი შეიძლება, ნელი იყოს, ჭედავდეს, ან არასწორად "
+"ფუნქციონირებდეს."
 
 #: src/Views/CheckView.vala:68
 msgid "Your Device May Be Too Slow"
@@ -135,10 +135,8 @@ msgid "Next"
 msgstr "შემდეგი"
 
 #: src/Views/DriversView.vala:27
-#, fuzzy
-#| msgid "Partitioning Drive"
 msgid "Additional Drivers"
-msgstr "დისკის დაყოფა"
+msgstr "დამატებითი დრაივერები"
 
 #: src/Views/DriversView.vala:32
 msgid ""
@@ -156,6 +154,7 @@ msgstr ""
 #: src/Views/DriversView.vala:54
 msgid "An Internet connection is required to install NVIDIA® graphics drivers."
 msgstr ""
+"NVIDIA®-ის გრაფიკული დრაივერების დასაყენებლად ინტერნეტკავშირი აუცილებელია."
 
 #: src/Views/DriversView.vala:65
 msgid ""
@@ -257,11 +256,11 @@ msgstr "სცადეთ, თავიდან დააყენოთ"
 
 #: src/Views/ErrorView.vala:59
 msgid "Use Demo Mode and try to manually recover"
-msgstr ""
+msgstr "გამოიყენეთ საცდელი რეჟიმი და სცადეთ, ხელით აღადგინოთ"
 
 #: src/Views/ErrorView.vala:69
 msgid "Restart the device and boot from another drive"
-msgstr ""
+msgstr "გადატვირთეთ მოწყობილობა და ჩაიტვირთეთ სხვა დისკიდან"
 
 #: src/Views/ErrorView.vala:79
 msgid "Details"
@@ -324,7 +323,7 @@ msgstr ""
 #. Device is in BIOS mode, so we just require a root partition
 #: src/Views/PartitioningView.vala:58
 msgid "You must at least select a <b>Root (/)</b> partition."
-msgstr ""
+msgstr "სულ ცოტა, <b>საწყისი (/)</b> დანაყოფი უნდა შექმნათ."
 
 #. Device is in EFI mode, so we also require a boot partition
 #: src/Views/PartitioningView.vala:62
@@ -335,7 +334,7 @@ msgstr ""
 
 #: src/Views/PartitioningView.vala:66
 msgid "It is also recommended to select a <b>Swap</b> partition."
-msgstr ""
+msgstr "ასევე, რეკომენდებულია, <b>სვოპის</b> დანაყოფიც შექმნათ."
 
 #: src/Views/PartitioningView.vala:118
 msgid "Modify Partitions…"
@@ -402,7 +401,7 @@ msgstr "დისკის წაშლა და დაყენება"
 #: src/Views/TryInstallView.vala:49
 #, c-format
 msgid "Erase everything and install a fresh copy of %s."
-msgstr ""
+msgstr "ყველაფრის წაშლა და %s-ის დაყენება."
 
 #: src/Views/TryInstallView.vala:55
 msgid "Custom Install (Advanced)"
@@ -489,7 +488,7 @@ msgstr "ფორმატი"
 
 #: src/Widgets/PartitionMenu.vala:61
 msgid "Delete all data and set up a new file system"
-msgstr ""
+msgstr "მონაცემების წაშლა და ახალი ფაილური სისტემის აწყობა"
 
 #: src/Widgets/PartitionMenu.vala:64
 msgid "Use as:"

diff --git a/po/th.po b/po/th.po
@@ -3,59 +3,63 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-08-24 17:42+0000\n"
-"PO-Revision-Date: 2016-05-27 15:29+0000\n"
-"Last-Translator: Maxwell Barvian <Unknown>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
-"Language: \n"
+"PO-Revision-Date: 2024-03-01 20:12+0000\n"
+"Last-Translator: Aefgh Threenine <[email protected]>\n"
+"Language-Team: Thai <https://l10n.elementary.io/projects/installer/installer/"
+"th/>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 5.0.2\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:41+0000\n"
-"X-Generator: Launchpad (build 18204)\n"
 
 #: src/Application.vala:42
 #, c-format
 msgid "Install %s"
-msgstr ""
+msgstr "ติดตั้ง %s"
 
 #: src/Application.vala:61
 msgid "operating system is being installed"
 msgstr ""
 
 #: src/MainWindow.vala:262
 msgid "Connect to a Power Source"
-msgstr ""
+msgstr "ต่อแหล่งจ่ายไฟ"
 
 #: src/MainWindow.vala:263
 msgid ""
 "Your device is running on battery power. It's recommended to be plugged in "
 "while installing."
 msgstr ""
+"อุปกรณ์ของคุณกำลังทำงานโดยใช้พลังงานจากแบตเตอรี่ "
+"ขอแนะนำให้เสียบปลั๊กอุปกรณ์ขณะทำการติดตั้ง"
 
 #: src/Utils.vala:34
 msgid "Test mode shutdown"
-msgstr ""
+msgstr "การปิดเครื่องในโหมดทดสอบ"
 
 #: src/Utils.vala:48
 msgid "Test mode reboot"
-msgstr ""
+msgstr "การรีบูตในโหมดทดสอบ"
 
 #: src/Utils.vala:74
 msgid "Test mode switch user"
-msgstr ""
+msgstr "การสลับผู้ใช้ในโหมดทดสอบ"
 
 #: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:221
 #, c-format
 msgid "%s…"
-msgstr ""
+msgstr "%s…"
 
 #: src/Views/AbstractInstallerView.vala:46
 msgid "Cancel Installation"
-msgstr ""
+msgstr "ยกเลิกการติดตั้ง"
 
 #: src/Views/AbstractInstallerView.vala:55
 msgid "Test Mode"
-msgstr ""
+msgstr "โหมดทดสอบ"
 
 #: src/Views/CheckView.vala:50
 msgid "Before Installing"
@@ -82,7 +86,7 @@ msgstr ""
 
 #: src/Views/CheckView.vala:68
 msgid "Your Device May Be Too Slow"
-msgstr ""
+msgstr "อุปกรณ์ของคุณอาจช้าเกินไป"
 
 #: src/Views/CheckView.vala:69
 msgid "This may cause it to run slowly or freeze."
@@ -94,38 +98,40 @@ msgstr ""
 
 #: src/Views/CheckView.vala:211
 msgid "Recommended:"
-msgstr ""
+msgstr "แนะนำ:"
 
 #: src/Views/CheckView.vala:217
 msgid "Your Device:"
-msgstr ""
+msgstr "อุปกรณ์ของคุณ:"
 
 #: src/Views/CheckView.vala:223 src/Views/CheckView.vala:227
 msgid "Processor:"
-msgstr ""
+msgstr "ตัวประมวลผล:"
 
 #: src/Views/CheckView.vala:239 src/Views/CheckView.vala:243
 msgid "Memory:"
-msgstr ""
+msgstr "หน่วยความจำ:"
 
 #: src/Views/DiskView.vala:46
 msgid "Select a Drive"
-msgstr ""
+msgstr "เลือกไดรฟ์"
 
 #: src/Views/DiskView.vala:52
 msgid ""
 "This will erase all data on the selected drive. If you have not backed your "
 "data up, you can cancel the installation and use Demo Mode."
 msgstr ""
+"นี่จะเป็นการลบข้อมูลทั้งหมดในไดรฟ์ที่เลือก หากคุณยังไม่ได้สำรองข้อมูล "
+"คุณสามารถยกเลิกการติดตั้งและใช้โหมดสาธิตได้"
 
 #: src/Views/DiskView.vala:76 src/Views/PartitioningView.vala:95
 msgid "Getting the current configuration…"
-msgstr ""
+msgstr "กำลังรับข้อมูลการกำหนดค่าปัจจุบัน…"
 
 #: src/Views/DiskView.vala:112 src/Views/PartitioningView.vala:123
 #: src/Views/TryInstallView.vala:88
 msgid "Next"
-msgstr ""
+msgstr "ถัดไป"
 
 #: src/Views/DriversView.vala:27
 msgid "Additional Drivers"
@@ -163,9 +169,8 @@ msgstr ""
 #: src/Views/DriversView.vala:101 src/Views/EncryptView.vala:167
 #: src/Views/KeyboardLayoutView.vala:58 src/Views/PartitioningView.vala:121
 #: src/Views/TryInstallView.vala:86
-#, fuzzy
 msgid "Back"
-msgstr "ลบ"
+msgstr "ย้อนกลับ"
 
 #: src/Views/DriversView.vala:104
 msgid "Erase and Install"
@@ -212,15 +217,15 @@ msgstr ""
 
 #: src/Views/EncryptView.vala:114
 msgid "Choose Encryption Password"
-msgstr ""
+msgstr "เลือกรหัสผ่านการเข้ารหัสลับ"
 
 #: src/Views/EncryptView.vala:128
 msgid "Confirm Password"
-msgstr ""
+msgstr "ยืนยันรหัสผ่าน"
 
 #: src/Views/EncryptView.vala:169
 msgid "Choose Password"
-msgstr ""
+msgstr "เลือกรหัสผ่าน"
 
 #: src/Views/EncryptView.vala:192
 msgid "Set Encryption Password"
@@ -232,7 +237,7 @@ msgstr ""
 
 #: src/Views/ErrorView.vala:32
 msgid "Could Not Install"
-msgstr ""
+msgstr "ไม่สามารถติดตั้งได้"
 
 #: src/Views/ErrorView.vala:37
 #, c-format
@@ -259,51 +264,51 @@ msgstr ""
 
 #: src/Views/ErrorView.vala:114 src/Views/SuccessView.vala:66
 msgid "Restart Device"
-msgstr ""
+msgstr "รีสตาร์ทอุปกรณ์"
 
 #: src/Views/ErrorView.vala:116 src/Views/TryInstallView.vala:39
 msgid "Try Demo Mode"
-msgstr ""
+msgstr "ลองโหมดสาธิต"
 
 #: src/Views/ErrorView.vala:118
 msgid "Try Installing Again"
-msgstr ""
+msgstr "ลองติดตั้งอีกครั้ง"
 
 #: src/Views/KeyboardLayoutView.vala:30
 msgid "Select Keyboard Layout"
 msgstr ""
 
 #: src/Views/KeyboardLayoutView.vala:38
 msgid "Type to test your layout"
-msgstr ""
+msgstr "พิมพ์เพื่อทดสอบผังแป้นพิมพ์ของคุณ"
 
 #: src/Views/KeyboardLayoutView.vala:41
 msgid "Show keyboard layout"
-msgstr ""
+msgstr "แสดงผังแป้นพิมพ์"
 
 #: src/Views/KeyboardLayoutView.vala:60 src/Views/LanguageView.vala:111
 msgid "Select"
-msgstr ""
+msgstr "เลือก"
 
 #: src/Views/KeyboardLayoutView.vala:124
 msgid "Default"
-msgstr ""
+msgstr "ค่าเริ่มต้น"
 
 #: src/Views/KeyboardLayoutView.vala:131
 msgid "Input Language"
-msgstr ""
+msgstr "ภาษาป้อนข้อมูล"
 
 #: src/Views/LanguageView.vala:259
 msgid "Languages"
-msgstr ""
+msgstr "ภาษา"
 
 #: src/Views/LanguageView.vala:276
 msgid "Select a Language"
-msgstr ""
+msgstr "เลือกภาษา"
 
 #: src/Views/LanguageView.vala:304 src/Views/LanguageView.vala:349
 msgid "Currently active language"
-msgstr ""
+msgstr "ภาษาที่ใช้งานอยู่ขณะนี้"
 
 #: src/Views/PartitioningView.vala:52
 msgid ""
@@ -377,7 +382,7 @@ msgstr ""
 
 #: src/Views/TryInstallView.vala:28
 msgid "Try or Install"
-msgstr ""
+msgstr "ลองใช้หรือติดตั้ง"
 
 #: src/Views/TryInstallView.vala:41
 msgid ""

diff --git a/src/Views/AbstractInstallerView.vala b/src/Views/AbstractInstallerView.vala
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public abstract class AbstractInstallerView : Gtk.Grid {
+public abstract class AbstractInstallerView : Gtk.Box {
     public bool cancellable { get; construct; }
 
     public signal void cancel ();
@@ -31,7 +31,8 @@ public abstract class AbstractInstallerView : Gtk.Grid {
         content_area = new Gtk.Grid () {
             column_spacing = 12,
             row_spacing = 12,
-            expand = true,
+            hexpand = true,
+            vexpand = true,
             orientation = Gtk.Orientation.VERTICAL
         };
 
@@ -60,8 +61,8 @@ public abstract class AbstractInstallerView : Gtk.Grid {
             action_area.set_child_secondary (test_label, true);
         }
 
-        orientation = Gtk.Orientation.VERTICAL;
-        row_spacing = 24;
+        orientation = VERTICAL;
+        spacing = 24;
         margin_top = 12;
         margin_bottom = 12;
         add (content_area);