Skip to content

Commit

Permalink
Merge branch 'master' into danirabbit/rm-gnomekbd
Browse files Browse the repository at this point in the history
  • Loading branch information
@danirabbit
danirabbit authored Mar 4, 2024
2 parents 15f512a + 63fe8dc commit 0dcf16b
Show file tree
Hide file tree
Showing 17 changed files with 203 additions and 169 deletions.
83 changes: 44 additions & 39 deletions po/th.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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."
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -232,7 +237,7 @@ msgstr ""

#: src/Views/ErrorView.vala:32
msgid "Could Not Install"
msgstr ""
msgstr "ไม่สามารถติดตั้งได้"

#: src/Views/ErrorView.vala:37
#, c-format
Expand All @@ -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 ""
Expand Down Expand Up @@ -377,7 +382,7 @@ msgstr ""

#: src/Views/TryInstallView.vala:28
msgid "Try or Install"
msgstr ""
msgstr "ลองใช้หรือติดตั้ง"

#: src/Views/TryInstallView.vala:41
msgid ""
Expand Down
9 changes: 5 additions & 4 deletions src/Views/AbstractInstallerView.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ();
Expand All @@ -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
};

Expand Down Expand Up @@ -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);
Expand Down
33 changes: 14 additions & 19 deletions src/Views/DiskView.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

public class Installer.DiskView : AbstractInstallerView {
private Gtk.Button next_button;
private Gtk.Grid disk_grid;
private Gtk.Box disk_box;
private Gtk.Stack load_stack;

public DiskView () {
Expand All @@ -38,9 +38,9 @@ public class Installer.DiskView : AbstractInstallerView {
};

var image_overlay = new Gtk.Overlay () {
valign = Gtk.Align.END
child = install_image,
valign = END
};
image_overlay.add (install_image);
image_overlay.add_overlay (install_badge);

var install_label = new Gtk.Label (_("Select a Drive")) {
Expand All @@ -56,16 +56,13 @@ public class Installer.DiskView : AbstractInstallerView {
xalign = 0
};

disk_grid = new Gtk.Grid () {
orientation = Gtk.Orientation.VERTICAL,
row_spacing = 6
};
disk_box = new Gtk.Box (VERTICAL, 6);

var disk_scrolled = new Gtk.ScrolledWindow (null, null) {
child = disk_box,
hscrollbar_policy = Gtk.PolicyType.NEVER,
propagate_natural_height = true
};
disk_scrolled.add (disk_grid);

var load_spinner = new Gtk.Spinner () {
halign = Gtk.Align.CENTER,
Expand All @@ -79,19 +76,17 @@ public class Installer.DiskView : AbstractInstallerView {
};
load_label.get_style_context ().add_class (Granite.STYLE_CLASS_H3_LABEL);

var load_grid = new Gtk.Grid () {
halign = Gtk.Align.CENTER,
valign = Gtk.Align.CENTER,
orientation = Gtk.Orientation.VERTICAL,
row_spacing = 12
var load_box = new Gtk.Box (VERTICAL, 12) {
halign = CENTER,
valign = CENTER
};
load_grid.add (load_spinner);
load_grid.add (load_label);
load_box.add (load_spinner);
load_box.add (load_label);

load_stack = new Gtk.Stack () {
transition_type = Gtk.StackTransitionType.CROSSFADE
};
load_stack.add (load_grid);
load_stack.add (load_box);
load_stack.add_named (disk_scrolled, "disk");

var title_grid = new Gtk.Grid () {
Expand Down Expand Up @@ -180,15 +175,15 @@ public class Installer.DiskView : AbstractInstallerView {

foreach (DiskButton disk_button in enabled_buttons) {
disk_button.group = no_selection;
disk_grid.add (disk_button);
disk_box.add (disk_button);
}

foreach (DiskButton disk_button in disabled_buttons) {
disk_button.group = no_selection;
disk_grid.add (disk_button);
disk_box.add (disk_button);
}

disk_grid.show_all ();
disk_box.show_all ();
load_stack.set_visible_child_name ("disk");
}
}
Loading

0 comments on commit 0dcf16b

Please sign in to comment.