Merge branch 'master' into tintou/nondeprecated-spawn

elementary · Dec 6, 2024 · 82b56ed · 82b56ed
2 parents 0f9f93f + e1a34f7
commit 82b56ed
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 57 deletions.
diff --git a/po/extra/en_GB.po b/po/extra/en_GB.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: pantheon-terminal\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-15 19:29+0000\n"
-"PO-Revision-Date: 2024-07-12 20:16+0000\n"
+"PO-Revision-Date: 2024-12-04 13:18+0000\n"
 "Last-Translator: David Hewitt <davidmhewitt@gmail.com>\n"
 "Language-Team: English (United Kingdom) <https://l10n.elementary.io/projects/"
 "terminal/extra/en_GB/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.6.2\n"
+"X-Generator: Weblate 5.8.4\n"
 "X-Launchpad-Export-Date: 2016-10-17 06:41+0000\n"
 
 #: data/io.elementary.terminal.appdata.xml.in:10
@@ -48,15 +48,15 @@ msgstr "New features:"
 
 #: data/io.elementary.terminal.appdata.xml.in:60
 msgid "Show zoom level in overlay when zooming"
-msgstr ""
+msgstr "Show zoom level in overlay when zooming"
 
 #: data/io.elementary.terminal.appdata.xml.in:61
 msgid "Implement Clear and Reset context menu actions with accelerators"
-msgstr ""
+msgstr "Implement Clear and Reset context menu actions with accelerators"
 
 #: data/io.elementary.terminal.appdata.xml.in:62
 msgid "Add toggle for unsafe paste warning to application menu"
-msgstr ""
+msgstr "Add toggle for unsafe paste warning to application menu"
 
 #: data/io.elementary.terminal.appdata.xml.in:64
 #: data/io.elementary.terminal.appdata.xml.in:89
@@ -72,22 +72,24 @@ msgid ""
 "Update the icon and tooltip of the cyclic search togglebutton according to "
 "its state"
 msgstr ""
+"Update the icon and tooltip of the cyclic search togglebutton according to "
+"its state"
 
 #: data/io.elementary.terminal.appdata.xml.in:67
 msgid "Focus correct tab after clicking on a process finished notification"
-msgstr ""
+msgstr "Focus correct tab after clicking on a process finished notification"
 
 #: data/io.elementary.terminal.appdata.xml.in:68
 msgid "Check for \"doas\" as well as \"sudo\" when text pasted into terminal"
-msgstr ""
+msgstr "Check for \"doas\" as well as \"sudo\" when text pasted into terminal"
 
 #: data/io.elementary.terminal.appdata.xml.in:69
 msgid "Check for unsafe paste on dropping text as well"
-msgstr ""
+msgstr "Check for unsafe paste on dropping text as well"
 
 #: data/io.elementary.terminal.appdata.xml.in:70
 msgid "Improve gray contrast in dark theme"
-msgstr ""
+msgstr "Improve gray contrast in dark theme"
 
 #: data/io.elementary.terminal.appdata.xml.in:71
 #: data/io.elementary.terminal.appdata.xml.in:93

diff --git a/po/extra/pl.po b/po/extra/pl.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: pantheon-terminal\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-15 19:29+0000\n"
-"PO-Revision-Date: 2024-07-21 09:16+0000\n"
-"Last-Translator: Marcin Serwin <marcin.serwin0@protonmail.com>\n"
+"PO-Revision-Date: 2024-12-03 18:16+0000\n"
+"Last-Translator: Marcin Serwin <marcin@serwin.dev>\n"
 "Language-Team: Polish <https://l10n.elementary.io/projects/terminal/extra/pl/"
 ">\n"
 "Language: pl\n"
@@ -49,15 +49,19 @@ msgstr "Nowe funkcje:"
 
 #: data/io.elementary.terminal.appdata.xml.in:60
 msgid "Show zoom level in overlay when zooming"
-msgstr ""
+msgstr "Poziom przybliżeniu jest pokazywany w nakładce podczas przybliżania"
 
 #: data/io.elementary.terminal.appdata.xml.in:61
 msgid "Implement Clear and Reset context menu actions with accelerators"
 msgstr ""
+"Implementacja akcji menu kontekstowego „Wyczyść” oraz „Resetuj” przy użyciu "
+"akceleratorów"
 
 #: data/io.elementary.terminal.appdata.xml.in:62
 msgid "Add toggle for unsafe paste warning to application menu"
 msgstr ""
+"Dodano przełącznik dla ostrzeżenia o niebezpiecznym wklejeniu w menu "
+"aplikacji"
 
 #: data/io.elementary.terminal.appdata.xml.in:64
 #: data/io.elementary.terminal.appdata.xml.in:89
@@ -73,22 +77,28 @@ msgid ""
 "Update the icon and tooltip of the cyclic search togglebutton according to "
 "its state"
 msgstr ""
+"Aktualizowanie ikony i tooltipa przycisku cyklicznego wyszukiwania w "
+"zależności od jego stanu"
 
 #: data/io.elementary.terminal.appdata.xml.in:67
 msgid "Focus correct tab after clicking on a process finished notification"
 msgstr ""
+"Skupienie na poprawnej karcie po kliknięciu na powiadomienie o zakończonym "
+"procesie"
 
 #: data/io.elementary.terminal.appdata.xml.in:68
 msgid "Check for \"doas\" as well as \"sudo\" when text pasted into terminal"
 msgstr ""
+"Sprawdzanie zarówno obecności „doas” jak i „sudo” przy wklejaniu tekstu do "
+"terminala"
 
 #: data/io.elementary.terminal.appdata.xml.in:69
 msgid "Check for unsafe paste on dropping text as well"
-msgstr ""
+msgstr "Sprawdzanie niebezpiecznego wklejania również przy upuszczaniu tekstu"
 
 #: data/io.elementary.terminal.appdata.xml.in:70
 msgid "Improve gray contrast in dark theme"
-msgstr ""
+msgstr "Poprawiono kontrast szarości w ciemnym motywie"
 
 #: data/io.elementary.terminal.appdata.xml.in:71
 #: data/io.elementary.terminal.appdata.xml.in:93

diff --git a/po/extra/uk.po b/po/extra/uk.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: pantheon-terminal\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-15 19:29+0000\n"
-"PO-Revision-Date: 2024-07-21 09:16+0000\n"
+"PO-Revision-Date: 2024-11-27 02:16+0000\n"
 "Last-Translator: Ihor Hordiichuk <igor_ck@outlook.com>\n"
 "Language-Team: Ukrainian <https://l10n.elementary.io/projects/terminal/extra/"
 "uk/>\n"
@@ -50,15 +50,19 @@ msgstr "Нові функції:"
 
 #: data/io.elementary.terminal.appdata.xml.in:60
 msgid "Show zoom level in overlay when zooming"
-msgstr ""
+msgstr "Показ масштабу в накладенні під час масштабування"
 
 #: data/io.elementary.terminal.appdata.xml.in:61
 msgid "Implement Clear and Reset context menu actions with accelerators"
 msgstr ""
+"Реалізовано дії контекстного меню \"Очистити\" та \"Скинути\" з "
+"акселераторами"
 
 #: data/io.elementary.terminal.appdata.xml.in:62
 msgid "Add toggle for unsafe paste warning to application menu"
 msgstr ""
+"Додано перемикач для попередження про небезпечне вставлення до меню "
+"застосунку"
 
 #: data/io.elementary.terminal.appdata.xml.in:64
 #: data/io.elementary.terminal.appdata.xml.in:89
@@ -74,22 +78,28 @@ msgid ""
 "Update the icon and tooltip of the cyclic search togglebutton according to "
 "its state"
 msgstr ""
+"Оновлення піктограми та підказки перемикача циклічного пошуку відповідно до "
+"його стану"
 
 #: data/io.elementary.terminal.appdata.xml.in:67
 msgid "Focus correct tab after clicking on a process finished notification"
 msgstr ""
+"Фокусування на правильній вкладці після натискання на сповіщення про "
+"завершення процесу"
 
 #: data/io.elementary.terminal.appdata.xml.in:68
 msgid "Check for \"doas\" as well as \"sudo\" when text pasted into terminal"
 msgstr ""
+"Перевірка наявності \"doas\", а також \"sudo\" у тексті, що вставляється в "
+"термінал"
 
 #: data/io.elementary.terminal.appdata.xml.in:69
 msgid "Check for unsafe paste on dropping text as well"
-msgstr ""
+msgstr "Перевірка, чи немає небезпечної вставки під час перетягування тексту"
 
 #: data/io.elementary.terminal.appdata.xml.in:70
 msgid "Improve gray contrast in dark theme"
-msgstr ""
+msgstr "Покращення контрасту сірого в темній темі"
 
 #: data/io.elementary.terminal.appdata.xml.in:71
 #: data/io.elementary.terminal.appdata.xml.in:93

diff --git a/po/fi.po b/po/fi.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: pantheon-terminal\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-15 19:29+0000\n"
-"PO-Revision-Date: 2023-03-31 19:59+0000\n"
+"PO-Revision-Date: 2024-12-02 14:16+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish <https://l10n.elementary.io/projects/terminal/"
 "terminal/fi/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.16.4\n"
+"X-Generator: Weblate 5.6.2\n"
 "X-Launchpad-Export-Date: 2016-10-17 06:41+0000\n"
 
 #: src/Application.vala:63
@@ -31,10 +31,8 @@ msgstr "Avaa uusi pääteikkuna"
 
 #. -t flag forces a new tab
 #: src/Application.vala:67
-#, fuzzy
-#| msgid "Open a new terminal window"
 msgid "Open a new terminal tab at current working directory"
-msgstr "Avaa uusi pääteikkuna"
+msgstr "Avaa uusi päätevälilehti nykyiseen työskentelyhakemistoon"
 
 #. -w flag defines the working directory that the new tab/window uses
 #: src/Application.vala:69
@@ -70,7 +68,7 @@ msgstr "Prosessi sulkeutui virheiden kera"
 
 #: src/MainWindow.vala:166
 msgid "Show Search Bar"
-msgstr ""
+msgstr "Näytä hakupalkki"
 
 #. TerminalWidget actions
 #: src/MainWindow.vala:173
@@ -83,11 +81,11 @@ msgstr "Kopioi viimeisin tuloste"
 
 #: src/MainWindow.vala:185
 msgid "Clear Screen"
-msgstr ""
+msgstr "Tyhjennä näyttö"
 
 #: src/MainWindow.vala:191
 msgid "Reset"
-msgstr ""
+msgstr "Nollaa"
 
 #: src/MainWindow.vala:197
 msgid "Paste"
@@ -98,10 +96,8 @@ msgid "Select All"
 msgstr "Valitse kaikki"
 
 #: src/MainWindow.vala:302
-#, fuzzy
-#| msgid "Fullscreen"
 msgid "Exit FullScreen"
-msgstr "Koko näyttö"
+msgstr "Poistu koko näytön tilasta"
 
 #: src/MainWindow.vala:311 src/MainWindow.vala:1014
 msgid "Find…"
@@ -329,16 +325,12 @@ msgid "Next result"
 msgstr "Seuraava tulos"
 
 #: src/Widgets/SearchToolbar.vala:59
-#, fuzzy
-#| msgid "Cyclic search"
 msgid "Disable cyclic search"
-msgstr "Kierteinen haku"
+msgstr "Poista kierteinen haku käytöstä"
 
 #: src/Widgets/SearchToolbar.vala:62
-#, fuzzy
-#| msgid "Cyclic search"
 msgid "Enable cyclic search"
-msgstr "Kierteinen haku"
+msgstr "Käytä kierteistä hakua"
 
 #: src/Widgets/SettingsPopover.vala:40
 msgid "Zoom out"
@@ -380,17 +372,16 @@ msgstr ""
 
 #: src/Widgets/SettingsPopover.vala:116
 msgid "Unsafe Paste Alert"
-msgstr ""
+msgstr "Turvattoman liittämisen varoitus"
 
 #: src/Widgets/SettingsPopover.vala:117
-#, fuzzy
-#| msgid "The pasted text may contain multiple commands"
 msgid "Warn when pasted text contains multiple or administrative commands"
-msgstr "Tämä liitetty teksti saattaa sisältää useita komentoja"
+msgstr ""
+"Varoita kun liitetty teksti sisältää useita komentoja tai ylläpitokomentoja"
 
 #: src/Widgets/SettingsPopover.vala:121
 msgid "Event Alerts"
-msgstr ""
+msgstr "Tapahtumahälytykset"
 
 #: src/Widgets/SettingsPopover.vala:122
 msgid ""
@@ -416,32 +407,24 @@ msgid "New Tab"
 msgstr "Uusi välilehti"
 
 #: src/Widgets/TerminalView.vala:70
-#, fuzzy
-#| msgid "Close Tab"
 msgid "Closed Tabs"
-msgstr "Sulje välilehti"
+msgstr "Suljetut välilehdet"
 
 #: src/Widgets/TerminalView.vala:210
 msgid "Close Tabs to the Right"
-msgstr ""
+msgstr "Sulje välilehdet tästä oikealle"
 
 #: src/Widgets/TerminalView.vala:211
-#, fuzzy
-#| msgid "Close Tab"
 msgid "Close Other Tabs"
-msgstr "Sulje välilehti"
+msgstr "Sulje muut välilehdet"
 
 #: src/Widgets/TerminalView.vala:215
-#, fuzzy
-#| msgid "New Window"
 msgid "Open in New Window"
-msgstr "Uusi ikkuna"
+msgstr "Avaa uudessa ikkunassa"
 
 #: src/Widgets/TerminalView.vala:216
-#, fuzzy
-#| msgid "Duplicate"
 msgid "Duplicate Tab"
-msgstr "Tee kaksoiskappale"
+msgstr "Tee kaksoiskappale välilehdestä"
 
 #: src/Widgets/TerminalView.vala:219
 msgid "Reload"
@@ -450,7 +433,7 @@ msgstr "Lataa uudelleen"
 #: src/Widgets/ZoomOverlay.vala:15
 #, c-format
 msgid "Zoom: %.0f%%"
-msgstr ""
+msgstr "Suurennus: %.0f%%"
 
 #~ msgid "Open a new terminal tab"
 #~ msgstr "Avaa uusi päätevälilehti"

diff --git a/src/Application.vala b/src/Application.vala
@@ -202,12 +202,38 @@ public class Terminal.Application : Gtk.Application {
                 notification.set_icon (process_icon);
                 notification.set_default_action_and_target_value ("app.process-finished", new Variant.string (id));
                 send_notification ("process-finished-%s".printf (id), notification);
+
+                ulong tab_change_handler = 0;
+                ulong focus_in_handler = 0;
+
+                tab_change_handler = terminal.main_window.notify["current-terminal"].connect (() => {
+                    withdraw_notification_for_terminal (terminal, id, tab_change_handler, focus_in_handler);
+                });
+
+                focus_in_handler = terminal.main_window.focus_in_event.connect (() => {
+                    withdraw_notification_for_terminal (terminal, id, tab_change_handler, focus_in_handler);
+
+                    return Gdk.EVENT_PROPAGATE;
+                });
+
             }
         });
 
         return true;
     }
 
+    private void withdraw_notification_for_terminal (TerminalWidget terminal, string id, ulong tab_change_handler, ulong focus_in_handler) {
+        if (terminal.main_window.current_terminal != terminal) {
+            return;
+        }
+
+        terminal.tab.icon = null;
+        withdraw_notification ("process-finished-%s".printf (id));
+
+        terminal.main_window.disconnect (tab_change_handler);
+        terminal.main_window.disconnect (focus_in_handler);
+    }
+
     protected override void startup () {
         base.startup ();
         Hdy.init ();