Skip to content

Commit

Permalink
Merge branch 'master' into danirabbit/installer-actionarea
Browse files Browse the repository at this point in the history
  • Loading branch information
danirabbit authored May 8, 2024
2 parents ea9d0d7 + 151ec7f commit a465d90
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gnome = import('gnome')
i18n = import('i18n')

distinst_dep = dependency('distinst')
glib_dep = dependency('glib-2.0')
glib_dep = dependency('glib-2.0', version: '>=2.74')
gobject_dep = dependency('gobject-2.0')
gtk_dep = dependency('gtk+-3.0')
gee_dep = dependency('gee-0.8')
Expand Down
12 changes: 4 additions & 8 deletions po/uk.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"PO-Revision-Date: 2024-03-15 21:13+0000\n"
"PO-Revision-Date: 2024-05-08 14:13+0000\n"
"Last-Translator: Ihor Hordiichuk <[email protected]>\n"
"Language-Team: Ukrainian <https://l10n.elementary.io/projects/installer/"
"installer/uk/>\n"
Expand All @@ -13,7 +13,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 5.0.2\n"
"X-Generator: Weblate 5.5\n"
"X-Launchpad-Export-Date: 2016-09-27 06:41+0000\n"

#: src/Application.vala:42
Expand Down Expand Up @@ -355,16 +355,12 @@ msgstr "Необхідно вибрати принаймні <b>кореневи

#. Device is in EFI mode, so we also require a boot partition
#: src/Views/PartitioningView.vala:62
#, 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 ""
"Необхідно вибрати принаймні <b>кореневий (/)</b> та розділ <b>завантаження (/"
"boot/efi)</b>."
"Необхідно вибрати принаймні <b>кореневий (/)</b> та опційний розділ "
"<b>завантаження (/boot/efi)</b>."

#: src/Views/PartitioningView.vala:66
msgid "It is also recommended to select a <b>Swap</b> partition."
Expand Down
2 changes: 1 addition & 1 deletion src/Views/KeyboardLayoutView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public class KeyboardLayoutView : AbstractInstallerView {

show_all ();

Idle.add (() => {
Idle.add_once (() => {
string? country = Configuration.get_default ().country;
if (country != null) {
string default_layout = country.down ();
Expand Down
8 changes: 4 additions & 4 deletions src/Widgets/PartitionBar.vala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Authored by: Michael Aaron Murphy <[email protected]>
*/

public class Installer.PartitionBar : Gtk.Box {
public class Installer.PartitionBar : Gtk.EventBox {
public signal void decrypted (InstallerDaemon.LuksCredentials credential);

public Icon? icon { get; set; default = null; }
Expand Down Expand Up @@ -43,6 +43,9 @@ public class Installer.PartitionBar : Gtk.Box {

menu.relative_to = this;
menu.position = BOTTOM;

click_gesture = new Gtk.GestureMultiPress (this);
click_gesture.released.connect (menu.popup);
}

class construct {
Expand All @@ -64,9 +67,6 @@ public class Installer.PartitionBar : Gtk.Box {

get_style_context ().add_class (Distinst.strfilesys (partition.filesystem));

click_gesture = new Gtk.GestureMultiPress (this);
click_gesture.released.connect (menu.popup);

bind_property ("icon", image, "gicon", SYNC_CREATE);
}

Expand Down

0 comments on commit a465d90

Please sign in to comment.