Skip to content

Commit aeb7135

Browse files
authored
Merge branch 'main' into lenemter/update-animated-bg
2 parents d8e58e7 + 2cb45c9 commit aeb7135

File tree

9 files changed

+72
-70
lines changed

9 files changed

+72
-70
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/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/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/tr.po

Lines changed: 28 additions & 30 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: 2024-09-17 18:30+0000\n"
11-
"PO-Revision-Date: 2023-05-18 20:06+0000\n"
12-
"Last-Translator: Özgür Baskin <queeup@zoho.com>\n"
13-
"Language-Team: Turkish <https://l10n.elementary.io/projects/desktop/gala/tr/"
14-
">\n"
11+
"PO-Revision-Date: 2024-09-21 10:16+0000\n"
12+
"Last-Translator: Sinan Decron <sinanveyasinan@gmail.com>\n"
13+
"Language-Team: Turkish <https://l10n.elementary.io/projects/desktop/gala/tr/>"
14+
"\n"
1515
"Language: tr\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 4.17\n"
20+
"X-Generator: Weblate 5.6.2\n"
2121
"X-Launchpad-Export-Date: 2017-02-21 05:47+0000\n"
2222

2323
#: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -33,14 +33,12 @@ msgid "System Settings…"
3333
msgstr "Sistem Ayarları…"
3434

3535
#: daemon/DBus.vala:207 daemon-gtk3/BackgroundMenu.vala:47
36-
#, fuzzy
37-
#| msgid "System Settings…"
3836
msgid "Failed to open System Settings"
39-
msgstr "Sistem Ayarları"
37+
msgstr "Sistem Ayarları açılamadı"
4038

4139
#: daemon/DBus.vala:208 daemon-gtk3/BackgroundMenu.vala:48
4240
msgid "A handler for the “settings://” URI scheme must be installed."
43-
msgstr ""
41+
msgstr "“settings://” URI şeması için bir işleyici yüklenmelidir."
4442

4543
#: daemon-gtk3/WindowMenu.vala:36 daemon/WindowMenu.vala:38
4644
msgid "Hide"
@@ -117,16 +115,14 @@ msgid "Improvements:"
117115
msgstr "İyileştirmeler:"
118116

119117
#: data/gala.metainfo.xml.in:34
120-
#, fuzzy
121-
#| msgid "Fix a potential crash when taking screenshots"
122118
msgid "Fix a potential crash when moving windows between workspaces"
123-
msgstr "Ekran görüntüsü alırken olası bir çökme düzeltildi"
119+
msgstr ""
120+
"Çalışma alanları arasında pencereleri taşırken oluşabilecek bir çökme hatası "
121+
"düzeltildi"
124122

125123
#: data/gala.metainfo.xml.in:35
126-
#, fuzzy
127-
#| msgid "Fix notification position after changing DPI"
128124
msgid "Fix notification animation when entering multitasking view"
129-
msgstr "DPI değiştirdikten sonraki bildirim konumu düzeltildi"
125+
msgstr "Çoklu görev görünümüne girildiğinde bildirim animasyonunu düzeltildi"
130126

131127
#: data/gala.metainfo.xml.in:36 data/gala.metainfo.xml.in:52
132128
#: data/gala.metainfo.xml.in:95 data/gala.metainfo.xml.in:117
@@ -135,36 +131,38 @@ msgid "Updated translations"
135131
msgstr "Çeviriler güncellendi"
136132

137133
#: data/gala.metainfo.xml.in:50
138-
#, fuzzy
139-
#| msgid "Multitasking View"
140134
msgid "Improve keyboard navigation in Multitasking View"
141-
msgstr "Çoklu Görev Görünümü"
135+
msgstr "Çoklu Görev Görünümünde klavye gezintisini iyileştirildi"
142136

143137
#: data/gala.metainfo.xml.in:51
144138
msgid "Change panel color at the same time as wallpaper transition"
145-
msgstr ""
139+
msgstr "Duvar kağıdı geçişiyle aynı anda panel rengini değiştir"
146140

147141
#: data/gala.metainfo.xml.in:91
148142
msgid ""
149143
"Changing the wallpaper or going to sleep respects the \"Reduce Motion\" "
150144
"option"
151145
msgstr ""
146+
"Duvar kağıdını değiştirmek veya uyku moduna geçmek \"Hareketi Azalt\" "
147+
"seçeneğini dikkate alır"
152148

153149
#: data/gala.metainfo.xml.in:92
154150
msgid "Use appropriate drag-and-drop pointers when moving windows"
155-
msgstr ""
151+
msgstr "Pencereleri taşırken uygun sürükle ve bırak işaretçilerini kullan"
156152

157153
#: data/gala.metainfo.xml.in:93
158154
msgid "Fix the issue when gestures in the multitasking view might stop working"
159155
msgstr ""
156+
"Çoklu görev görünümünde hareketlerin çalışmayı durdurabileceği sorun "
157+
"düzeltildi"
160158

161159
#: data/gala.metainfo.xml.in:94
162160
msgid "Improve dynamic workspaces behaviour with multiple monitors"
163-
msgstr ""
161+
msgstr "Birden fazla monitörle dinamik çalışma alanı davranışını iyileştirildi"
164162

165163
#: data/gala.metainfo.xml.in:116
166164
msgid "Improve handling of move-to-workspace shortcut"
167-
msgstr ""
165+
msgstr "Çalışma alanına taşıma kısayolunun kullanımını iyileştirildi"
168166

169167
#: data/gala-multitaskingview.desktop.in:4
170168
#: data/gala-multitaskingview.desktop.in:6
@@ -187,11 +185,11 @@ msgstr ""
187185
#: lib/App.vala:51
188186
msgctxt "program"
189187
msgid "Unknown"
190-
msgstr ""
188+
msgstr "Bilinmeyen"
191189

192190
#: src/DesktopIntegration.vala:132
193191
msgid "Window has already focus"
194-
msgstr ""
192+
msgstr "Pencere zaten odaklanmış durumda"
195193

196194
#: src/Dialogs.vala:144
197195
#, c-format
@@ -221,23 +219,23 @@ msgstr "Bekle"
221219
#: src/Dialogs.vala:217
222220
#, c-format
223221
msgid "“%s” wants to inhibit system shortcuts"
224-
msgstr ""
222+
msgstr "“%s” sistem kısayollarını engellemek istiyor"
225223

226224
#: src/Dialogs.vala:219
227225
msgid "An application wants to inhibit system shortcuts"
228-
msgstr ""
226+
msgstr "Bir uygulama sistem kısayollarını engellemek istiyor"
229227

230228
#: src/Dialogs.vala:222
231229
msgid "All system shortcuts will be redirected to the application."
232-
msgstr ""
230+
msgstr "Tüm sistem kısayolları uygulamaya yönlendirilecektir."
233231

234232
#: src/Dialogs.vala:223
235233
msgid "Allow"
236-
msgstr ""
234+
msgstr "İzin ver"
237235

238236
#: src/Dialogs.vala:224
239237
msgid "Deny"
240-
msgstr ""
238+
msgstr "Reddet"
241239

242240
#: src/ScreenshotManager.vala:290
243241
msgid "Screenshots"
@@ -249,7 +247,7 @@ msgstr "Ekran görüntüsüsü alındı"
249247

250248
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:73
251249
msgid "Window switcher"
252-
msgstr ""
250+
msgstr "Pencere değiştirici"
253251

254252
#: src/WindowManager.vala:2365
255253
#, c-format

src/ShellClients/ManagedClient.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class Gala.ManagedClient : Object {
4848
}
4949

5050
private async void start_wayland () {
51-
var subprocess_launcher = new GLib.SubprocessLauncher (STDERR_PIPE | STDOUT_PIPE);
51+
var subprocess_launcher = new GLib.SubprocessLauncher (INHERIT_FDS);
5252
try {
5353
#if HAS_MUTTER44
5454
wayland_client = new Meta.WaylandClient (display.get_context (), subprocess_launcher);

0 commit comments

Comments
 (0)