Skip to content

Commit 681f525

Browse files
zeebokzeebok
authored
Merge branch 'main' into leolost/offset-notifications
2 parents 2867be1 + 2cb45c9 commit 681f525

File tree

20 files changed

+127
-152
lines changed

20 files changed

+127
-152
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
version: [stable, unstable, development-target]
1919
include:
2020
- version: stable
21-
mutter_pkg: libmutter-10-dev
21+
mutter_pkg: libmutter-14-dev
2222
- version: unstable
23-
mutter_pkg: libmutter-10-dev
23+
mutter_pkg: libmutter-14-dev
2424
- version: development-target
2525
mutter_pkg: libmutter-14-dev
2626
container:

‎data/gala.metainfo.xml.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<update_contact>contact_at_elementary.io</update_contact>
2828

2929
<releases>
30-
<release version="8.0.1" date="2024-08-21" urgency="medium">
30+
<release version="8.0.1" date="2024-09-17" urgency="medium">
3131
<description>
3232
<p>Improvements:</p>
3333
<ul>

‎lib/WindowIcon.vala‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,19 @@ public class Gala.WindowIcon : Clutter.Actor {
2929
}
3030

3131
construct {
32+
/**
33+
* Sometimes a WindowIcon is constructed on Meta.Display::window_created.
34+
* In this case it can happen that we don't have any info about the app yet so we can't get the
35+
* correct icon. Therefore we check whether the info becomes available at some point
36+
* and if it does we try to get a new icon.
37+
*/
38+
window.notify["wm-class"].connect (reload_icon);
39+
window.notify["gtk-application-id"].connect (reload_icon);
40+
41+
reload_icon ();
42+
}
43+
44+
private void reload_icon () {
3245
width = icon_size * scale;
3346
height = icon_size * scale;
3447

‎meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('gala',
22
'c', 'vala',
3-
version: '8.0.0',
3+
version: '8.0.1',
44
meson_version: '>= 0.59.0',
55
license: 'GPL3',
66
)

‎po/ca.po‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ msgstr ""
88
"Project-Id-Version: beat-box\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2024-09-17 18:30+0000\n"
11-
"PO-Revision-Date: 2024-08-21 17:26+0000\n"
11+
"PO-Revision-Date: 2024-09-18 12:00+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.elementary.io/projects/desktop/gala/ca/>"
14+
"\n"
1515
"Language: ca\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
@@ -115,17 +115,13 @@ msgid "Improvements:"
115115
msgstr "Millores:"
116116

117117
#: data/gala.metainfo.xml.in:34
118-
#, fuzzy
119-
#| msgid "Fix a potential crash when taking screenshots"
120118
msgid "Fix a potential crash when moving windows between workspaces"
121-
msgstr "Correcció de la fallada potencial en fer captures de pantalla"
119+
msgstr "Solució d'un error potencial en moure finestres entre espais de treball"
122120

123121
#: data/gala.metainfo.xml.in:35
124-
#, fuzzy
125-
#| msgid "Fix notification position after changing DPI"
126122
msgid "Fix notification animation when entering multitasking view"
127123
msgstr ""
128-
"Correcció de la posició de les notificacions després de canviar els DPI"
124+
"Correcció de l'animació de notificació quan entreu a la vista multitasca"
129125

130126
#: data/gala.metainfo.xml.in:36 data/gala.metainfo.xml.in:52
131127
#: data/gala.metainfo.xml.in:95 data/gala.metainfo.xml.in:117

‎po/cs.po‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ msgstr ""
88
"Project-Id-Version: beat-box\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2024-09-17 18:30+0000\n"
11-
"PO-Revision-Date: 2024-08-07 18:17+0000\n"
12-
"Last-Translator: anonymous <noreply@weblate.org>\n"
11+
"PO-Revision-Date: 2024-09-24 11:24+0000\n"
12+
"Last-Translator: Daniel Hejduk <danielhejduk@disroot.org>\n"
1313
"Language-Team: Czech <https://l10n.elementary.io/projects/desktop/gala/cs/>\n"
1414
"Language: cs\n"
1515
"MIME-Version: 1.0\n"
@@ -116,10 +116,8 @@ msgid "Improvements:"
116116
msgstr "Vylepšení:"
117117

118118
#: data/gala.metainfo.xml.in:34
119-
#, fuzzy
120-
#| msgid "Fix a potential crash when taking screenshots"
121119
msgid "Fix a potential crash when moving windows between workspaces"
122-
msgstr "Opraveny potenciální pády při pořizování snímků obrazovky"
120+
msgstr "Opraveny potenciální pády při pohybování oken mezi pracovištěma"
123121

124122
#: data/gala.metainfo.xml.in:35
125123
#, fuzzy

‎po/en_GB.po‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: beat-box\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2024-09-17 18:30+0000\n"
11-
"PO-Revision-Date: 2024-07-21 06:16+0000\n"
11+
"PO-Revision-Date: 2024-09-29 02:16+0000\n"
1212
"Last-Translator: David Hewitt <[email protected]>\n"
1313
"Language-Team: English (United Kingdom) <https://l10n.elementary.io/projects/"
1414
"desktop/gala/en_GB/>\n"
@@ -115,16 +115,12 @@ msgid "Improvements:"
115115
msgstr "Improvements:"
116116

117117
#: data/gala.metainfo.xml.in:34
118-
#, fuzzy
119-
#| msgid "Fix a potential crash when taking screenshots"
120118
msgid "Fix a potential crash when moving windows between workspaces"
121-
msgstr "Fix a potential crash when taking screenshots"
119+
msgstr "Fix a potential crash when moving windows between workspaces"
122120

123121
#: data/gala.metainfo.xml.in:35
124-
#, fuzzy
125-
#| msgid "Fix notification position after changing DPI"
126122
msgid "Fix notification animation when entering multitasking view"
127-
msgstr "Fix notification position after changing DPI"
123+
msgstr "Fix notification animation when entering multitasking view"
128124

129125
#: data/gala.metainfo.xml.in:36 data/gala.metainfo.xml.in:52
130126
#: data/gala.metainfo.xml.in:95 data/gala.metainfo.xml.in:117
@@ -189,7 +185,7 @@ msgstr "Unknown"
189185

190186
#: src/DesktopIntegration.vala:132
191187
msgid "Window has already focus"
192-
msgstr ""
188+
msgstr "Window has already focus"
193189

194190
#: src/Dialogs.vala:144
195191
#, c-format
@@ -247,7 +243,7 @@ msgstr "Screenshot taken"
247243

248244
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:73
249245
msgid "Window switcher"
250-
msgstr ""
246+
msgstr "Window switcher"
251247

252248
#: src/WindowManager.vala:2365
253249
#, c-format

‎po/es.po‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ msgstr ""
88
"Project-Id-Version: gala\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2024-09-17 18:30+0000\n"
11-
"PO-Revision-Date: 2024-08-22 07:51+0000\n"
11+
"PO-Revision-Date: 2024-09-18 12:00+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.elementary.io/projects/desktop/gala/es/>"
14+
"\n"
1515
"Language: es\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
@@ -116,16 +116,16 @@ msgid "Improvements:"
116116
msgstr "Mejoras:"
117117

118118
#: data/gala.metainfo.xml.in:34
119-
#, fuzzy
120-
#| msgid "Fix a potential crash when taking screenshots"
121119
msgid "Fix a potential crash when moving windows between workspaces"
122-
msgstr "Solucionar un posible bloqueo al tomar capturas de pantalla"
120+
msgstr ""
121+
"Se corrigió una posible falla grave al mover ventanas entre espacios de "
122+
"trabajo"
123123

124124
#: data/gala.metainfo.xml.in:35
125-
#, fuzzy
126-
#| msgid "Fix notification position after changing DPI"
127125
msgid "Fix notification animation when entering multitasking view"
128-
msgstr "Se corrigió la posición de notificaciones después de cambiar los PPP"
126+
msgstr ""
127+
"Se corrigió la animación de las notificaciones al entrar a la Vista "
128+
"Multitarea"
129129

130130
#: data/gala.metainfo.xml.in:36 data/gala.metainfo.xml.in:52
131131
#: data/gala.metainfo.xml.in:95 data/gala.metainfo.xml.in:117

‎po/he.po‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
55
"POT-Creation-Date: 2024-09-17 18:30+0000\n"
6-
"PO-Revision-Date: 2024-08-21 17:26+0000\n"
6+
"PO-Revision-Date: 2024-09-19 07:21+0000\n"
77
"Last-Translator: Yaron Shahrabani <[email protected]>\n"
8-
"Language-Team: Hebrew <https://l10n.elementary.io/projects/desktop/gala/he/"
9-
">\n"
8+
"Language-Team: Hebrew <https://l10n.elementary.io/projects/desktop/gala/he/>"
9+
"\n"
1010
"Language: he\n"
1111
"MIME-Version: 1.0\n"
1212
"Content-Type: text/plain; charset=UTF-8\n"
@@ -110,16 +110,12 @@ msgid "Improvements:"
110110
msgstr "שיפורים:"
111111

112112
#: data/gala.metainfo.xml.in:34
113-
#, fuzzy
114-
#| msgid "Fix a potential crash when taking screenshots"
115113
msgid "Fix a potential crash when moving windows between workspaces"
116-
msgstr "תיקון של תקלה אפשרית של קריסה בעת צילומים"
114+
msgstr "תוקנה קריסה שיכלה לקרות בעת העברת חלונות בין סביבות עבודה"
117115

118116
#: data/gala.metainfo.xml.in:35
119-
#, fuzzy
120-
#| msgid "Fix notification position after changing DPI"
121117
msgid "Fix notification animation when entering multitasking view"
122-
msgstr "תיקון מיקום ההתראה לאחר החלפת DPI"
118+
msgstr "תוקנה הנפשת ההתראות בכניסה לתצוגת ריבוי משימות"
123119

124120
#: data/gala.metainfo.xml.in:36 data/gala.metainfo.xml.in:52
125121
#: data/gala.metainfo.xml.in:95 data/gala.metainfo.xml.in:117

‎po/hu.po‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: noise\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2024-09-17 18:30+0000\n"
11-
"PO-Revision-Date: 2024-08-21 17:26+0000\n"
11+
"PO-Revision-Date: 2024-10-03 23:16+0000\n"
1212
"Last-Translator: TomiOhl <[email protected]>\n"
1313
"Language-Team: Hungarian <https://l10n.elementary.io/projects/desktop/gala/"
1414
"hu/>\n"
@@ -117,16 +117,13 @@ msgid "Improvements:"
117117
msgstr "Fejlesztések:"
118118

119119
#: data/gala.metainfo.xml.in:34
120-
#, fuzzy
121-
#| msgid "Fix a potential crash when taking screenshots"
122120
msgid "Fix a potential crash when moving windows between workspaces"
123-
msgstr "Egy esetleges összeomlás javítva képernyőkép készítésekor"
121+
msgstr ""
122+
"Egy esetleges összeomlás javítva videók munkaterületek közti mozgatásakor"
124123

125124
#: data/gala.metainfo.xml.in:35
126-
#, fuzzy
127-
#| msgid "Fix notification position after changing DPI"
128125
msgid "Fix notification animation when entering multitasking view"
129-
msgstr "DPI-állítás utáni értesítéshelyzet javítva"
126+
msgstr "Értesítési felület megnyitása utáni értesítéshelyzet javítva"
130127

131128
#: data/gala.metainfo.xml.in:36 data/gala.metainfo.xml.in:52
132129
#: data/gala.metainfo.xml.in:95 data/gala.metainfo.xml.in:117

0 commit comments

Comments
 (0)