From e874a804de52eca000a4179015c02300453ddc46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 3 Oct 2024 16:05:34 +0200 Subject: [PATCH 1/5] libadwaita: Bump version to the latest stable version in 1.5 branch --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 0d31343..ae7dd39 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -605,7 +605,7 @@ parts: libadwaita: source: https://gitlab.gnome.org/GNOME/libadwaita.git - source-tag: '1.5.2' + source-tag: '1.5.4' source-depth: 1 after: [ meson-deps, gtk4 ] plugin: meson From 24a192296852411bf7998b86df447d94dcf2cb7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 3 Oct 2024 12:15:33 +0200 Subject: [PATCH 2/5] libadwaita/patches/accent-colors: Fix contrast color computation This is what we're doing in the debian patch for a while now, there are no resulting changes for the computed yaru colors, but it improves links readability. --- ...e-manager-Support-Yaru-accent-colors.patch | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/patches/style-manager-Support-Yaru-accent-colors.patch b/patches/style-manager-Support-Yaru-accent-colors.patch index 3af09fe..9439943 100644 --- a/patches/style-manager-Support-Yaru-accent-colors.patch +++ b/patches/style-manager-Support-Yaru-accent-colors.patch @@ -1,3 +1,8 @@ +From 7d0ef8ee28284922c4ae87fcbc2aa6f0fe591806 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= +Date: Tue, 5 Apr 2022 16:00:46 +0200 +Subject: [PATCH] style-manager: Support Yaru accent colors + Generate the libadwaita color schemes using Yaru accent colors. Then, when the Yaru theme is used in the system, use the generated variant instead of the default one. @@ -1020,10 +1025,10 @@ index 00000000..4055eb81 \ No newline at end of file diff --git a/src/stylesheet/yaru_accent_colors.scss b/src/stylesheet/yaru_accent_colors.scss new file mode 100644 -index 00000000..a1aa8ee7 +index 00000000..466b0a81 --- /dev/null +++ b/src/stylesheet/yaru_accent_colors.scss -@@ -0,0 +1,75 @@ +@@ -0,0 +1,82 @@ +// Keep this in sync with +// https://github.com/ubuntu/yaru/blob/master/common/accent-colors.scss.in + @@ -1059,6 +1064,7 @@ index 00000000..a1aa8ee7 +$yaru_is_dark_variant: @yaru_dark_variant@; +$yaru_accent_bg_color: get_accent_color('@yaru_accent_color@', $yaru_is_dark_variant); +$accent_bg_color: $yaru_accent_bg_color; ++$accent_fg_color: white; +$accent_color: $yaru_accent_bg_color; +@debug("Accent color is " + $yaru_accent_bg_color); + @@ -1085,14 +1091,20 @@ index 00000000..a1aa8ee7 + @define-color popover_fg_color #{$window-fg-color}; + @define-color thumbnail_fg_color #{$window-fg-color}; + -+ $contrast_target: if($variant=='light', 4.5, 4.8); ++ $contrast_target: if($variant=='light', 4.51, 4.8); + $yaru-accent-color: optimize-contrast($window-bg-color, + $yaru_accent_bg_color, $target: $contrast_target); ++ $yaru_accent_bg_color: optimize-contrast($accent_fg_color, ++ $yaru_accent_bg_color, $target: $contrast_target); + @define-color yaru_accent_color #{$yaru-accent-color}; + @define-color yaru_accent_bg_color #{$yaru_accent_bg_color}; + @define-color accent_color #{$yaru-accent-color}; ++ @define-color accent_bg_color #{$yaru_accent_bg_color}; ++ ++ @debug("Accent optimized colors for @yaru_accent_color@ are accent " + ++ $yaru-accent-color + ", bg " + $yaru-accent-bg-color); + -+ $contrast_target: if($variant=='light', 4.5, 6); ++ $contrast_target: if($variant=='light', 6, 5.5); + $link-color: optimize-contrast($window-bg-color, + $accent-color, $target: $contrast_target); + $link-visited-color: gtkmix($link-color, $window-fg-color, 80%) !default; From b809c9ca253cadfb4e2adecb9618c075eec2715a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 3 Oct 2024 12:20:22 +0200 Subject: [PATCH 3/5] libadwaita/patches/accent-color: Add yellow accent support This is a new upstream accent color and we should support it in the snap so that applications running in ubuntu >= 22.10 can use the same accent that was configured in settings --- ...yle-manager-Support-Yaru-accent-colors.patch | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/patches/style-manager-Support-Yaru-accent-colors.patch b/patches/style-manager-Support-Yaru-accent-colors.patch index 9439943..3002aec 100644 --- a/patches/style-manager-Support-Yaru-accent-colors.patch +++ b/patches/style-manager-Support-Yaru-accent-colors.patch @@ -1,4 +1,4 @@ -From 7d0ef8ee28284922c4ae87fcbc2aa6f0fe591806 Mon Sep 17 00:00:00 2001 +From 248e68733a6fbc455da30d36f6c913edbe6c1f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 5 Apr 2022 16:00:46 +0200 Subject: [PATCH] style-manager: Support Yaru accent colors @@ -682,10 +682,10 @@ index 98a07acf..0d86a06f 100644 assets/bullet-symbolic.symbolic.png assets/bullet@2-symbolic.symbolic.png diff --git a/src/stylesheet/meson.build b/src/stylesheet/meson.build -index 56466c1c..8f56cccc 100644 +index 56466c1c..a77302f6 100644 --- a/src/stylesheet/meson.build +++ b/src/stylesheet/meson.build -@@ -2,14 +2,66 @@ fs = import('fs') +@@ -2,14 +2,67 @@ fs = import('fs') stylesheet_deps = [] @@ -703,6 +703,7 @@ index 56466c1c..8f56cccc 100644 + 'purple', + 'magenta', + 'red', ++ 'yellow', + ] + + yaru_accent_colors_sassc += configure_file( @@ -753,7 +754,7 @@ index 56466c1c..8f56cccc 100644 if sassc.found() sassc_opts = [ '-a', '-M', '-t', 'compact' ] -@@ -72,10 +124,21 @@ if not fs.exists('base.css') +@@ -72,10 +125,21 @@ if not fs.exists('base.css') 'defaults-dark', ] @@ -778,7 +779,7 @@ index 56466c1c..8f56cccc 100644 command: [ sassc, sassc_opts, '@INPUT@', '@OUTPUT@', ], -@@ -85,9 +148,24 @@ if not fs.exists('base.css') +@@ -85,9 +149,24 @@ if not fs.exists('base.css') endif endif @@ -1025,10 +1026,10 @@ index 00000000..4055eb81 \ No newline at end of file diff --git a/src/stylesheet/yaru_accent_colors.scss b/src/stylesheet/yaru_accent_colors.scss new file mode 100644 -index 00000000..466b0a81 +index 00000000..d3ea98e1 --- /dev/null +++ b/src/stylesheet/yaru_accent_colors.scss -@@ -0,0 +1,82 @@ +@@ -0,0 +1,84 @@ +// Keep this in sync with +// https://github.com/ubuntu/yaru/blob/master/common/accent-colors.scss.in + @@ -1054,6 +1055,8 @@ index 00000000..466b0a81 + $color: #B34CB3; + } @else if $accent_color == 'red' { + $color: #DA3450; ++ } @else if $accent_color == 'yellow' { ++ $color: #C88800; + } @else { + @error('No known accent color defined!'); + } From 340bc10bf99cac4c43d9f3f515590c9e766373ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 3 Oct 2024 16:03:21 +0200 Subject: [PATCH 4/5] libadwaita/patches: Add wartybrown accent color The Ubuntu 20th anniversary color has to be supported! This patch is only needed until 22.10 EOL. --- ...e-manager-Support-Yaru-accent-colors.patch | 18 ++++---- ...ylesheet-Add-wartybrown-accent-color.patch | 44 +++++++++++++++++++ snapcraft.yaml | 1 + 3 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 patches/stylesheet-Add-wartybrown-accent-color.patch diff --git a/patches/style-manager-Support-Yaru-accent-colors.patch b/patches/style-manager-Support-Yaru-accent-colors.patch index 3002aec..f03c7d4 100644 --- a/patches/style-manager-Support-Yaru-accent-colors.patch +++ b/patches/style-manager-Support-Yaru-accent-colors.patch @@ -1,4 +1,4 @@ -From 248e68733a6fbc455da30d36f6c913edbe6c1f11 Mon Sep 17 00:00:00 2001 +From 0686cf22563f291e1e65e750748848568a7e17aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 5 Apr 2022 16:00:46 +0200 Subject: [PATCH] style-manager: Support Yaru accent colors @@ -27,10 +27,10 @@ index b95d0ae4..4c51f2a3 100644 + description: 'Mimic Yaru accent colors') \ No newline at end of file diff --git a/src/adw-settings-impl-portal.c b/src/adw-settings-impl-portal.c -index 9f9fbf7c..be2466e2 100644 +index 7f50a79c..585117fe 100644 --- a/src/adw-settings-impl-portal.c +++ b/src/adw-settings-impl-portal.c -@@ -233,3 +233,28 @@ adw_settings_impl_portal_new (gboolean enable_color_scheme, +@@ -253,3 +253,28 @@ adw_settings_impl_portal_new (gboolean enable_color_scheme, return ADW_SETTINGS_IMPL (self); } @@ -510,10 +510,10 @@ index d27ebda5..59da0dcb 100644 } diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss -index 32df08f8..118b5e5b 100644 +index 614055c5..e246c2f9 100644 --- a/src/stylesheet/_colors.scss +++ b/src/stylesheet/_colors.scss -@@ -127,3 +127,9 @@ $strong_disabled_opacity: 0.3; +@@ -129,3 +129,9 @@ $strong_disabled_opacity: 0.3; $trough_active_color: gtkalpha(currentColor, .5); $window_outline_color: transparentize(white, .7); } @@ -525,7 +525,7 @@ index 32df08f8..118b5e5b 100644 +} \ No newline at end of file diff --git a/src/stylesheet/_defaults.scss b/src/stylesheet/_defaults.scss -index 76cc94d5..8a0f88cd 100644 +index a262a989..1d926ebc 100644 --- a/src/stylesheet/_defaults.scss +++ b/src/stylesheet/_defaults.scss @@ -8,10 +8,13 @@ @@ -682,7 +682,7 @@ index 98a07acf..0d86a06f 100644 assets/bullet-symbolic.symbolic.png assets/bullet@2-symbolic.symbolic.png diff --git a/src/stylesheet/meson.build b/src/stylesheet/meson.build -index 56466c1c..a77302f6 100644 +index 563cafcc..1c93e67c 100644 --- a/src/stylesheet/meson.build +++ b/src/stylesheet/meson.build @@ -2,14 +2,67 @@ fs = import('fs') @@ -754,7 +754,7 @@ index 56466c1c..a77302f6 100644 if sassc.found() sassc_opts = [ '-a', '-M', '-t', 'compact' ] -@@ -72,10 +125,21 @@ if not fs.exists('base.css') +@@ -73,10 +126,21 @@ if not fs.exists('base.css') 'defaults-dark', ] @@ -779,7 +779,7 @@ index 56466c1c..a77302f6 100644 command: [ sassc, sassc_opts, '@INPUT@', '@OUTPUT@', ], -@@ -85,9 +149,24 @@ if not fs.exists('base.css') +@@ -86,9 +150,24 @@ if not fs.exists('base.css') endif endif diff --git a/patches/stylesheet-Add-wartybrown-accent-color.patch b/patches/stylesheet-Add-wartybrown-accent-color.patch new file mode 100644 index 0000000..2b603b6 --- /dev/null +++ b/patches/stylesheet-Add-wartybrown-accent-color.patch @@ -0,0 +1,44 @@ +From f9180c67551dcd8ac1be2d143f4a784d8751c40e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= +Date: Thu, 3 Oct 2024 12:21:53 +0200 +Subject: [PATCH] stylesheet: Add wartybrown accent color + +The Ubuntu 20th anniversary color has to be supported! + +This patch is only needed until 22.10 EOL. + +diff --git a/src/stylesheet/meson.build b/src/stylesheet/meson.build +index 1c93e67c..1d7d4a2b 100644 +--- a/src/stylesheet/meson.build ++++ b/src/stylesheet/meson.build +@@ -16,6 +16,7 @@ if get_option('yaru-accent-colors') + 'purple', + 'magenta', + 'red', ++ 'wartybrown', + 'yellow', + ] + +diff --git a/src/stylesheet/yaru_accent_colors.scss b/src/stylesheet/yaru_accent_colors.scss +index d3ea98e1..a570f5b8 100644 +--- a/src/stylesheet/yaru_accent_colors.scss ++++ b/src/stylesheet/yaru_accent_colors.scss +@@ -23,6 +23,8 @@ + $color: #B34CB3; + } @else if $accent_color == 'red' { + $color: #DA3450; ++ } @else if $accent_color == 'wartybrown' { ++ $color: #B39169; + } @else if $accent_color == 'yellow' { + $color: #C88800; + } @else { +@@ -49,6 +51,9 @@ $accent_color: $yaru_accent_bg_color; + @if str-contains('@yaru_theme_entry_point@', 'stylesheet/defaults') { + $window-bg-color: if($variant == 'light', #FAFAFA, lighten($jet, 8%)); + $window-fg-color: if($variant == 'light', $inkstone, $porcelain); ++ @if @yaru_accent_color@ == 'wartybrown' and $variant == 'light' { ++ $window-bg-color: #eeeeee; ++ } + @define-color window_bg_color #{$window-bg-color}; + @define-color window_fg_color #{$window-fg-color}; + diff --git a/snapcraft.yaml b/snapcraft.yaml index ae7dd39..38bc0cf 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -629,6 +629,7 @@ parts: override-pull: | craftctl default patch -p1 < $CRAFT_PROJECT_DIR/patches/style-manager-Support-Yaru-accent-colors.patch + patch -p1 < $CRAFT_PROJECT_DIR/patches/stylesheet-Add-wartybrown-accent-color.patch libportal: after: [gtk3, gtk4, gtk-locales, meson-deps ] From 3cc03c87052def1aa2bbdda1ecf0ae97ef534dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 3 Oct 2024 16:10:01 +0200 Subject: [PATCH 5/5] libadwaita: Cherry-pick upstream patches from 1.5 branch These are not yet released but safe enough --- patches/libadwaita-add-thai-translation.patch | 475 ++++++++++++++++ ...-skip-middle-clicks-on-different-tab.patch | 105 ++++ .../libadwaita-update-thai-translation.patch | 506 ++++++++++++++++++ snapcraft.yaml | 3 + 4 files changed, 1089 insertions(+) create mode 100644 patches/libadwaita-add-thai-translation.patch create mode 100644 patches/libadwaita-tab-box-skip-middle-clicks-on-different-tab.patch create mode 100644 patches/libadwaita-update-thai-translation.patch diff --git a/patches/libadwaita-add-thai-translation.patch b/patches/libadwaita-add-thai-translation.patch new file mode 100644 index 0000000..e667eaf --- /dev/null +++ b/patches/libadwaita-add-thai-translation.patch @@ -0,0 +1,475 @@ +From f0cf339fb264965e968122cf184d8795e10178d7 Mon Sep 17 00:00:00 2001 +From: Aefgh Threenine +Date: Sat, 21 Sep 2024 14:17:18 +0000 +Subject: [PATCH] Add Thai translation + + +diff --git a/po/LINGUAS b/po/LINGUAS +index 121af409..f46e699b 100644 +--- a/po/LINGUAS ++++ b/po/LINGUAS +@@ -42,6 +42,7 @@ sk + sl + sr + sv ++th + tr + uk + vi +diff --git a/po/th.po b/po/th.po +new file mode 100644 +index 00000000..61bdeebd +--- /dev/null ++++ b/po/th.po +@@ -0,0 +1,451 @@ ++# Thai translation for libadwaita. ++# Copyright (C) 2024 libadwaita's COPYRIGHT HOLDER ++# This file is distributed under the same license as the libadwaita package. ++# Atirut Wattanamongkol , 2024. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: libadwaita libadwaita-1-6\n" ++"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libadwaita/issues\n" ++"POT-Creation-Date: 2024-09-21 14:15+0000\n" ++"PO-Revision-Date: 2024-09-21 21:14+0700\n" ++"Last-Translator: Atirut Wattanamongkol \n" ++"Language-Team: Thai \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: Poedit 3.5\n" ++ ++#: src/adw-about-dialog.c:207 src/adw-about-window.c:207 ++msgid "GNU General Public License, version 2 or later" ++msgstr "" ++ ++#: src/adw-about-dialog.c:208 src/adw-about-window.c:208 ++msgid "GNU General Public License, version 3 or later" ++msgstr "" ++ ++#: src/adw-about-dialog.c:209 src/adw-about-window.c:209 ++msgid "GNU Lesser General Public License, version 2.1 or later" ++msgstr "" ++ ++#: src/adw-about-dialog.c:210 src/adw-about-window.c:210 ++msgid "GNU Lesser General Public License, version 3 or later" ++msgstr "" ++ ++#: src/adw-about-dialog.c:211 src/adw-about-window.c:211 ++msgid "BSD 2-Clause License" ++msgstr "" ++ ++#: src/adw-about-dialog.c:212 src/adw-about-window.c:212 ++msgid "The MIT License (MIT)" ++msgstr "" ++ ++#: src/adw-about-dialog.c:213 src/adw-about-window.c:213 ++msgid "Artistic License 2.0" ++msgstr "" ++ ++#: src/adw-about-dialog.c:214 src/adw-about-window.c:214 ++msgid "GNU General Public License, version 2 only" ++msgstr "" ++ ++#: src/adw-about-dialog.c:215 src/adw-about-window.c:215 ++msgid "GNU General Public License, version 3 only" ++msgstr "" ++ ++#: src/adw-about-dialog.c:216 src/adw-about-window.c:216 ++msgid "GNU Lesser General Public License, version 2.1 only" ++msgstr "" ++ ++#: src/adw-about-dialog.c:217 src/adw-about-window.c:217 ++msgid "GNU Lesser General Public License, version 3 only" ++msgstr "" ++ ++#: src/adw-about-dialog.c:218 src/adw-about-window.c:218 ++msgid "GNU Affero General Public License, version 3 or later" ++msgstr "" ++ ++#: src/adw-about-dialog.c:219 src/adw-about-window.c:219 ++msgid "GNU Affero General Public License, version 3 only" ++msgstr "" ++ ++#: src/adw-about-dialog.c:220 src/adw-about-window.c:220 ++msgid "BSD 3-Clause License" ++msgstr "" ++ ++#: src/adw-about-dialog.c:221 src/adw-about-window.c:221 ++msgid "Apache License, Version 2.0" ++msgstr "" ++ ++#: src/adw-about-dialog.c:222 src/adw-about-window.c:222 ++msgid "Mozilla Public License 2.0" ++msgstr "" ++ ++#: src/adw-about-dialog.c:223 src/adw-about-window.c:223 ++msgid "BSD Zero-Clause License" ++msgstr "" ++ ++#: src/adw-about-dialog.c:571 src/adw-about-window.c:570 ++msgid "Code by" ++msgstr "โค้ดโดย" ++ ++#: src/adw-about-dialog.c:572 src/adw-about-window.c:571 ++msgid "Design by" ++msgstr "ออกแบบโดย" ++ ++#: src/adw-about-dialog.c:573 src/adw-about-window.c:572 ++msgid "Artwork by" ++msgstr "งานศิลปะโดย" ++ ++#: src/adw-about-dialog.c:574 src/adw-about-window.c:573 ++msgid "Documentation by" ++msgstr "เอกสารประกอบโดย" ++ ++#: src/adw-about-dialog.c:575 src/adw-about-window.c:574 ++msgid "Translated by" ++msgstr "แปลโดย" ++ ++#. Translators: this is the license preamble; the string at the end ++#. * contains the name of the license as link text. ++#. ++#: src/adw-about-dialog.c:604 src/adw-about-window.c:603 ++#, c-format ++msgid "" ++"This application comes with absolutely no warranty. See the %s for details." ++msgstr "" ++"แอปพลิเคชันนี้ไม่มีการรับประกันใดๆ ทั้งสิ้น ดูรายละเอียดเพิ่มเติมได้ที่ %s" ++ ++#: src/adw-about-dialog.c:682 src/adw-about-window.c:681 ++msgid "This Application" ++msgstr "" ++ ++#: src/adw-about-dialog.c:984 src/adw-about-window.c:983 ++#, c-format ++msgid "Version %s" ++msgstr "" ++ ++#: src/adw-about-dialog.c:1010 src/adw-about-window.c:1009 ++msgid "Unable to parse release notes:" ++msgstr "" ++ ++#: src/adw-about-dialog.c:1016 src/adw-about-window.c:1015 ++#, c-format ++msgid "Line: %d, character: %d" ++msgstr "" ++ ++#: src/adw-about-dialog.c:1302 src/adw-about-window.c:1301 ++msgid "Copied to clipboard" ++msgstr "" ++ ++#: src/adw-about-dialog.c:1329 src/adw-about-window.c:1329 ++msgid "Unable to save debugging information" ++msgstr "" ++ ++#: src/adw-about-dialog.c:1334 src/adw-about-window.c:1334 ++#: src/adw-sheet-controls.c:127 ++msgid "Close" ++msgstr "" ++ ++#: src/adw-about-dialog.c:1351 src/adw-about-window.c:1350 ++msgid "Save debugging information" ++msgstr "" ++ ++#: src/adw-about-dialog.ui:5 src/adw-about-window.ui:5 ++msgid "About" ++msgstr "" ++ ++#: src/adw-about-dialog.ui:89 src/adw-about-window.ui:92 ++msgid "_What’s New" ++msgstr "มี_อะไรใหม่" ++ ++#: src/adw-about-dialog.ui:105 src/adw-about-window.ui:108 ++msgid "_Details" ++msgstr "_รายละเอียด" ++ ++#: src/adw-about-dialog.ui:121 src/adw-about-dialog.ui:341 ++#: src/adw-about-window.ui:124 src/adw-about-window.ui:344 ++msgid "_Website" ++msgstr "เ_ว็บไซต์" ++ ++#: src/adw-about-dialog.ui:145 src/adw-about-window.ui:148 ++msgid "_Support Questions" ++msgstr "คำถาม_ช่วยเหลือ" ++ ++#: src/adw-about-dialog.ui:162 src/adw-about-window.ui:165 ++msgid "_Report an Issue" ++msgstr "_รายงานปัญหา" ++ ++#: src/adw-about-dialog.ui:178 src/adw-about-window.ui:181 ++msgid "_Troubleshooting" ++msgstr "การแ_ก้ไขปัญหา" ++ ++#: src/adw-about-dialog.ui:198 src/adw-about-window.ui:201 ++msgid "_Credits" ++msgstr "เ_ครดิต" ++ ++#: src/adw-about-dialog.ui:214 src/adw-about-window.ui:217 ++msgid "_Legal" ++msgstr "ข้อมูลทาง_กฎหมาย" ++ ++#: src/adw-about-dialog.ui:230 src/adw-about-window.ui:233 ++msgid "_Acknowledgements" ++msgstr "คำ_ขอบคุณ" ++ ++#: src/adw-about-dialog.ui:260 src/adw-about-window.ui:263 ++msgid "What’s New" ++msgstr "มีอะไรใหม่" ++ ++#: src/adw-about-dialog.ui:303 src/adw-about-window.ui:306 ++msgid "Details" ++msgstr "รายละเอียด" ++ ++#: src/adw-about-dialog.ui:369 src/adw-about-window.ui:372 ++msgid "Troubleshooting" ++msgstr "การแก้ไขปัญหา" ++ ++#: src/adw-about-dialog.ui:392 src/adw-about-window.ui:395 ++msgid "" ++"To assist in troubleshooting, you can view your debugging information. " ++"Providing this information to the application developers can help diagnose " ++"any problems you encounter when you report an issue." ++msgstr "" ++"คุณสามารถดูข้อมูลการดีบักเพื่อช่วยในการแก้ไขปัญหาได้ " ++"การให้ข้อมูลนี้แก่ผู้พัฒนาแอปพลิเคชันจะช่วยวินิจฉัยปัญหาต่าง ๆ ที่คุณพบเมื่อคุณรายงานปัญหา" ++ ++#: src/adw-about-dialog.ui:403 src/adw-about-window.ui:406 ++msgid "_Debugging Information" ++msgstr "ข้อมูลการ_ดีบัก" ++ ++#: src/adw-about-dialog.ui:430 src/adw-about-window.ui:433 ++msgid "Debugging Information" ++msgstr "ข้อมูลการดีบัก" ++ ++#: src/adw-about-dialog.ui:475 src/adw-about-window.ui:478 ++msgid "_Copy Text" ++msgstr "_คัดลอกข้อความ" ++ ++#: src/adw-about-dialog.ui:483 src/adw-about-window.ui:486 ++msgid "_Save As…" ++msgstr "_บันทึกเป็น…" ++ ++#: src/adw-about-dialog.ui:496 src/adw-about-window.ui:499 ++msgid "Credits" ++msgstr "เครดิต" ++ ++#: src/adw-about-dialog.ui:527 src/adw-about-window.ui:530 ++msgid "Legal" ++msgstr "ข้อมูลทางกฎหมาย" ++ ++#: src/adw-about-dialog.ui:559 src/adw-about-window.ui:562 ++msgid "Acknowledgements" ++msgstr "คำขอบคุณ" ++ ++#: src/adw-back-button.c:311 src/adw-back-button.c:409 ++#: src/adw-back-button.c:519 ++msgid "Back" ++msgstr "กลับ" ++ ++#. Translators: This is a placeholder text of the search entry from AdwComboRow. It should be phrased as a verb. ++#: src/adw-combo-row.ui:50 src/adw-preferences-dialog.ui:85 ++#: src/adw-preferences-window.ui:96 ++msgid "Search" ++msgstr "ค้นหา" ++ ++#: src/adw-entry-row.ui:96 ++msgid "Apply" ++msgstr "นำไปใช้" ++ ++#: src/adw-inspector-page.c:98 ++msgid "No Preference" ++msgstr "ไม่กำหนด" ++ ++#: src/adw-inspector-page.c:100 ++msgid "Prefer Dark" ++msgstr "" ++ ++#: src/adw-inspector-page.c:102 ++msgid "Prefer Light" ++msgstr "" ++ ++#: src/adw-inspector-page.c:115 ++msgid "Blue" ++msgstr "" ++ ++#: src/adw-inspector-page.c:117 ++msgid "Teal" ++msgstr "" ++ ++#: src/adw-inspector-page.c:119 ++msgid "Green" ++msgstr "" ++ ++#: src/adw-inspector-page.c:121 ++msgid "Yellow" ++msgstr "" ++ ++#: src/adw-inspector-page.c:123 ++msgid "Orange" ++msgstr "" ++ ++#: src/adw-inspector-page.c:125 ++msgid "Red" ++msgstr "" ++ ++#: src/adw-inspector-page.c:127 ++msgid "Pink" ++msgstr "" ++ ++#: src/adw-inspector-page.c:129 ++msgid "Purple" ++msgstr "" ++ ++#: src/adw-inspector-page.c:131 ++msgid "Slate" ++msgstr "" ++ ++#. Translators: The name of the library, not the stylesheet ++#: src/adw-inspector-page.c:270 ++msgid "Adwaita" ++msgstr "" ++ ++#: src/adw-inspector-page.ui:10 ++msgid "System Appearance" ++msgstr "" ++ ++#: src/adw-inspector-page.ui:11 ++msgid "" ++"Override settings for this application. They will be reset upon closing the " ++"inspector." ++msgstr "" ++ ++#: src/adw-inspector-page.ui:14 ++msgid "System Supports Color Schemes" ++msgstr "" ++ ++#: src/adw-inspector-page.ui:20 ++msgid "Preferred Color Scheme" ++msgstr "" ++ ++#: src/adw-inspector-page.ui:39 ++msgid "Accent Color" ++msgstr "" ++ ++#: src/adw-inspector-page.ui:42 ++msgid "System Supports Accent Colors" ++msgstr "" ++ ++#: src/adw-inspector-page.ui:48 ++msgid "Preferred Accent Color" ++msgstr "" ++ ++#: src/adw-inspector-page.ui:77 ++msgid "Accessibility" ++msgstr "" ++ ++#: src/adw-inspector-page.ui:80 ++msgid "High Contrast" ++msgstr "" ++ ++#: src/adw-password-entry-row.c:70 ++msgid "Hide Password" ++msgstr "" ++ ++#: src/adw-password-entry-row.c:74 ++msgid "Show Password" ++msgstr "" ++ ++#: src/adw-password-entry-row.c:168 ++msgid "Caps Lock is on" ++msgstr "" ++ ++#: src/adw-password-entry-row.c:176 ++msgid "_Show Password" ++msgstr "" ++ ++#: src/adw-preferences-dialog.c:256 src/adw-preferences-window.c:261 ++msgid "Untitled page" ++msgstr "" ++ ++#: src/adw-preferences-dialog.ui:5 src/adw-preferences-window.ui:8 ++msgid "Preferences" ++msgstr "" ++ ++#: src/adw-preferences-dialog.ui:70 src/adw-preferences-window.ui:81 ++msgid "Search preferences" ++msgstr "" ++ ++#: src/adw-preferences-dialog.ui:152 src/adw-preferences-window.ui:163 ++msgid "No Results Found" ++msgstr "" ++ ++#: src/adw-preferences-dialog.ui:153 src/adw-tab-overview.ui:111 ++msgid "Try a different search" ++msgstr "" ++ ++#: src/adw-preferences-window.ui:164 ++msgid "Try a different search." ++msgstr "" ++ ++#: src/adw-sheet-controls.c:129 ++msgid "Close the window" ++msgstr "" ++ ++#: src/adw-split-button.c:530 src/adw-split-button.c:1044 ++msgid "More Options" ++msgstr "" ++ ++#: src/adw-tab-button.ui:7 ++msgid "View Open Tabs" ++msgstr "" ++ ++#. Translators: Tab overview title, %u is the number of open tabs ++#: src/adw-tab-overview.c:928 ++#, c-format ++msgid "%u Tab" ++msgid_plural "%u Tabs" ++msgstr[0] "" ++ ++#: src/adw-tab-overview.ui:21 ++msgid "Search Tabs" ++msgstr "" ++ ++#: src/adw-tab-overview.ui:51 ++msgid "Search tabs" ++msgstr "" ++ ++#: src/adw-tab-overview.ui:97 ++msgid "No Open Tabs" ++msgstr "" ++ ++#: src/adw-tab-overview.ui:110 ++msgid "No Tabs Found" ++msgstr "" ++ ++#: src/adw-tab-overview.ui:131 ++msgid "New _Tab" ++msgstr "" ++ ++#: src/adw-tab-thumbnail.ui:39 src/adw-tab.ui:75 ++msgid "Close Tab" ++msgstr "" ++ ++#: src/adw-toast-overlay.c:271 ++#, c-format ++msgid "A toast appeared: %s, has a button: %s" ++msgstr "" ++ ++#: src/adw-toast-overlay.c:274 ++#, c-format ++msgid "A toast appeared: %s" ++msgstr "" ++ ++#: src/adw-toast-overlay.c:276 ++#, c-format ++msgid "A toast appeared, has a button: %s" ++msgstr "" ++ ++#: src/adw-toast-overlay.c:279 ++msgid "A toast appeared" ++msgstr "" diff --git a/patches/libadwaita-tab-box-skip-middle-clicks-on-different-tab.patch b/patches/libadwaita-tab-box-skip-middle-clicks-on-different-tab.patch new file mode 100644 index 0000000..f0ecec5 --- /dev/null +++ b/patches/libadwaita-tab-box-skip-middle-clicks-on-different-tab.patch @@ -0,0 +1,105 @@ +From 66ba72b22864f38c36c542bfdfaf0ae469fc5ae7 Mon Sep 17 00:00:00 2001 +From: Alice Mikhaylenko +Date: Thu, 19 Sep 2024 19:55:34 +0400 +Subject: [PATCH] tab-box/grid: Skip middle clicks if hovering different tab + between press/release + +Fixes https://gitlab.gnome.org/GNOME/libadwaita/-/issues/915 + + +(cherry picked from commit 9079584dd997200a60f046b26949fc761748ce13) + +(cherry picked from commit 21739d348029b53227dd47c82944ce9e3dd7e771) + +diff --git a/src/adw-tab-box.c b/src/adw-tab-box.c +index 0bb6bb2b..8fb570d8 100644 +--- a/src/adw-tab-box.c ++++ b/src/adw-tab-box.c +@@ -163,6 +163,8 @@ struct _AdwTabBox + + GtkWidget *needs_attention_left; + GtkWidget *needs_attention_right; ++ ++ TabInfo *middle_clicked_tab; + }; + + G_DEFINE_FINAL_TYPE_WITH_CODE (AdwTabBox, adw_tab_box, GTK_TYPE_WIDGET, +@@ -1933,6 +1935,9 @@ close_animation_done_cb (TabInfo *info) + if (self->reordered_tab == info) + self->reordered_tab = NULL; + ++ if (self->middle_clicked_tab == info) ++ self->pressed_tab = NULL; ++ + remove_and_free_tab_info (info); + + self->n_tabs--; +@@ -2974,6 +2979,7 @@ pressed_cb (AdwTabBox *self, + button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)); + + if (button == GDK_BUTTON_MIDDLE) { ++ self->middle_clicked_tab = info; + gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_CLAIMED); + + return; +@@ -3017,7 +3023,14 @@ released_cb (AdwTabBox *self, + button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)); + + if (button == GDK_BUTTON_MIDDLE) { ++ if (info != self->middle_clicked_tab) { ++ self->middle_clicked_tab = NULL; ++ gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_DENIED); ++ return; ++ } ++ + adw_tab_view_close_page (self->view, info->page); ++ self->middle_clicked_tab = NULL; + + return; + } +diff --git a/src/adw-tab-grid.c b/src/adw-tab-grid.c +index 93c72324..1cc88e37 100644 +--- a/src/adw-tab-grid.c ++++ b/src/adw-tab-grid.c +@@ -199,6 +199,8 @@ struct _AdwTabGrid + gboolean searching; + + gboolean empty; ++ ++ TabInfo *middle_clicked_tab; + }; + + G_DEFINE_FINAL_TYPE (AdwTabGrid, adw_tab_grid, GTK_TYPE_WIDGET) +@@ -1945,6 +1947,9 @@ close_animation_done_cb (TabInfo *info) + if (self->reordered_tab == info) + self->reordered_tab = NULL; + ++ if (self->middle_clicked_tab == info) ++ self->pressed_tab = NULL; ++ + remove_and_free_tab_info (info); + + self->n_tabs--; +@@ -2925,6 +2930,7 @@ pressed_cb (AdwTabGrid *self, + button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)); + + if (button == GDK_BUTTON_MIDDLE) { ++ self->middle_clicked_tab = info; + gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_CLAIMED); + + return; +@@ -2964,7 +2970,14 @@ released_cb (AdwTabGrid *self, + button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)); + + if (button == GDK_BUTTON_MIDDLE) { ++ if (info != self->middle_clicked_tab) { ++ self->middle_clicked_tab = NULL; ++ gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_DENIED); ++ return; ++ } ++ + adw_tab_view_close_page (self->view, info->page); ++ self->middle_clicked_tab = NULL; + + return; + } diff --git a/patches/libadwaita-update-thai-translation.patch b/patches/libadwaita-update-thai-translation.patch new file mode 100644 index 0000000..efe2ef6 --- /dev/null +++ b/patches/libadwaita-update-thai-translation.patch @@ -0,0 +1,506 @@ +From 1b6c766553a6b9888f540763d1725041dda86800 Mon Sep 17 00:00:00 2001 +From: Aefgh Threenine +Date: Mon, 23 Sep 2024 13:50:26 +0000 +Subject: [PATCH] Update Thai translation + + +diff --git a/po/th.po b/po/th.po +index 61bdeebd..08ba4f5c 100644 +--- a/po/th.po ++++ b/po/th.po +@@ -7,8 +7,8 @@ msgid "" + msgstr "" + "Project-Id-Version: libadwaita libadwaita-1-6\n" + "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libadwaita/issues\n" +-"POT-Creation-Date: 2024-09-21 14:15+0000\n" +-"PO-Revision-Date: 2024-09-21 21:14+0700\n" ++"POT-Creation-Date: 2024-09-21 14:17+0000\n" ++"PO-Revision-Date: 2024-09-23 05:31+0700\n" + "Last-Translator: Atirut Wattanamongkol \n" + "Language-Team: Thai \n" + "Language: th\n" +@@ -18,143 +18,142 @@ msgstr "" + "Plural-Forms: nplurals=1; plural=0;\n" + "X-Generator: Poedit 3.5\n" + +-#: src/adw-about-dialog.c:207 src/adw-about-window.c:207 ++#: src/adw-about-dialog.c:207 src/adw-about-window.c:206 + msgid "GNU General Public License, version 2 or later" +-msgstr "" ++msgstr "GNU General Public License เวอร์ชัน 2 ขึ้นไป" + +-#: src/adw-about-dialog.c:208 src/adw-about-window.c:208 ++#: src/adw-about-dialog.c:208 src/adw-about-window.c:207 + msgid "GNU General Public License, version 3 or later" +-msgstr "" ++msgstr "GNU General Public License เวอร์ชัน 3 ขึ้นไป" + +-#: src/adw-about-dialog.c:209 src/adw-about-window.c:209 ++#: src/adw-about-dialog.c:209 src/adw-about-window.c:208 + msgid "GNU Lesser General Public License, version 2.1 or later" +-msgstr "" ++msgstr "GNU Lesser General Public License เวอร์ชัน 2.1 ขึ้นไป" + +-#: src/adw-about-dialog.c:210 src/adw-about-window.c:210 ++#: src/adw-about-dialog.c:210 src/adw-about-window.c:209 + msgid "GNU Lesser General Public License, version 3 or later" +-msgstr "" ++msgstr "GNU Lesser General Public License เวอร์ชัน 3 ขึ้นไป" + +-#: src/adw-about-dialog.c:211 src/adw-about-window.c:211 ++#: src/adw-about-dialog.c:211 src/adw-about-window.c:210 + msgid "BSD 2-Clause License" +-msgstr "" ++msgstr "BSD 2-Clause License" + +-#: src/adw-about-dialog.c:212 src/adw-about-window.c:212 ++#: src/adw-about-dialog.c:212 src/adw-about-window.c:211 + msgid "The MIT License (MIT)" +-msgstr "" ++msgstr "The MIT License (MIT)" + +-#: src/adw-about-dialog.c:213 src/adw-about-window.c:213 ++#: src/adw-about-dialog.c:213 src/adw-about-window.c:212 + msgid "Artistic License 2.0" +-msgstr "" ++msgstr "Artistic License 2.0" + +-#: src/adw-about-dialog.c:214 src/adw-about-window.c:214 ++#: src/adw-about-dialog.c:214 src/adw-about-window.c:213 + msgid "GNU General Public License, version 2 only" +-msgstr "" ++msgstr "GNU General Public License เวอร์ชัน 2 เท่านั้น" + +-#: src/adw-about-dialog.c:215 src/adw-about-window.c:215 ++#: src/adw-about-dialog.c:215 src/adw-about-window.c:214 + msgid "GNU General Public License, version 3 only" +-msgstr "" ++msgstr "GNU General Public License เวอร์ชัน 3 เท่านั้น" + +-#: src/adw-about-dialog.c:216 src/adw-about-window.c:216 ++#: src/adw-about-dialog.c:216 src/adw-about-window.c:215 + msgid "GNU Lesser General Public License, version 2.1 only" +-msgstr "" ++msgstr "GNU Lesser General Public License เวอร์ชัน 2.1 เท่านั้น" + +-#: src/adw-about-dialog.c:217 src/adw-about-window.c:217 ++#: src/adw-about-dialog.c:217 src/adw-about-window.c:216 + msgid "GNU Lesser General Public License, version 3 only" +-msgstr "" ++msgstr "GNU Lesser General Public License เวอร์ชัน 3 เท่านั้น" + +-#: src/adw-about-dialog.c:218 src/adw-about-window.c:218 ++#: src/adw-about-dialog.c:218 src/adw-about-window.c:217 + msgid "GNU Affero General Public License, version 3 or later" +-msgstr "" ++msgstr "GNU Affero General Public License เวอร์ชัน 3 ขึ้นไป" + +-#: src/adw-about-dialog.c:219 src/adw-about-window.c:219 ++#: src/adw-about-dialog.c:219 src/adw-about-window.c:218 + msgid "GNU Affero General Public License, version 3 only" +-msgstr "" ++msgstr "GNU Affero General Public License เวอร์ชัน 3 เท่านั้น" + +-#: src/adw-about-dialog.c:220 src/adw-about-window.c:220 ++#: src/adw-about-dialog.c:220 src/adw-about-window.c:219 + msgid "BSD 3-Clause License" +-msgstr "" ++msgstr "BSD 3-Clause License" + +-#: src/adw-about-dialog.c:221 src/adw-about-window.c:221 ++#: src/adw-about-dialog.c:221 src/adw-about-window.c:220 + msgid "Apache License, Version 2.0" +-msgstr "" ++msgstr "Apache License เวอร์ชัน 2.0" + +-#: src/adw-about-dialog.c:222 src/adw-about-window.c:222 ++#: src/adw-about-dialog.c:222 src/adw-about-window.c:221 + msgid "Mozilla Public License 2.0" +-msgstr "" ++msgstr "Mozilla Public License 2.0" + +-#: src/adw-about-dialog.c:223 src/adw-about-window.c:223 ++#: src/adw-about-dialog.c:223 src/adw-about-window.c:222 + msgid "BSD Zero-Clause License" +-msgstr "" ++msgstr "BSD Zero-Clause License" + +-#: src/adw-about-dialog.c:571 src/adw-about-window.c:570 ++#: src/adw-about-dialog.c:571 src/adw-about-window.c:569 + msgid "Code by" + msgstr "โค้ดโดย" + +-#: src/adw-about-dialog.c:572 src/adw-about-window.c:571 ++#: src/adw-about-dialog.c:572 src/adw-about-window.c:570 + msgid "Design by" + msgstr "ออกแบบโดย" + +-#: src/adw-about-dialog.c:573 src/adw-about-window.c:572 ++#: src/adw-about-dialog.c:573 src/adw-about-window.c:571 + msgid "Artwork by" + msgstr "งานศิลปะโดย" + +-#: src/adw-about-dialog.c:574 src/adw-about-window.c:573 ++#: src/adw-about-dialog.c:574 src/adw-about-window.c:572 + msgid "Documentation by" + msgstr "เอกสารประกอบโดย" + +-#: src/adw-about-dialog.c:575 src/adw-about-window.c:574 ++#: src/adw-about-dialog.c:575 src/adw-about-window.c:573 + msgid "Translated by" + msgstr "แปลโดย" + + #. Translators: this is the license preamble; the string at the end + #. * contains the name of the license as link text. + #. +-#: src/adw-about-dialog.c:604 src/adw-about-window.c:603 ++#: src/adw-about-dialog.c:604 src/adw-about-window.c:602 + #, c-format + msgid "" +-"This application comes with absolutely no warranty. See the %s for details." +-msgstr "" +-"แอปพลิเคชันนี้ไม่มีการรับประกันใดๆ ทั้งสิ้น ดูรายละเอียดเพิ่มเติมได้ที่ %s" ++"This application comes with absolutely no warranty. See the %s for " ++"details." ++msgstr "แอปพลิเคชันนี้ไม่มีการรับประกันใดๆ ทั้งสิ้น ดูรายละเอียดเพิ่มเติมได้ที่ %s" + +-#: src/adw-about-dialog.c:682 src/adw-about-window.c:681 ++#: src/adw-about-dialog.c:682 src/adw-about-window.c:680 + msgid "This Application" +-msgstr "" ++msgstr "แอปพลิเคชันนี้" + +-#: src/adw-about-dialog.c:984 src/adw-about-window.c:983 ++#: src/adw-about-dialog.c:984 src/adw-about-window.c:982 + #, c-format + msgid "Version %s" +-msgstr "" ++msgstr "เวอร์ชัน %s" + +-#: src/adw-about-dialog.c:1010 src/adw-about-window.c:1009 ++#: src/adw-about-dialog.c:1010 src/adw-about-window.c:1008 + msgid "Unable to parse release notes:" +-msgstr "" ++msgstr "ไม่สามารถแจงบันทึกการออกรุ่น:" + +-#: src/adw-about-dialog.c:1016 src/adw-about-window.c:1015 ++#: src/adw-about-dialog.c:1016 src/adw-about-window.c:1014 + #, c-format + msgid "Line: %d, character: %d" +-msgstr "" ++msgstr "บรรทัด: %d, อักขระ: %d" + +-#: src/adw-about-dialog.c:1302 src/adw-about-window.c:1301 ++#: src/adw-about-dialog.c:1302 src/adw-about-window.c:1300 + msgid "Copied to clipboard" +-msgstr "" ++msgstr "คัดลอกไปยังคลิปบอร์ดแล้ว" + +-#: src/adw-about-dialog.c:1329 src/adw-about-window.c:1329 ++#: src/adw-about-dialog.c:1329 src/adw-about-window.c:1328 + msgid "Unable to save debugging information" +-msgstr "" ++msgstr "ไม่สามารถบันทึกข้อมูลการดีบักได้" + +-#: src/adw-about-dialog.c:1334 src/adw-about-window.c:1334 +-#: src/adw-sheet-controls.c:127 ++#: src/adw-about-dialog.c:1334 src/adw-about-window.c:1333 src/adw-sheet-controls.c:127 ++#: src/adw-sheet-controls.c:129 + msgid "Close" +-msgstr "" ++msgstr "ปิด" + +-#: src/adw-about-dialog.c:1351 src/adw-about-window.c:1350 ++#: src/adw-about-dialog.c:1351 src/adw-about-window.c:1349 + msgid "Save debugging information" +-msgstr "" ++msgstr "ข้อมูลการดีบัก" + + #: src/adw-about-dialog.ui:5 src/adw-about-window.ui:5 + msgid "About" +-msgstr "" ++msgstr "เกี่ยวกับ" + + #: src/adw-about-dialog.ui:89 src/adw-about-window.ui:92 + msgid "_What’s New" +@@ -164,8 +163,8 @@ msgstr "มี_อะไรใหม่" + msgid "_Details" + msgstr "_รายละเอียด" + +-#: src/adw-about-dialog.ui:121 src/adw-about-dialog.ui:341 +-#: src/adw-about-window.ui:124 src/adw-about-window.ui:344 ++#: src/adw-about-dialog.ui:121 src/adw-about-dialog.ui:341 src/adw-about-window.ui:124 ++#: src/adw-about-window.ui:344 + msgid "_Website" + msgstr "เ_ว็บไซต์" + +@@ -207,12 +206,12 @@ msgstr "การแก้ไขปัญหา" + + #: src/adw-about-dialog.ui:392 src/adw-about-window.ui:395 + msgid "" +-"To assist in troubleshooting, you can view your debugging information. " +-"Providing this information to the application developers can help diagnose " +-"any problems you encounter when you report an issue." ++"To assist in troubleshooting, you can view your debugging information. Providing this " ++"information to the application developers can help diagnose any problems you encounter when " ++"you report an issue." + msgstr "" +-"คุณสามารถดูข้อมูลการดีบักเพื่อช่วยในการแก้ไขปัญหาได้ " +-"การให้ข้อมูลนี้แก่ผู้พัฒนาแอปพลิเคชันจะช่วยวินิจฉัยปัญหาต่าง ๆ ที่คุณพบเมื่อคุณรายงานปัญหา" ++"คุณสามารถดูข้อมูลการดีบักเพื่อช่วยในการแก้ไขปัญหาได้ การให้ข้อมูลนี้แก่ผู้พัฒนาแอปพลิเคชันจะช่วยวินิจฉัยปัญหาต่าง ๆ " ++"ที่คุณพบเมื่อคุณรายงานปัญหา" + + #: src/adw-about-dialog.ui:403 src/adw-about-window.ui:406 + msgid "_Debugging Information" +@@ -242,210 +241,128 @@ msgstr "ข้อมูลทางกฎหมาย" + msgid "Acknowledgements" + msgstr "คำขอบคุณ" + +-#: src/adw-back-button.c:311 src/adw-back-button.c:409 +-#: src/adw-back-button.c:519 ++#: src/adw-back-button.c:327 src/adw-back-button.c:425 src/adw-back-button.c:535 + msgid "Back" + msgstr "กลับ" + + #. Translators: This is a placeholder text of the search entry from AdwComboRow. It should be phrased as a verb. +-#: src/adw-combo-row.ui:50 src/adw-preferences-dialog.ui:85 +-#: src/adw-preferences-window.ui:96 ++#: src/adw-combo-row.ui:50 src/adw-preferences-dialog.ui:85 src/adw-preferences-window.ui:96 + msgid "Search" + msgstr "ค้นหา" + +-#: src/adw-entry-row.ui:96 ++#: src/adw-entry-row.ui:97 + msgid "Apply" + msgstr "นำไปใช้" + +-#: src/adw-inspector-page.c:98 ++#: src/adw-inspector-page.c:75 + msgid "No Preference" + msgstr "ไม่กำหนด" + +-#: src/adw-inspector-page.c:100 ++#: src/adw-inspector-page.c:77 + msgid "Prefer Dark" +-msgstr "" ++msgstr "ใช้แบบมืด" + +-#: src/adw-inspector-page.c:102 ++#: src/adw-inspector-page.c:79 + msgid "Prefer Light" +-msgstr "" +- +-#: src/adw-inspector-page.c:115 +-msgid "Blue" +-msgstr "" +- +-#: src/adw-inspector-page.c:117 +-msgid "Teal" +-msgstr "" +- +-#: src/adw-inspector-page.c:119 +-msgid "Green" +-msgstr "" +- +-#: src/adw-inspector-page.c:121 +-msgid "Yellow" +-msgstr "" +- +-#: src/adw-inspector-page.c:123 +-msgid "Orange" +-msgstr "" +- +-#: src/adw-inspector-page.c:125 +-msgid "Red" +-msgstr "" +- +-#: src/adw-inspector-page.c:127 +-msgid "Pink" +-msgstr "" +- +-#: src/adw-inspector-page.c:129 +-msgid "Purple" +-msgstr "" +- +-#: src/adw-inspector-page.c:131 +-msgid "Slate" +-msgstr "" ++msgstr "ใช้แบบสว่าง" + + #. Translators: The name of the library, not the stylesheet +-#: src/adw-inspector-page.c:270 ++#: src/adw-inspector-page.c:97 + msgid "Adwaita" +-msgstr "" ++msgstr "อัทไวตะ" + + #: src/adw-inspector-page.ui:10 + msgid "System Appearance" +-msgstr "" ++msgstr "รูปโฉมของระบบ" + + #: src/adw-inspector-page.ui:11 +-msgid "" +-"Override settings for this application. They will be reset upon closing the " +-"inspector." +-msgstr "" ++msgid "Override settings for this application. They will be reset upon closing the inspector." ++msgstr "เขียนทับการตั้งค่าสำหรับแอปพลิเคชันนี้ การตั้งค่าจะถูกล้างเมื่อปิดตัวตรวจสอบ" + + #: src/adw-inspector-page.ui:14 + msgid "System Supports Color Schemes" +-msgstr "" ++msgstr "ระบบรองรับการใช้ชุดรูปแบบสี" + + #: src/adw-inspector-page.ui:20 + msgid "Preferred Color Scheme" +-msgstr "" +- +-#: src/adw-inspector-page.ui:39 +-msgid "Accent Color" +-msgstr "" +- +-#: src/adw-inspector-page.ui:42 +-msgid "System Supports Accent Colors" +-msgstr "" +- +-#: src/adw-inspector-page.ui:48 +-msgid "Preferred Accent Color" +-msgstr "" ++msgstr "ชุดรูปแบบสีที่ต้องการ" + +-#: src/adw-inspector-page.ui:77 +-msgid "Accessibility" +-msgstr "" +- +-#: src/adw-inspector-page.ui:80 ++#: src/adw-inspector-page.ui:37 + msgid "High Contrast" +-msgstr "" ++msgstr "สีตัดกัน" + + #: src/adw-password-entry-row.c:70 + msgid "Hide Password" +-msgstr "" ++msgstr "ซ่อนรหัสผ่าน" + + #: src/adw-password-entry-row.c:74 + msgid "Show Password" +-msgstr "" ++msgstr "แสดงรหัสผ่าน" + + #: src/adw-password-entry-row.c:168 + msgid "Caps Lock is on" +-msgstr "" ++msgstr "Caps Lock เปิดอยู่" + + #: src/adw-password-entry-row.c:176 + msgid "_Show Password" +-msgstr "" ++msgstr "แ_สดงรหัสผ่าน" + +-#: src/adw-preferences-dialog.c:256 src/adw-preferences-window.c:261 ++#: src/adw-preferences-dialog.c:256 src/adw-preferences-window.c:259 + msgid "Untitled page" +-msgstr "" ++msgstr "หน้าไม่มีชื่อ" + + #: src/adw-preferences-dialog.ui:5 src/adw-preferences-window.ui:8 + msgid "Preferences" +-msgstr "" ++msgstr "การปรับแต่ง" + + #: src/adw-preferences-dialog.ui:70 src/adw-preferences-window.ui:81 + msgid "Search preferences" +-msgstr "" ++msgstr "ค้นหาการปรับแต่ง" + + #: src/adw-preferences-dialog.ui:152 src/adw-preferences-window.ui:163 + msgid "No Results Found" +-msgstr "" +- +-#: src/adw-preferences-dialog.ui:153 src/adw-tab-overview.ui:111 +-msgid "Try a different search" +-msgstr "" ++msgstr "ไม่พบผลลัพธ์" + +-#: src/adw-preferences-window.ui:164 ++#: src/adw-preferences-dialog.ui:153 src/adw-preferences-window.ui:164 ++#: src/adw-tab-overview.ui:111 + msgid "Try a different search." +-msgstr "" +- +-#: src/adw-sheet-controls.c:129 +-msgid "Close the window" +-msgstr "" ++msgstr "ลองค้นหาด้วยคำอื่น" + +-#: src/adw-split-button.c:530 src/adw-split-button.c:1044 ++#: src/adw-split-button.c:519 src/adw-split-button.c:1033 + msgid "More Options" +-msgstr "" ++msgstr "ตัวเลือกเพิ่มเติม" + + #: src/adw-tab-button.ui:7 + msgid "View Open Tabs" +-msgstr "" ++msgstr "ดูแท็บที่เปิด" + + #. Translators: Tab overview title, %u is the number of open tabs + #: src/adw-tab-overview.c:928 + #, c-format + msgid "%u Tab" + msgid_plural "%u Tabs" +-msgstr[0] "" ++msgstr[0] "%u แท็บ" + + #: src/adw-tab-overview.ui:21 + msgid "Search Tabs" +-msgstr "" ++msgstr "ค้นหาแท็บ" + + #: src/adw-tab-overview.ui:51 + msgid "Search tabs" +-msgstr "" ++msgstr "ค้นหาแท็บ" + + #: src/adw-tab-overview.ui:97 + msgid "No Open Tabs" +-msgstr "" ++msgstr "ไม่มีแท็บที่เปิด" + + #: src/adw-tab-overview.ui:110 + msgid "No Tabs Found" +-msgstr "" ++msgstr "ไม่พบแท็บ" + + #: src/adw-tab-overview.ui:131 + msgid "New _Tab" +-msgstr "" ++msgstr "เปิดแ_ท็บใหม่" + +-#: src/adw-tab-thumbnail.ui:39 src/adw-tab.ui:75 ++#: src/adw-tab-thumbnail.ui:39 src/adw-tab.ui:95 + msgid "Close Tab" +-msgstr "" +- +-#: src/adw-toast-overlay.c:271 +-#, c-format +-msgid "A toast appeared: %s, has a button: %s" +-msgstr "" +- +-#: src/adw-toast-overlay.c:274 +-#, c-format +-msgid "A toast appeared: %s" +-msgstr "" +- +-#: src/adw-toast-overlay.c:276 +-#, c-format +-msgid "A toast appeared, has a button: %s" +-msgstr "" +- +-#: src/adw-toast-overlay.c:279 +-msgid "A toast appeared" +-msgstr "" ++msgstr "ปิดแท็บ" diff --git a/snapcraft.yaml b/snapcraft.yaml index 38bc0cf..a56cf86 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -628,6 +628,9 @@ parts: - libappstream-dev override-pull: | craftctl default + patch -p1 < $CRAFT_PROJECT_DIR/patches/libadwaita-tab-box-skip-middle-clicks-on-different-tab.patch + patch -p1 < $CRAFT_PROJECT_DIR/patches/libadwaita-add-thai-translation.patch + patch -p1 < $CRAFT_PROJECT_DIR/patches/libadwaita-update-thai-translation.patch patch -p1 < $CRAFT_PROJECT_DIR/patches/style-manager-Support-Yaru-accent-colors.patch patch -p1 < $CRAFT_PROJECT_DIR/patches/stylesheet-Add-wartybrown-accent-color.patch