Skip to content

Commit 7081e6b

Browse files
authored
Merge branch 'main' into leolost/gtk-background
2 parents da4dbaf + a31eab4 commit 7081e6b

File tree

7 files changed

+55
-44
lines changed

7 files changed

+55
-44
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/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: 16 additions & 12 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-09-20 09:43+0000\n"
11+
"PO-Revision-Date: 2024-09-21 10:16+0000\n"
1212
"Last-Translator: Sinan Decron <[email protected]>\n"
1313
"Language-Team: Turkish <https://l10n.elementary.io/projects/desktop/gala/tr/>"
1414
"\n"
@@ -143,22 +143,26 @@ msgid ""
143143
"Changing the wallpaper or going to sleep respects the \"Reduce Motion\" "
144144
"option"
145145
msgstr ""
146+
"Duvar kağıdını değiştirmek veya uyku moduna geçmek \"Hareketi Azalt\" "
147+
"seçeneğini dikkate alır"
146148

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

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

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

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

163167
#: data/gala-multitaskingview.desktop.in:4
164168
#: data/gala-multitaskingview.desktop.in:6
@@ -181,11 +185,11 @@ msgstr ""
181185
#: lib/App.vala:51
182186
msgctxt "program"
183187
msgid "Unknown"
184-
msgstr ""
188+
msgstr "Bilinmeyen"
185189

186190
#: src/DesktopIntegration.vala:132
187191
msgid "Window has already focus"
188-
msgstr ""
192+
msgstr "Pencere zaten odaklanmış durumda"
189193

190194
#: src/Dialogs.vala:144
191195
#, c-format
@@ -215,23 +219,23 @@ msgstr "Bekle"
215219
#: src/Dialogs.vala:217
216220
#, c-format
217221
msgid "“%s” wants to inhibit system shortcuts"
218-
msgstr ""
222+
msgstr "“%s” sistem kısayollarını engellemek istiyor"
219223

220224
#: src/Dialogs.vala:219
221225
msgid "An application wants to inhibit system shortcuts"
222-
msgstr ""
226+
msgstr "Bir uygulama sistem kısayollarını engellemek istiyor"
223227

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

228232
#: src/Dialogs.vala:223
229233
msgid "Allow"
230-
msgstr ""
234+
msgstr "İzin ver"
231235

232236
#: src/Dialogs.vala:224
233237
msgid "Deny"
234-
msgstr ""
238+
msgstr "Reddet"
235239

236240
#: src/ScreenshotManager.vala:290
237241
msgid "Screenshots"
@@ -243,7 +247,7 @@ msgstr "Ekran görüntüsüsü alındı"
243247

244248
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:73
245249
msgid "Window switcher"
246-
msgstr ""
250+
msgstr "Pencere değiştirici"
247251

248252
#: src/WindowManager.vala:2365
249253
#, c-format

0 commit comments

Comments
 (0)