Skip to content

Commit 65a63fd

Browse files
authored
Merge branch 'main' into lenemter/fix-scale-factor
2 parents 759aa64 + 21131cc commit 65a63fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+6031
-6032
lines changed

po/POTFILES

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ src/DBusAccelerator.vala
5353
src/DBus.vala
5454
src/DesktopIntegration.vala
5555
src/Gestures/GestureSettings.vala
56-
src/Gestures/GestureTracker.vala
5756
src/Gestures/Gesture.vala
5857
src/Gestures/ScrollBackend.vala
5958
src/Gestures/ToucheggBackend.vala

po/aa.po

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: gala 3.2.0\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
10-
"POT-Creation-Date: 2025-03-02 14:11+0000\n"
10+
"POT-Creation-Date: 2025-03-12 22:19+0000\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
@@ -238,56 +238,56 @@ msgstr ""
238238
msgid "Deny"
239239
msgstr ""
240240

241-
#: src/DesktopIntegration.vala:176
241+
#: src/DesktopIntegration.vala:194
242242
msgid "Window has already focus"
243243
msgstr ""
244244

245-
#: src/ScreenshotManager.vala:309
246-
msgid "Screenshots"
245+
#. / TRANSLATORS: %s represents a timestamp here
246+
#: src/ScreenshotManager.vala:79
247+
#, c-format
248+
msgid "Screenshot from %s"
249+
msgstr ""
250+
251+
#. / TRANSLATORS: 'Files' is the name of file manager used by elementary OS
252+
#: src/ScreenshotManager.vala:137
253+
msgid "Show in Files"
247254
msgstr ""
248255

249-
#: src/ScreenshotManager.vala:401 src/WindowManager.vala:2379
256+
#: src/ScreenshotManager.vala:143 src/ScreenshotManager.vala:501
250257
msgid "Screenshot taken"
251258
msgstr ""
252259

253-
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:73
260+
#: src/ScreenshotManager.vala:144
261+
msgid "Screenshot is saved to clipboard"
262+
msgstr ""
263+
264+
#: src/ScreenshotManager.vala:144
265+
msgid "Screenshot saved to screenshots folder"
266+
msgstr ""
267+
268+
#: src/ScreenshotManager.vala:409
269+
msgid "Screenshots"
270+
msgstr ""
271+
272+
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:80
254273
msgid "Window switcher"
255274
msgstr ""
256275

257-
#: src/WindowManager.vala:2265
276+
#: src/WindowManager.vala:1735
258277
#, c-format
259278
msgid "Changes will automatically revert after %i second."
260279
msgid_plural "Changes will automatically revert after %i seconds."
261280
msgstr[0] ""
262281
msgstr[1] ""
263282

264-
#: src/WindowManager.vala:2272
283+
#: src/WindowManager.vala:1742
265284
msgid "Keep new display settings?"
266285
msgstr ""
267286

268-
#: src/WindowManager.vala:2276
287+
#: src/WindowManager.vala:1746
269288
msgid "Keep Settings"
270289
msgstr ""
271290

272-
#: src/WindowManager.vala:2277
291+
#: src/WindowManager.vala:1747
273292
msgid "Use Previous Settings"
274293
msgstr ""
275-
276-
#. / TRANSLATORS: %s represents a timestamp here
277-
#: src/WindowManager.vala:2316
278-
#, c-format
279-
msgid "Screenshot from %s"
280-
msgstr ""
281-
282-
#. / TRANSLATORS: 'Files' is the name of file manager used by elementary OS
283-
#: src/WindowManager.vala:2373
284-
msgid "Show in Files"
285-
msgstr ""
286-
287-
#: src/WindowManager.vala:2380
288-
msgid "Screenshot is saved to clipboard"
289-
msgstr ""
290-
291-
#: src/WindowManager.vala:2380
292-
msgid "Screenshot saved to screenshots folder"
293-
msgstr ""

po/ab.po

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: gala 3.2.0\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
10-
"POT-Creation-Date: 2025-03-02 14:11+0000\n"
10+
"POT-Creation-Date: 2025-03-12 22:19+0000\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
@@ -238,56 +238,56 @@ msgstr ""
238238
msgid "Deny"
239239
msgstr ""
240240

241-
#: src/DesktopIntegration.vala:176
241+
#: src/DesktopIntegration.vala:194
242242
msgid "Window has already focus"
243243
msgstr ""
244244

245-
#: src/ScreenshotManager.vala:309
246-
msgid "Screenshots"
245+
#. / TRANSLATORS: %s represents a timestamp here
246+
#: src/ScreenshotManager.vala:79
247+
#, c-format
248+
msgid "Screenshot from %s"
249+
msgstr ""
250+
251+
#. / TRANSLATORS: 'Files' is the name of file manager used by elementary OS
252+
#: src/ScreenshotManager.vala:137
253+
msgid "Show in Files"
247254
msgstr ""
248255

249-
#: src/ScreenshotManager.vala:401 src/WindowManager.vala:2379
256+
#: src/ScreenshotManager.vala:143 src/ScreenshotManager.vala:501
250257
msgid "Screenshot taken"
251258
msgstr ""
252259

253-
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:73
260+
#: src/ScreenshotManager.vala:144
261+
msgid "Screenshot is saved to clipboard"
262+
msgstr ""
263+
264+
#: src/ScreenshotManager.vala:144
265+
msgid "Screenshot saved to screenshots folder"
266+
msgstr ""
267+
268+
#: src/ScreenshotManager.vala:409
269+
msgid "Screenshots"
270+
msgstr ""
271+
272+
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:80
254273
msgid "Window switcher"
255274
msgstr ""
256275

257-
#: src/WindowManager.vala:2265
276+
#: src/WindowManager.vala:1735
258277
#, c-format
259278
msgid "Changes will automatically revert after %i second."
260279
msgid_plural "Changes will automatically revert after %i seconds."
261280
msgstr[0] ""
262281
msgstr[1] ""
263282

264-
#: src/WindowManager.vala:2272
283+
#: src/WindowManager.vala:1742
265284
msgid "Keep new display settings?"
266285
msgstr ""
267286

268-
#: src/WindowManager.vala:2276
287+
#: src/WindowManager.vala:1746
269288
msgid "Keep Settings"
270289
msgstr ""
271290

272-
#: src/WindowManager.vala:2277
291+
#: src/WindowManager.vala:1747
273292
msgid "Use Previous Settings"
274293
msgstr ""
275-
276-
#. / TRANSLATORS: %s represents a timestamp here
277-
#: src/WindowManager.vala:2316
278-
#, c-format
279-
msgid "Screenshot from %s"
280-
msgstr ""
281-
282-
#. / TRANSLATORS: 'Files' is the name of file manager used by elementary OS
283-
#: src/WindowManager.vala:2373
284-
msgid "Show in Files"
285-
msgstr ""
286-
287-
#: src/WindowManager.vala:2380
288-
msgid "Screenshot is saved to clipboard"
289-
msgstr ""
290-
291-
#: src/WindowManager.vala:2380
292-
msgid "Screenshot saved to screenshots folder"
293-
msgstr ""

po/ace.po

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: gala 3.3.2\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
10-
"POT-Creation-Date: 2025-03-02 14:11+0000\n"
10+
"POT-Creation-Date: 2025-03-12 22:19+0000\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
@@ -238,56 +238,56 @@ msgstr ""
238238
msgid "Deny"
239239
msgstr ""
240240

241-
#: src/DesktopIntegration.vala:176
241+
#: src/DesktopIntegration.vala:194
242242
msgid "Window has already focus"
243243
msgstr ""
244244

245-
#: src/ScreenshotManager.vala:309
246-
msgid "Screenshots"
245+
#. / TRANSLATORS: %s represents a timestamp here
246+
#: src/ScreenshotManager.vala:79
247+
#, c-format
248+
msgid "Screenshot from %s"
249+
msgstr ""
250+
251+
#. / TRANSLATORS: 'Files' is the name of file manager used by elementary OS
252+
#: src/ScreenshotManager.vala:137
253+
msgid "Show in Files"
247254
msgstr ""
248255

249-
#: src/ScreenshotManager.vala:401 src/WindowManager.vala:2379
256+
#: src/ScreenshotManager.vala:143 src/ScreenshotManager.vala:501
250257
msgid "Screenshot taken"
251258
msgstr ""
252259

253-
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:73
260+
#: src/ScreenshotManager.vala:144
261+
msgid "Screenshot is saved to clipboard"
262+
msgstr ""
263+
264+
#: src/ScreenshotManager.vala:144
265+
msgid "Screenshot saved to screenshots folder"
266+
msgstr ""
267+
268+
#: src/ScreenshotManager.vala:409
269+
msgid "Screenshots"
270+
msgstr ""
271+
272+
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:80
254273
msgid "Window switcher"
255274
msgstr ""
256275

257-
#: src/WindowManager.vala:2265
276+
#: src/WindowManager.vala:1735
258277
#, c-format
259278
msgid "Changes will automatically revert after %i second."
260279
msgid_plural "Changes will automatically revert after %i seconds."
261280
msgstr[0] ""
262281
msgstr[1] ""
263282

264-
#: src/WindowManager.vala:2272
283+
#: src/WindowManager.vala:1742
265284
msgid "Keep new display settings?"
266285
msgstr ""
267286

268-
#: src/WindowManager.vala:2276
287+
#: src/WindowManager.vala:1746
269288
msgid "Keep Settings"
270289
msgstr ""
271290

272-
#: src/WindowManager.vala:2277
291+
#: src/WindowManager.vala:1747
273292
msgid "Use Previous Settings"
274293
msgstr ""
275-
276-
#. / TRANSLATORS: %s represents a timestamp here
277-
#: src/WindowManager.vala:2316
278-
#, c-format
279-
msgid "Screenshot from %s"
280-
msgstr ""
281-
282-
#. / TRANSLATORS: 'Files' is the name of file manager used by elementary OS
283-
#: src/WindowManager.vala:2373
284-
msgid "Show in Files"
285-
msgstr ""
286-
287-
#: src/WindowManager.vala:2380
288-
msgid "Screenshot is saved to clipboard"
289-
msgstr ""
290-
291-
#: src/WindowManager.vala:2380
292-
msgid "Screenshot saved to screenshots folder"
293-
msgstr ""

po/ae.po

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: gala 3.2.0\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
10-
"POT-Creation-Date: 2025-03-02 14:11+0000\n"
10+
"POT-Creation-Date: 2025-03-12 22:19+0000\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
@@ -238,56 +238,56 @@ msgstr ""
238238
msgid "Deny"
239239
msgstr ""
240240

241-
#: src/DesktopIntegration.vala:176
241+
#: src/DesktopIntegration.vala:194
242242
msgid "Window has already focus"
243243
msgstr ""
244244

245-
#: src/ScreenshotManager.vala:309
246-
msgid "Screenshots"
245+
#. / TRANSLATORS: %s represents a timestamp here
246+
#: src/ScreenshotManager.vala:79
247+
#, c-format
248+
msgid "Screenshot from %s"
249+
msgstr ""
250+
251+
#. / TRANSLATORS: 'Files' is the name of file manager used by elementary OS
252+
#: src/ScreenshotManager.vala:137
253+
msgid "Show in Files"
247254
msgstr ""
248255

249-
#: src/ScreenshotManager.vala:401 src/WindowManager.vala:2379
256+
#: src/ScreenshotManager.vala:143 src/ScreenshotManager.vala:501
250257
msgid "Screenshot taken"
251258
msgstr ""
252259

253-
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:73
260+
#: src/ScreenshotManager.vala:144
261+
msgid "Screenshot is saved to clipboard"
262+
msgstr ""
263+
264+
#: src/ScreenshotManager.vala:144
265+
msgid "Screenshot saved to screenshots folder"
266+
msgstr ""
267+
268+
#: src/ScreenshotManager.vala:409
269+
msgid "Screenshots"
270+
msgstr ""
271+
272+
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:80
254273
msgid "Window switcher"
255274
msgstr ""
256275

257-
#: src/WindowManager.vala:2265
276+
#: src/WindowManager.vala:1735
258277
#, c-format
259278
msgid "Changes will automatically revert after %i second."
260279
msgid_plural "Changes will automatically revert after %i seconds."
261280
msgstr[0] ""
262281
msgstr[1] ""
263282

264-
#: src/WindowManager.vala:2272
283+
#: src/WindowManager.vala:1742
265284
msgid "Keep new display settings?"
266285
msgstr ""
267286

268-
#: src/WindowManager.vala:2276
287+
#: src/WindowManager.vala:1746
269288
msgid "Keep Settings"
270289
msgstr ""
271290

272-
#: src/WindowManager.vala:2277
291+
#: src/WindowManager.vala:1747
273292
msgid "Use Previous Settings"
274293
msgstr ""
275-
276-
#. / TRANSLATORS: %s represents a timestamp here
277-
#: src/WindowManager.vala:2316
278-
#, c-format
279-
msgid "Screenshot from %s"
280-
msgstr ""
281-
282-
#. / TRANSLATORS: 'Files' is the name of file manager used by elementary OS
283-
#: src/WindowManager.vala:2373
284-
msgid "Show in Files"
285-
msgstr ""
286-
287-
#: src/WindowManager.vala:2380
288-
msgid "Screenshot is saved to clipboard"
289-
msgstr ""
290-
291-
#: src/WindowManager.vala:2380
292-
msgid "Screenshot saved to screenshots folder"
293-
msgstr ""

0 commit comments

Comments
 (0)