Skip to content

Commit a9f8226

Browse files
authored
Merge branch 'main' into leolost/make-modal
2 parents 46d8a2d + 87c5c82 commit a9f8226

File tree

14 files changed

+103
-109
lines changed

14 files changed

+103
-109
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:

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

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/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

po/nb.po

Lines changed: 9 additions & 8 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-09-18 12:00+0000\n"
11+
"PO-Revision-Date: 2024-09-19 07:21+0000\n"
1212
"Last-Translator: Allan Nordhøy <[email protected]>\n"
1313
"Language-Team: Norwegian Bokmål <https://l10n.elementary.io/projects/desktop/"
1414
"gala/nb/>\n"
@@ -185,11 +185,12 @@ msgstr "Tilbakefallsskrivebordsfil for varsler fra utdaterte programmer."
185185
#: lib/App.vala:51
186186
msgctxt "program"
187187
msgid "Unknown"
188-
msgstr ""
188+
msgstr "Ukjent"
189189

190190
#: src/DesktopIntegration.vala:132
191+
#, fuzzy
191192
msgid "Window has already focus"
192-
msgstr ""
193+
msgstr "Vinduet har allerede fokus"
193194

194195
#: src/Dialogs.vala:144
195196
#, c-format
@@ -219,23 +220,23 @@ msgstr "Vent"
219220
#: src/Dialogs.vala:217
220221
#, c-format
221222
msgid "“%s” wants to inhibit system shortcuts"
222-
msgstr ""
223+
msgstr "«%s» ønsker å ta over for systemsnarveier:"
223224

224225
#: src/Dialogs.vala:219
225226
msgid "An application wants to inhibit system shortcuts"
226-
msgstr ""
227+
msgstr "Et program ønsker å ta over for systemsnarveier"
227228

228229
#: src/Dialogs.vala:222
229230
msgid "All system shortcuts will be redirected to the application."
230-
msgstr ""
231+
msgstr "Alle systemsnarveier vil bli videresendt til programmet."
231232

232233
#: src/Dialogs.vala:223
233234
msgid "Allow"
234235
msgstr "Tillat"
235236

236237
#: src/Dialogs.vala:224
237238
msgid "Deny"
238-
msgstr ""
239+
msgstr "Nekt"
239240

240241
#: src/ScreenshotManager.vala:290
241242
msgid "Screenshots"
@@ -247,7 +248,7 @@ msgstr "Skjermavbildning utført"
247248

248249
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:73
249250
msgid "Window switcher"
250-
msgstr ""
251+
msgstr "Vindusbytter"
251252

252253
#: src/WindowManager.vala:2365
253254
#, c-format

po/nl.po

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ 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-21 17:26+0000\n"
11+
"PO-Revision-Date: 2024-09-22 01:32+0000\n"
1212
"Last-Translator: DutchVipperloid <[email protected]>\n"
1313
"Language-Team: Dutch <https://l10n.elementary.io/projects/desktop/gala/nl/>\n"
1414
"Language: nl\n"
@@ -115,16 +115,16 @@ msgid "Improvements:"
115115
msgstr "Verbeteringen:"
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 "Een mogelijke crash verholpen bij het maken van screenshots"
119+
msgstr ""
120+
"Een mogelijke crash verholpen wanneer vensters worden bewogen tussen "
121+
"werkruimtes"
122122

123123
#: data/gala.metainfo.xml.in:35
124-
#, fuzzy
125-
#| msgid "Fix notification position after changing DPI"
126124
msgid "Fix notification animation when entering multitasking view"
127-
msgstr "De positie van notificaties is verbeterd na het veranderen van DPI"
125+
msgstr ""
126+
"De notificatie animatie verholpen wanneer multitaskingweergave wordt "
127+
"opgeroepen"
128128

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

po/pl.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-21 17:26+0000\n"
11+
"PO-Revision-Date: 2024-09-23 10:39+0000\n"
1212
"Last-Translator: Marcin Serwin <[email protected]>\n"
13-
"Language-Team: Polish <https://l10n.elementary.io/projects/desktop/gala/pl/"
14-
">\n"
13+
"Language-Team: Polish <https://l10n.elementary.io/projects/desktop/gala/pl/>"
14+
"\n"
1515
"Language: pl\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
@@ -116,16 +116,16 @@ msgid "Improvements:"
116116
msgstr "Ulepszenia:"
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 "Naprawiono potencjalny crash podczas robienia zrzutu ekranu"
120+
msgstr ""
121+
"Naprawiono potencjalny crash podczas przenoszenia okien między obszarami "
122+
"roboczymi"
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 "Napraw pozycję powiadomień po zmianie DPI"
126+
msgstr ""
127+
"Naprawiono animację powiadomienia podczas wchodzenia do widoku "
128+
"wielozadaniowego"
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/sk.po

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ msgstr ""
99
"Project-Id-Version: noise\n"
1010
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1111
"POT-Creation-Date: 2024-09-17 18:30+0000\n"
12-
"PO-Revision-Date: 2024-08-20 11:26+0000\n"
12+
"PO-Revision-Date: 2024-10-05 18:16+0000\n"
1313
"Last-Translator: JohnDumpling <[email protected]>\n"
14-
"Language-Team: Slovak <https://l10n.elementary.io/projects/desktop/gala/sk/"
15-
">\n"
14+
"Language-Team: Slovak <https://l10n.elementary.io/projects/desktop/gala/sk/>"
15+
"\n"
1616
"Language: sk\n"
1717
"MIME-Version: 1.0\n"
1818
"Content-Type: text/plain; charset=UTF-8\n"
@@ -71,7 +71,7 @@ msgstr "Presunúť na plochu vpravo"
7171

7272
#: daemon-gtk3/WindowMenu.vala:97 daemon/WindowMenu.vala:114
7373
msgid "Take Screenshot"
74-
msgstr "Vytvoriť snímku obrazovky"
74+
msgstr "Zachytiť snímku obrazovky"
7575

7676
#: daemon-gtk3/WindowMenu.vala:105 daemon/WindowMenu.vala:124
7777
msgid "Close"
@@ -116,14 +116,12 @@ msgid "Improvements:"
116116
msgstr "Vylepšenia:"
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 "Opravený potenciálny pád pri vytváraní snímok obrazovky"
120+
msgstr "Opravený potenciálny pád pri pohybovaní okien medzi pracovnými plochami"
123121

124122
#: data/gala.metainfo.xml.in:35
125123
msgid "Fix notification animation when entering multitasking view"
126-
msgstr ""
124+
msgstr "Opravená animácia oznámení pri prechode do zobrazenia úloh"
127125

128126
#: data/gala.metainfo.xml.in:36 data/gala.metainfo.xml.in:52
129127
#: data/gala.metainfo.xml.in:95 data/gala.metainfo.xml.in:117
@@ -246,7 +244,7 @@ msgstr "Snímka obrazovky vytvorená"
246244

247245
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:73
248246
msgid "Window switcher"
249-
msgstr ""
247+
msgstr "Prepínač okien"
250248

251249
#: src/WindowManager.vala:2365
252250
#, c-format

0 commit comments

Comments
 (0)