Merge branch 'master' into jeremypw/gtk4

# Conflicts fixed in: # meson.build # src/Application.vala # src/MainWindow.vala # src/Widgets/TerminalWidget.vala
elementary · Jan 7, 2025 · eee5549 · eee5549
2 parents c2e2004 + 6cd834e
commit eee5549
Show file tree

Hide file tree

Showing 407 changed files with 23,786 additions and 22,131 deletions.
diff --git a/data/io.elementary.terminal.appdata.xml.in b/data/io.elementary.terminal.appdata.xml.in
@@ -15,22 +15,22 @@
 
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/terminal/6.3.0/data/screenshot.png</image>
+      <image>https://raw.githubusercontent.com/elementary/terminal/6.3.1/data/screenshot.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/terminal/6.3.0/data/screenshot-light.png</image>
+      <image>https://raw.githubusercontent.com/elementary/terminal/6.3.1/data/screenshot-light.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/terminal/6.3.0/data/screenshot-high-contrast.png</image>
+      <image>https://raw.githubusercontent.com/elementary/terminal/6.3.1/data/screenshot-high-contrast.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/terminal/6.3.0/data/screenshot-find.png</image>
+      <image>https://raw.githubusercontent.com/elementary/terminal/6.3.1/data/screenshot-find.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/terminal/6.3.0/data/screenshot-custom-style.png</image>
+      <image>https://raw.githubusercontent.com/elementary/terminal/6.3.1/data/screenshot-custom-style.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/terminal/6.3.0/data/screenshot-paste-protection.png</image>
+      <image>https://raw.githubusercontent.com/elementary/terminal/6.3.1/data/screenshot-paste-protection.png</image>
     </screenshot>
   </screenshots>
 
@@ -53,7 +53,24 @@
   <update_contact>contact_AT_elementary.io</update_contact>
 
   <releases>
-    <release version="6.3.0" date="2024-11-03" urgency="medium">
+    <release version="6.3.1" date="2025-01-05" urgency="medium">
+      <description>
+        <p>Other updates:</p>
+        <ul>
+          <li>Stop window size increasing when opened</li>
+          <li>Change hotkeys for Reset and Clear Screen actions</li>
+          <li>Translation updates</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/terminal/issues/834">Tab cycling is not cyclic</issue>
+        <issue url="https://github.com/elementary/terminal/issues/821">The new terminal (v6.3.0) is opening with ever increasing geometry</issue>
+        <issue url="https://github.com/elementary/terminal/issues/820">The new terminal (v6.3.0) is destroying current process on Ctrl-L</issue>
+        <issue url="https://github.com/elementary/terminal/issues/819">Reset action uses Ctrl+K as hotkey</issue>
+      </issues>
+    </release>
+
+    <release version="6.3.0" date="2024-12-09" urgency="medium">
       <description>
         <p>New features:</p>
         <ul>
@@ -65,20 +82,25 @@
         <ul>
           <li>Update the icon and tooltip of the cyclic search togglebutton according to its state</li>
           <li>Focus correct tab after clicking on a process finished notification</li>
-          <li>Check for "doas" as well as "sudo" when text pasted into terminal</li>
+          <li>Check for "doas", "pkexec", "run0", and "su" as well as "sudo" when text pasted into terminal</li>
           <li>Check for unsafe paste on dropping text as well</li>
+          <li>Check for multiline commands in unsafe paste detection</li>
           <li>Improve gray contrast in dark theme</li>
           <li>Translation updates</li>
         </ul>
       </description>
       <issues>
+        <issue url="https://github.com/elementary/terminal/issues/814">New window created with Ctrl Shift N has zero tabs and is transparent</issue>
+        <issue url="https://github.com/elementary/terminal/issues/812">Notifications are not withdrawn</issue>
+        <issue url="https://github.com/elementary/terminal/issues/806">Fails to build in Launchpad due to tests</issue>
         <issue url="https://github.com/elementary/terminal/issues/793">Drag-drop command bypasses sudo warning</issue>
         <issue url="https://github.com/elementary/terminal/issues/682">Color issue in new version of Terminal</issue>
         <issue url="https://github.com/elementary/terminal/issues/442">Show percentage while zooming in with Ctrl+Scroll</issue>
         <issue url="https://github.com/elementary/terminal/issues/181">Support clearing the screen mid process (Reset + Clear)</issue>
         <issue url="https://github.com/elementary/terminal/issues/73">Open relevant tab when clicking on a task finished notification</issue>
       </issues>
     </release>
+
     <release version="6.2.0" date="2024-07-18" urgency="medium">
       <description>
         <p>New features:</p>

diff --git a/po/aa.po b/po/aa.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-15 19:29+0000\n"
+"POT-Creation-Date: 2025-01-05 18:00+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -51,59 +51,75 @@ msgstr ""
 msgid "Process exited with errors"
 msgstr ""
 
-#: src/MainWindow.vala:166
+#: src/MainWindow.vala:167
 msgid "Show Search Bar"
 msgstr ""
 
 #. TerminalWidget actions
-#: src/MainWindow.vala:173
+#: src/MainWindow.vala:174
 msgid "Copy"
 msgstr ""
 
-#: src/MainWindow.vala:179
+#: src/MainWindow.vala:180
 msgid "Copy Last Output"
 msgstr ""
 
-#: src/MainWindow.vala:185
+#: src/MainWindow.vala:186
 msgid "Clear Screen"
 msgstr ""
 
-#: src/MainWindow.vala:191
+#: src/MainWindow.vala:192 src/Widgets/TerminalWidget.vala:546
 msgid "Reset"
 msgstr ""
 
-#: src/MainWindow.vala:197
+#: src/MainWindow.vala:198
 msgid "Paste"
 msgstr ""
 
-#: src/MainWindow.vala:203
+#: src/MainWindow.vala:204
 msgid "Select All"
 msgstr ""
 
-#: src/MainWindow.vala:302
+#: src/MainWindow.vala:309
 msgid "Exit FullScreen"
 msgstr ""
 
-#: src/MainWindow.vala:311 src/MainWindow.vala:1014
+#: src/MainWindow.vala:318 src/MainWindow.vala:1050
 msgid "Find…"
 msgstr ""
 
-#: src/MainWindow.vala:318
+#: src/MainWindow.vala:325
 msgid "Settings"
 msgstr ""
 
+#: src/MainWindow.vala:372
+msgid "Are you sure you want to close this tab?"
+msgstr ""
+
+#: src/MainWindow.vala:373 src/Widgets/TerminalView.vala:220
+msgid "Close Tab"
+msgstr ""
+
 #. Changing atributes has no effect after adding item to menu so remove and re-add.
 #. This item was added first
-#: src/MainWindow.vala:547
+#: src/MainWindow.vala:562
 #, c-format
 msgid "Show in %s"
 msgstr ""
 
-#: src/MainWindow.vala:549
+#: src/MainWindow.vala:564
 msgid "Default application"
 msgstr ""
 
-#: src/MainWindow.vala:1005
+#: src/MainWindow.vala:883
+msgid "Are you sure you want to quit Terminal?"
+msgstr ""
+
+#: src/MainWindow.vala:884
+msgid "Quit Terminal"
+msgstr ""
+
+#: src/MainWindow.vala:1041
 msgid "Hide find bar"
 msgstr ""
 
@@ -228,53 +244,12 @@ msgstr ""
 msgid "Contrast is high"
 msgstr ""
 
-#: src/Dialogs/ForegroundProcessDialog.vala:26
-msgid "Are you sure you want to close this tab?"
-msgstr ""
-
-#: src/Dialogs/ForegroundProcessDialog.vala:28
-msgid "There is an active process on this tab."
-msgstr ""
-
-#: src/Dialogs/ForegroundProcessDialog.vala:29
-msgid "If you close it, the process will end."
-msgstr ""
-
-#: src/Dialogs/ForegroundProcessDialog.vala:31
-#: src/Widgets/TerminalView.vala:212
-msgid "Close Tab"
-msgstr ""
-
-#: src/Dialogs/ForegroundProcessDialog.vala:38
-msgid "Are you sure you want to quit Terminal?"
-msgstr ""
-
-#: src/Dialogs/ForegroundProcessDialog.vala:40
-msgid "There is an active process on this terminal."
-msgstr ""
-
-#: src/Dialogs/ForegroundProcessDialog.vala:41
-msgid "If you quit Terminal, the process will end."
-msgstr ""
-
-#: src/Dialogs/ForegroundProcessDialog.vala:43
-msgid "Quit Terminal"
-msgstr ""
-
-#: src/Dialogs/ForegroundProcessDialog.vala:50
-msgid "Are you sure you want to reload this tab?"
-msgstr ""
-
-#: src/Dialogs/ForegroundProcessDialog.vala:52
+#: src/Dialogs/ForegroundProcessDialog.vala:37
 msgid ""
-"There is an active process on this tab. If you reload it, the process will "
+"There is an active process on this tab. If you continue, the process will "
 "end."
 msgstr ""
 
-#: src/Dialogs/ForegroundProcessDialog.vala:54
-msgid "Reload Tab"
-msgstr ""
-
 #: src/Dialogs/UnsafePasteDialog.vala:34
 msgid ""
 "Copying commands into Terminal can be dangerous. Be sure you understand what "
@@ -371,14 +346,26 @@ msgstr ""
 msgid "Terminal"
 msgstr ""
 
-#: src/Widgets/TerminalWidget.vala:541
+#: src/Widgets/TerminalWidget.vala:545
+msgid "Are you sure you want to reset the terminal?"
+msgstr ""
+
+#: src/Widgets/TerminalWidget.vala:576
 msgid "The pasted text may contain multiple commands"
 msgstr ""
 
-#: src/Widgets/TerminalWidget.vala:543
+#: src/Widgets/TerminalWidget.vala:578
 msgid "The pasted text may be trying to gain administrative access"
 msgstr ""
 
+#: src/Widgets/TerminalWidget.vala:933
+msgid "Are you sure you want to reload this tab?"
+msgstr ""
+
+#: src/Widgets/TerminalWidget.vala:934
+msgid "Reload Tab"
+msgstr ""
+
 #: src/Widgets/TerminalView.vala:63
 msgid "New Tab"
 msgstr ""
@@ -387,23 +374,23 @@ msgstr ""
 msgid "Closed Tabs"
 msgstr ""
 
-#: src/Widgets/TerminalView.vala:210
+#: src/Widgets/TerminalView.vala:218
 msgid "Close Tabs to the Right"
 msgstr ""
 
-#: src/Widgets/TerminalView.vala:211
+#: src/Widgets/TerminalView.vala:219
 msgid "Close Other Tabs"
 msgstr ""
 
-#: src/Widgets/TerminalView.vala:215
+#: src/Widgets/TerminalView.vala:223
 msgid "Open in New Window"
 msgstr ""
 
-#: src/Widgets/TerminalView.vala:216
+#: src/Widgets/TerminalView.vala:224
 msgid "Duplicate Tab"
 msgstr ""
 
-#: src/Widgets/TerminalView.vala:219
+#: src/Widgets/TerminalView.vala:227
 msgid "Reload"
 msgstr ""