Skip to content

Commit e8a3ec0

Browse files
authored
Merge branch 'main' into lenemter/cleanup-shadow-effect-1
2 parents 36a5322 + 3e68432 commit e8a3ec0

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

po/ca.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ msgstr ""
88
"Project-Id-Version: beat-box\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2025-03-24 21:59+0000\n"
11-
"PO-Revision-Date: 2025-03-03 20:18+0000\n"
11+
"PO-Revision-Date: 2025-03-26 05:55+0000\n"
1212
"Last-Translator: David M <[email protected]>\n"
13-
"Language-Team: Catalan <https://l10n.elementary.io/projects/desktop/gala/ca/"
14-
">\n"
13+
"Language-Team: Catalan <https://l10n.elementaryos.org/projects/desktop/gala/"
14+
"ca/>\n"
1515
"Language: ca\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=n != 1;\n"
20-
"X-Generator: Weblate 5.9.2\n"
20+
"X-Generator: Weblate 5.10.4\n"
2121
"X-Launchpad-Export-Date: 2017-04-05 07:08+0000\n"
2222

2323
#: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -126,7 +126,7 @@ msgstr "Traduccions actualitzades"
126126

127127
#: data/gala.metainfo.xml.in:35
128128
msgid "Window state is now saved on sleep and shutdown"
129-
msgstr ""
129+
msgstr "L'estat de la finestra ara es desa en suspensió i aturat"
130130

131131
#: data/gala.metainfo.xml.in:58
132132
msgid "Fixed rare crash when a dock window was killed"

po/es.po

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ msgstr ""
88
"Project-Id-Version: gala\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2025-03-24 21:59+0000\n"
11-
"PO-Revision-Date: 2025-03-02 19:10+0000\n"
11+
"PO-Revision-Date: 2025-03-26 05:55+0000\n"
1212
"Last-Translator: Italo Felipe Capasso Ballesteros <[email protected]>\n"
13-
"Language-Team: Spanish <https://l10n.elementary.io/projects/desktop/gala/es/"
14-
">\n"
13+
"Language-Team: Spanish <https://l10n.elementaryos.org/projects/desktop/gala/"
14+
"es/>\n"
1515
"Language: es\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=n != 1;\n"
20-
"X-Generator: Weblate 5.9.2\n"
20+
"X-Generator: Weblate 5.10.4\n"
2121
"X-Launchpad-Export-Date: 2017-02-27 05:44+0000\n"
2222

2323
#: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -128,6 +128,7 @@ msgstr "Traducciones actualizadas"
128128
#: data/gala.metainfo.xml.in:35
129129
msgid "Window state is now saved on sleep and shutdown"
130130
msgstr ""
131+
"El estado de las ventanas ahora se guardan al dormir y al apagar el equipo"
131132

132133
#: data/gala.metainfo.xml.in:58
133134
msgid "Fixed rare crash when a dock window was killed"

po/ru.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ msgstr ""
88
"Project-Id-Version: beat-box\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2025-03-24 21:59+0000\n"
11-
"PO-Revision-Date: 2025-03-02 19:42+0000\n"
12-
"Last-Translator: кубик круглый <megarainbow29@gmail.com>\n"
13-
"Language-Team: Russian <https://l10n.elementary.io/projects/desktop/gala/ru/"
14-
">\n"
11+
"PO-Revision-Date: 2025-03-26 05:55+0000\n"
12+
"Last-Translator: lenemter <lenemter@gmail.com>\n"
13+
"Language-Team: Russian <https://l10n.elementaryos.org/projects/desktop/gala/"
14+
"ru/>\n"
1515
"Language: ru\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
2020
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
21-
"X-Generator: Weblate 5.9.2\n"
21+
"X-Generator: Weblate 5.10.4\n"
2222
"X-Launchpad-Export-Date: 2017-02-21 05:47+0000\n"
2323

2424
#: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -127,7 +127,7 @@ msgstr "Обновлены переводы"
127127

128128
#: data/gala.metainfo.xml.in:35
129129
msgid "Window state is now saved on sleep and shutdown"
130-
msgstr ""
130+
msgstr "Состояние окон теперь сохраняется при сне и выключении"
131131

132132
#: data/gala.metainfo.xml.in:58
133133
msgid "Fixed rare crash when a dock window was killed"

src/Widgets/WindowSwitcher/WindowSwitcher.vala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget {
4242
_current_icon = value;
4343
if (_current_icon != null) {
4444
_current_icon.selected = true;
45-
_current_icon.grab_key_focus ();
45+
46+
// _current_icon.grab_key_focus () sometimes results in a crash
47+
// https://github.com/elementary/gala/issues/2308
48+
get_stage ().set_key_focus (_current_icon);
4649
}
4750

4851
update_caption_text ();

0 commit comments

Comments
 (0)