Merge branch 'main' into danirabbit/navigation-view

elementary · Sep 24, 2024 · 9409f8f · 9409f8f
2 parents 73c8149 + 9302468
commit 9409f8f
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 66 deletions.
diff --git a/data/installer.metainfo.xml.in b/data/installer.metainfo.xml.in
@@ -65,6 +65,7 @@
       </description>
       <issues>
         <issue url="https://github.com/elementary/installer/issues/538">Screen Reader ignores each view’s title text</issue>
+        <issue url="https://github.com/elementary/installer/issues/539">Second step of VariantWidget not focused</issue>
       </issues>
     </release>
 

diff --git a/po/cs.po b/po/cs.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-09-11 22:12+0000\n"
-"PO-Revision-Date: 2023-08-30 12:08+0000\n"
+"PO-Revision-Date: 2024-09-19 07:21+0000\n"
 "Last-Translator: hnklp <[email protected]>\n"
 "Language-Team: Czech <https://l10n.elementary.io/projects/installer/"
 "installer/cs/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 5.6.2\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:40+0000\n"
 
 #: src/Application.vala:44
@@ -169,16 +169,13 @@ msgstr ""
 "ovladačů."
 
 #: src/Views/DriversView.vala:50
-#, fuzzy
-#| msgid ""
-#| "Proprietary drivers can be installed later through AppCenter, but an "
-#| "Internet connection will be required for all drivers."
 msgid ""
 "Proprietary drivers can be installed later through System Settings → System, "
 "but an Internet connection will be required for all drivers."
 msgstr ""
-"Proprietární ovladače mohou být nainstalovány později skrze Centrum "
-"aplikací, ale internetové připojení bude vyžadováno pro všechny ovladače."
+"Proprietární ovladače mohou být nainstalovány později skrze Systémové "
+"nastavení → systém, ale pro všechny ovladače bude vyžadováno internetové "
+"připojení."
 
 #: src/Views/DriversView.vala:55
 msgid ""
@@ -342,21 +339,13 @@ msgid "Currently active language"
 msgstr "Právě používaný jazyk"
 
 #: src/Views/PartitioningView.vala:53
-#, fuzzy
-#| msgid "Use Partition"
 msgid "Select Partitions"
-msgstr "Použít oddíl"
+msgstr "Vyberte oddíly"
 
 #: src/Views/PartitioningView.vala:58
-#, fuzzy
-#| msgid ""
-#| "Select which partitions to use across all drives. <b>Selecting \"Format\" "
-#| "will erase ALL data on the selected partition.</b>"
 msgid ""
 "Selecting “Format” will erase <i>all</i> data on the selected partition."
-msgstr ""
-"Vyberte z jednotek ty oddíly, které se mají použít. <b>Výběrem „Formátovat“ "
-"smažete VŠECHNA data na vybraném oddílu.</b>"
+msgstr "Výběrem „Formátovat“ smažete <i>všechna</i> data na vybraném oddílu."
 
 #. Device is in BIOS mode, so we just require a root partition
 #: src/Views/PartitioningView.vala:67
@@ -365,16 +354,12 @@ msgstr "Je třeba vybrat alespoň <b>kořenový (/)</b> oddíl."
 
 #. Device is in EFI mode, so we also require a boot partition
 #: src/Views/PartitioningView.vala:71
-#, fuzzy
-#| msgid ""
-#| "You must at least select a <b>Root (/)</b> partition and a <b>Boot (/boot/"
-#| "efi)</b> partition."
 msgid ""
 "You must at least select a <b>Root (/)</b> partition and an optional <b>Boot "
 "(/boot/efi)</b> partition."
 msgstr ""
-"Je třeba vybrat alespoň oddíly pro <b>kořen (/)</b> a <b>zavádění (/boot/"
-"efi)</b>."
+"Je třeba vybrat alespoň oddíl pro <b>kořen (/)</b> a volitelný oddíl pro "
+"<b>zavádění (/boot/efi)</b>."
 
 #: src/Views/PartitioningView.vala:82
 msgid "It is also recommended to select a <b>Swap</b> partition."
@@ -405,10 +390,8 @@ msgid "Show log"
 msgstr "Zobrazit protokol"
 
 #: src/Views/ProgressView.vala:90
-#, fuzzy
-#| msgid "Before Installing"
 msgid "Installing"
-msgstr "Před instalací"
+msgstr "Probíhá instalace"
 
 #: src/Views/ProgressView.vala:95
 msgid "Hide log"

diff --git a/po/extra/cs.po b/po/extra/cs.po
@@ -2,16 +2,16 @@ msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-09-11 22:12+0000\n"
-"PO-Revision-Date: 2022-01-09 20:32+0000\n"
-"Last-Translator: Michal Grňo <[email protected]>\n"
+"PO-Revision-Date: 2024-09-19 07:21+0000\n"
+"Last-Translator: hnklp <[email protected]>\n"
 "Language-Team: Czech <https://l10n.elementary.io/projects/installer/extra/cs/"
 ">\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.4.2\n"
+"X-Generator: Weblate 5.6.2\n"
 
 #: data/installer.metainfo.xml.in:9
 msgid "Installer"
@@ -33,13 +33,13 @@ msgstr "elementary, Inc."
 #: data/installer.metainfo.xml.in:87 data/installer.metainfo.xml.in:101
 #: data/installer.metainfo.xml.in:115 data/installer.metainfo.xml.in:126
 msgid "Improvements:"
-msgstr ""
+msgstr "Vylepšení:"
 
 #: data/installer.metainfo.xml.in:63 data/installer.metainfo.xml.in:76
 #: data/installer.metainfo.xml.in:90 data/installer.metainfo.xml.in:103
 #: data/installer.metainfo.xml.in:119 data/installer.metainfo.xml.in:131
 msgid "Updated translations"
-msgstr ""
+msgstr "Aktualizace překladů"
 
 #: data/installer.metainfo.xml.in:75
 msgid "Keyboard layout preview is now in a resizable window"

diff --git a/po/extra/tr.po b/po/extra/tr.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: pantheon-calculator\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-09-11 22:12+0000\n"
-"PO-Revision-Date: 2021-07-16 13:50+0000\n"
-"Last-Translator: Özgür Baskin <queeup@zoho.com>\n"
+"PO-Revision-Date: 2024-09-21 10:16+0000\n"
+"Last-Translator: Sinan Decron <sinanveyasinan@gmail.com>\n"
 "Language-Team: Turkish <https://l10n.elementary.io/projects/installer/extra/"
 "tr/>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.4.2\n"
+"X-Generator: Weblate 5.6.2\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:42+0000\n"
 
 #: data/installer.metainfo.xml.in:9
@@ -40,41 +40,42 @@ msgstr "elementary, Inc."
 #: data/installer.metainfo.xml.in:87 data/installer.metainfo.xml.in:101
 #: data/installer.metainfo.xml.in:115 data/installer.metainfo.xml.in:126
 msgid "Improvements:"
-msgstr ""
+msgstr "İyileştirmeler:"
 
 #: data/installer.metainfo.xml.in:63 data/installer.metainfo.xml.in:76
 #: data/installer.metainfo.xml.in:90 data/installer.metainfo.xml.in:103
 #: data/installer.metainfo.xml.in:119 data/installer.metainfo.xml.in:131
 msgid "Updated translations"
-msgstr ""
+msgstr "Güncellenmiş çeviriler"
 
 #: data/installer.metainfo.xml.in:75
 msgid "Keyboard layout preview is now in a resizable window"
 msgstr ""
+"Klavye düzeni önizlemesi artık yeniden boyutlandırılabilir bir pencerede"
 
 #: data/installer.metainfo.xml.in:89
 msgid "Swipe to navigate back"
-msgstr ""
+msgstr "Geri gitmek için kaydırın"
 
 #: data/installer.metainfo.xml.in:117
 msgid "Use large icons in views"
-msgstr ""
+msgstr "Görünümlerde büyük simgeler kullanın"
 
 #: data/installer.metainfo.xml.in:118
 msgid "Add a custom icon for Before Installing view"
-msgstr ""
+msgstr "Yüklemeden Önce görünümü için özel bir simge ekle"
 
 #: data/installer.metainfo.xml.in:128
 msgid "Show an infobar on battery instead of switching to a different page"
-msgstr ""
+msgstr "Farklı bir sayfaya geçmek yerine pil hakkında bir bilgi çubuğu göster"
 
 #: data/installer.metainfo.xml.in:129
 msgid "Show all system requirements warnings on a single page"
-msgstr ""
+msgstr "Tüm sistem gereksinimleri uyarılarını tek bir sayfada göster"
 
 #: data/installer.metainfo.xml.in:130
 msgid "Warn about installing developer builds"
-msgstr ""
+msgstr "Geliştirici yapılarını yükleme konusunda uyar"
 
 #: data/io.elementary.installer.desktop.in:4
 msgid "Install the system"

diff --git a/src/Views/AbstractInstallerView.vala b/src/Views/AbstractInstallerView.vala
@@ -26,13 +26,17 @@ public abstract class AbstractInstallerView : Adw.NavigationPage {
 
         content_area = new Gtk.Box (VERTICAL, 24);
 
+        var content_clamp = new Adw.Clamp () {
+            child = content_area
+        };
+
         var box = new Gtk.Box (HORIZONTAL, 12) {
             homogeneous = true,
             hexpand = true,
             vexpand = true,
         };
         box.append (title_area);
-        box.append (content_area);
+        box.append (content_clamp);
 
         action_box_end = new Gtk.Box (HORIZONTAL, 6) {
             halign = END,

diff --git a/src/Views/CheckView.vala b/src/Views/CheckView.vala
@@ -180,15 +180,12 @@ public class Installer.CheckView : AbstractInstallerView {
             };
 
             var title_label = new Gtk.Label (title) {
-                hexpand = true,
-                max_width_chars = 1,
                 wrap = true,
                 xalign = 0
             };
             title_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);
 
             var description_label = new Gtk.Label (description) {
-                max_width_chars = 1, // Make Gtk wrap, but not expand the window
                 use_markup = true,
                 wrap = true,
                 xalign = 0

diff --git a/src/Views/DiskView.vala b/src/Views/DiskView.vala
@@ -50,7 +50,6 @@ public class Installer.DiskView : AbstractInstallerView {
         var install_desc_label = new Gtk.Label (
             _("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.")
         ) {
-            max_width_chars = 45,
             wrap = true,
             xalign = 0
         };
@@ -70,7 +69,6 @@ public class Installer.DiskView : AbstractInstallerView {
         load_spinner.start ();
 
         var load_label = new Gtk.Label (_("Getting the current configuration…")) {
-            max_width_chars = 45,
             wrap = true
         };
         load_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);

diff --git a/src/Views/DriversView.vala b/src/Views/DriversView.vala
@@ -26,7 +26,6 @@
         var title_label = new Gtk.Label (title);
 
         var description_label = new Gtk.Label (_("Broadcom® Wi-Fi adapters, NVIDIA® graphics, and some virtual machines may not function properly without additional drivers. Most devices do not require additional drivers.")) {
-            max_width_chars = 1, // Make Gtk wrap, but not expand the window
             wrap = true,
             xalign = 0
         };

diff --git a/src/Views/EncryptView.vala b/src/Views/EncryptView.vala
@@ -52,8 +52,6 @@ public class EncryptView : AbstractInstallerView {
         var title_label = new Gtk.Label (title);
 
         var details_label = new Gtk.Label (_("Encrypt this device's drive if required for added protection, but be sure you understand:")) {
-            hexpand = true,
-            max_width_chars = 1, // Make Gtk wrap, but not expand the window
             wrap = true,
             xalign = 0
         };
@@ -88,9 +86,7 @@ public class EncryptView : AbstractInstallerView {
         var description = new Gtk.Label (
             _("If you forget the encryption password, <b>you will not be able to recover data.</b> This is a unique password for this device, not the password for your user account.")
         ) {
-            hexpand = true,
             margin_bottom = 12,
-            max_width_chars = 1, // Make Gtk wrap, but not expand the window
             use_markup = true,
             wrap = true,
             xalign = 0
@@ -278,9 +274,8 @@ public class EncryptView : AbstractInstallerView {
 
         construct {
             label_widget = new Gtk.Label (label) {
-                halign = END,
+                hexpand = true,
                 justify = RIGHT,
-                max_width_chars = 55,
                 use_markup = true,
                 wrap = true,
                 xalign = 1

diff --git a/src/Views/ErrorView.vala b/src/Views/ErrorView.vala
@@ -34,7 +34,6 @@ public class ErrorView : AbstractInstallerView {
 
         var description_label = new Gtk.Label (_("Installing %s failed, possibly due to a hardware error. The device may not restart properly. You can try the following:").printf (Utils.get_pretty_name ())) {
             margin_bottom = 12,
-            max_width_chars = 1, // Make Gtk wrap, but not expand the window
             wrap = true,
             xalign = 0
         };
@@ -45,7 +44,6 @@ public class ErrorView : AbstractInstallerView {
 
         var try_label = new Gtk.Label (_("Try the installation again")) {
             hexpand = true,
-            max_width_chars = 1, // Make Gtk wrap, but not expand the window
             wrap = true,
             xalign = 0
         };
@@ -55,7 +53,6 @@ public class ErrorView : AbstractInstallerView {
         };
 
         var launch_label = new Gtk.Label (_("Use Demo Mode and try to manually recover")) {
-            max_width_chars = 1, // Make Gtk wrap, but not expand the window
             wrap = true,
             xalign = 0
         };
@@ -65,7 +62,6 @@ public class ErrorView : AbstractInstallerView {
         };
 
         var restart_label = new Gtk.Label (_("Restart the device and boot from another drive")) {
-            max_width_chars = 1, // Make Gtk wrap, but not expand the window
             wrap = true,
             xalign = 0
         };

diff --git a/src/Views/SuccessView.vala b/src/Views/SuccessView.vala
@@ -30,15 +30,12 @@ public class SuccessView : AbstractInstallerView {
         var title_label = new Gtk.Label (title);
 
         var primary_label = new Gtk.Label (_("%s has been installed").printf (Utils.get_pretty_name ())) {
-            hexpand = true,
-            max_width_chars = 1,
             wrap = true,
             xalign = 0
         };
         primary_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);
 
         secondary_label = new Gtk.Label (null) {
-            max_width_chars = 1, // Make Gtk wrap, but not expand the window
             use_markup = true,
             wrap = true,
             xalign = 0

diff --git a/src/Widgets/DecryptMenu.vala b/src/Widgets/DecryptMenu.vala
@@ -69,7 +69,6 @@ public class Installer.DecryptMenu: Gtk.Popover {
 
         var secondary_label = new Gtk.Label (_("Enter the partition's encryption password and set a device name for the decrypted partition."));
         secondary_label.halign = Gtk.Align.START;
-        secondary_label.max_width_chars = 50;
         secondary_label.selectable = true;
         secondary_label.wrap = true;
         secondary_label.xalign = 0;

diff --git a/src/Widgets/DescriptionRow.vala b/src/Widgets/DescriptionRow.vala
@@ -26,7 +26,6 @@ public class DescriptionRow : Gtk.Box {
 
         var description_label = new Gtk.Label (description) {
             hexpand = true,
-            max_width_chars = 1, // Make Gtk wrap, but not expand the window
             use_markup = true,
             wrap = true,
             xalign = 0

diff --git a/src/Widgets/InstallTypeGrid.vala b/src/Widgets/InstallTypeGrid.vala
@@ -44,7 +44,6 @@ public class Installer.InstallTypeButton : Gtk.CheckButton {
         title_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);
 
         var subtitle_label = new Gtk.Label (subtitle) {
-            max_width_chars = 1, // Make Gtk wrap, but not expand the window
             wrap = true,
             xalign = 0
         };