Christian Persch · Christian Persch · Christian Persch · Nathan Follens · AsciiWolf · Alexander Shopov
--- a/debian/changelog
+++ b/debian/changelog
-gnome-terminal (3.48.0-1ubuntu1) UNRELEASED; urgency=medium
+gnome-terminal (3.48.1-1ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian. Remaining changes:
+    + gnome-terminal.wrap, debian/rules:
+      - Add a wrapper script to restore command line compatibility.
+    + debian/control.in:
+      - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for
+        the wrapper script.
+      - add a build dependency on gettext to match the use of the i18n meson
+        module
+      - add fonts-dejavu-core to Depends
+    + Add 0001-Restore-transparency.patch:
+      - Restore transparency support
+    + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch:
+      - Add CSS names and style classes so we can theme things more easily.
+    + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch:
+      - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @
+        Fedora
+    + Add 52_support_apturl.patch:
+      - Support apt: urls.
+    + Add 60_add_lp_handler.patch:
+      - Add a handler for launchpad bug URLs.
+    + Add scrollbar-background-theming.patch:
+      - Draw background under the scrollbar that matches the actual terminal
+        background color. This allows proper theming.
+    + Add screen-Use-clean-env-when-creating-new-tab.patch:
+      - Fix environment variables on opening new tab via the "Open in
+        Terminal" right click menu in Nautilus. (LP: #1922839)
+    + Add Use-DejaVu-as-system-font-if-language-is-Arabic.patch.
+      - Use DejaVu as system font if LANG is Arabic (LP: #2002290)
+
+ -- Nathan Pratta Teodosio <nathan.teodosio@canonical.com>  Fri, 19 May 2023 15:21:45 +0200
+
+gnome-terminal (3.48.1-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream release
+
+ -- Amin Bandali <bandali@ubuntu.com>  Thu, 18 May 2023 10:25:54 -0400
+
+gnome-terminal (3.48.0-1ubuntu1) lunar; urgency=medium

  * Merge with Debian. Remaining changes:
    + gnome-terminal.wrap, debian/rules:

--- a/help/LINGUAS
+++ b/help/LINGUAS
@@ -17,5 +17,6 @@ pt_BR
 ro
 ru
 sv
+tr
 uk
 zh_CN
--- a/help/tr/tr.po
+++ b/help/tr/tr.po
--- a/meson.build
+++ b/meson.build
@@ -27,7 +27,7 @@ project(
    'GFDL-1.3-only',                # the appstream data
  ],
  meson_version: '>= 0.62.0',
-  version: '3.48.0',
+  version: '3.48.1',
 )

 # Naming

--- a/po/bg.po
+++ b/po/bg.po
@@ -118,15 +118,15 @@ msgstr "HighContrast"

 #: data/org.gnome.Terminal.metainfo.xml.in:56
 msgid "ModernToolkit"
-msgstr "ModernToolkit"
+msgstr "Модерна графикаo"

 #: data/org.gnome.Terminal.metainfo.xml.in:57
 msgid "SearchProvider"
-msgstr "SearchProvider"
+msgstr "Доставчик на търсене"

 #: data/org.gnome.Terminal.metainfo.xml.in:58
 msgid "UserDocs"
-msgstr "UserDocs"
+msgstr "Документация"

 #: data/org.gnome.Terminal.metainfo.xml.in:60
 #: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:43
@@ -1141,7 +1141,7 @@ msgstr "_Вградени схеми:"

 #: src/preferences.ui:1228
 msgid "Background"
-msgstr "Цвят на фона"
+msgstr "Фон"

 #: src/preferences.ui:1241
 msgid "_Default color:"
@@ -1588,7 +1588,7 @@ msgstr "Скриване/показване на лентата с инстру

 #: src/terminal-accels.cc:158
 msgid "Full Screen"
-msgstr "Цял екран"
+msgstr "На цял екран"

 #: src/terminal-accels.cc:159
 msgid "Zoom In"
@@ -1640,7 +1640,7 @@ msgstr "Към последния подпрозорец"

 #: src/terminal-accels.cc:215
 msgid "Contents"
-msgstr "Ръководство"
+msgstr "Съдържание"

 #: src/terminal-accels.cc:219
 msgid "Show Primary Menu"
@@ -1793,7 +1793,7 @@ msgstr "_Изнасяне…"

 #: src/terminal-menubar.ui.in:36
 msgid "_Print…"
-msgstr "_Отпечатване…"
+msgstr "_Печат…"

 #: src/terminal-menubar.ui.in:43
 msgid "C_lose Tab"
@@ -1893,7 +1893,7 @@ msgstr "_Отделяне в нов прозорец"

 #: src/terminal-menubar.ui.in:231
 msgid "_Contents"
-msgstr "_Ръководство"
+msgstr "_Съдържание"

 #: src/terminal-nautilus.cc:542
 msgid "Open in _Remote Terminal"
@@ -2094,7 +2094,7 @@ msgstr ""

 #: src/terminal-options.cc:1541
 msgid "Execute the argument to this option inside the terminal"
-msgstr "Изпълняване на аргумента на тази опция в терминала."
+msgstr "Изпълняване на аргумента на тази опция в терминала"

 #: src/terminal-options.cc:1550
 msgid "Use the given profile instead of the default profile"

--- a/po/cs.po
+++ b/po/cs.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/src/server.cc
+++ b/src/server.cc
@@ -122,6 +122,7 @@ init_server (int argc,
  terminal_i18n_init (TRUE);

  g_unsetenv ("CHARSET");
+  g_unsetenv ("OUTPUT_CHARSET");
  const char *charset;
  if (!g_get_charset (&charset)) {
    g_printerr ("Non UTF-8 locale (%s) is not supported!\n", charset);