diff --git a/0001-build-Don-t-treat-warnings-as-errors.patch b/0001-build-Don-t-treat-warnings-as-errors.patch
index eb542cf60d930dd69c1adfcd8f17beb501b164f1..d76d8ec1a5af99e95b20ac983d006dbeef964fc2 100644
--- a/0001-build-Don-t-treat-warnings-as-errors.patch
+++ b/0001-build-Don-t-treat-warnings-as-errors.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] build: Don't treat warnings as errors
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f22050d6a2e3..d6d936eb0a96 100644
+index c732caf..e0c2514 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -225,12 +225,12 @@ CC_CHECK_FLAGS_APPEND([WARN_CFLAGS],[CFLAGS],[ \
+@@ -234,12 +234,12 @@ CC_CHECK_FLAGS_APPEND([WARN_CFLAGS],[CFLAGS],[ \
    -Wall \
    -Wcast-align \
    -Wendif-labels \
@@ -30,6 +30,3 @@ index f22050d6a2e3..d6d936eb0a96 100644
    -Wextra \
    -Wfloat-equal \
    -Wimplicit \
--- 
-2.19.1
-
diff --git a/gnome-terminal-3.37.90.tar.xz b/gnome-terminal-3.37.90.tar.xz
deleted file mode 100644
index 637d69e615a586081694ce8cc02ee282ba36063c..0000000000000000000000000000000000000000
Binary files a/gnome-terminal-3.37.90.tar.xz and /dev/null differ
diff --git a/gnome-terminal-3.38.3.tar.xz b/gnome-terminal-3.38.3.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..f4f9170826629cd7ce166cc8282bb543193bcaa9
Binary files /dev/null and b/gnome-terminal-3.38.3.tar.xz differ
diff --git a/gnome-terminal-cntr-ntfy-autottl-ts.patch b/gnome-terminal-cntr-ntfy-autottl-ts.patch
index 4643320ea194d6435b90ecfdb3854fe1979112f9..170b10edfc907692efd636dbf6ba4446af6ee8f7 100644
--- a/gnome-terminal-cntr-ntfy-autottl-ts.patch
+++ b/gnome-terminal-cntr-ntfy-autottl-ts.patch
@@ -1,4 +1,4 @@
-From c56653152c2cc7e3de700a2098643c646d420450 Mon Sep 17 00:00:00 2001
+From 6715609da71987d6db7a70b4640f3b830dc405f8 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Mon, 12 May 2014 14:57:18 +0200
 Subject: [PATCH 01/16] Restore transparency
@@ -152,10 +152,10 @@ index cffc4ed86b9f..6bfd3e346895 100644
  #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY       "default-show-menubar"
  #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY      "menu-accelerator-enabled"
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index f20c5d0f8dba..4f2efea7cd22 100644
+index 0c4ee5035215..128b74befc1e 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -1072,7 +1072,9 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -1075,7 +1075,9 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
        prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) ||
        prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) ||
        prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOREGROUND_COLOR_KEY) ||
@@ -166,7 +166,7 @@ index f20c5d0f8dba..4f2efea7cd22 100644
      update_color_scheme (screen);
  
    if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
-@@ -1157,6 +1159,8 @@ update_color_scheme (TerminalScreen *screen)
+@@ -1160,6 +1162,8 @@ update_color_scheme (TerminalScreen *screen)
    GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL;
    GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL;
    GtkStyleContext *context;
@@ -175,7 +175,7 @@ index f20c5d0f8dba..4f2efea7cd22 100644
    gboolean use_theme_colors;
  
    context = gtk_widget_get_style_context (widget);
-@@ -1200,6 +1204,18 @@ update_color_scheme (TerminalScreen *screen)
+@@ -1203,6 +1207,18 @@ update_color_scheme (TerminalScreen *screen)
      }
  
    colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors);
@@ -194,7 +194,7 @@ index f20c5d0f8dba..4f2efea7cd22 100644
    vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg,
                             colors, n_colors);
    vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp);
-@@ -1207,6 +1223,10 @@ update_color_scheme (TerminalScreen *screen)
+@@ -1210,6 +1226,10 @@ update_color_scheme (TerminalScreen *screen)
    vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen), cursor_fgp);
    vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp);
    vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp);
@@ -206,10 +206,10 @@ index f20c5d0f8dba..4f2efea7cd22 100644
  
  static void
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 7a8953c50388..a3d77bf6719d 100644
+index 8adb134..bce94c7 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -2094,6 +2094,8 @@ terminal_window_init (TerminalWindow *window)
+@@ -2097,6 +2097,8 @@ terminal_window_init (TerminalWindow *window)
    };
    TerminalWindowPrivate *priv;
    TerminalApp *app;
@@ -218,23 +218,22 @@ index 7a8953c50388..a3d77bf6719d 100644
    GSettings *gtk_debug_settings;
    GtkWindowGroup *window_group;
    //  GtkAccelGroup *accel_group;
-@@ -2109,6 +2111,11 @@ terminal_window_init (TerminalWindow *window)
- 
+@@ -2111,6 +2113,10 @@ terminal_window_init (TerminalWindow *window)
+   priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, TERMINAL_TYPE_WINDOW, TerminalWindowPrivate);
+
    gtk_widget_init_template (GTK_WIDGET (window));
- 
 +  screen = gtk_widget_get_screen (GTK_WIDGET (window));
 +  visual = gdk_screen_get_rgba_visual (screen);
 +  if (visual != NULL)
 +    gtk_widget_set_visual (GTK_WIDGET (window), visual);
-+
+
    uuid_generate (u);
    uuid_unparse (u, uuidstr);
-   priv->uuid = g_strdup (uuidstr);
 -- 
 2.25.4
 
 
-From 3c1c7e6aa0cbfc6b4683c63fb492d4e44ed93f75 Mon Sep 17 00:00:00 2001
+From c75db4814eaee946daccc526c5f37124f1981352 Mon Sep 17 00:00:00 2001
 From: Lars Uebernickel <lars.uebernickel@canonical.com>
 Date: Wed, 28 May 2014 14:11:02 +0200
 Subject: [PATCH 02/16] window: Make the drawing robust across all themes
@@ -254,13 +253,13 @@ https://bugzilla.gnome.org/show_bug.cgi?id=730016
  1 file changed, 21 insertions(+)
 
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index a3d77bf6719d..36d155a9e420 100644
+index bce94c7..19881f8 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -1953,6 +1953,26 @@ terminal_window_realize (GtkWidget *widget)
+@@ -1956,6 +1956,26 @@ terminal_window_realize (GtkWidget *widget)
    terminal_window_update_size (window);
  }
- 
+
 +static gboolean
 +terminal_window_draw (GtkWidget *widget,
 +                      cairo_t   *cr)
@@ -284,8 +283,8 @@ index a3d77bf6719d..36d155a9e420 100644
  static gboolean
  terminal_window_state_event (GtkWidget            *widget,
                               GdkEventWindowState  *event)
-@@ -2270,6 +2290,7 @@ terminal_window_class_init (TerminalWindowClass *klass)
- 
+@@ -2272,6 +2292,7 @@ terminal_window_class_init (TerminalWindowClass *klass)
+
    widget_class->show = terminal_window_show;
    widget_class->realize = terminal_window_realize;
 +  widget_class->draw = terminal_window_draw;
@@ -296,7 +295,7 @@ index a3d77bf6719d..36d155a9e420 100644
 2.25.4
 
 
-From cbc9f0541cb5068724771baffd8991a011712950 Mon Sep 17 00:00:00 2001
+From e7810e47cf096ce6901e572bb9f5256601aed62d Mon Sep 17 00:00:00 2001
 From: "Owen W. Taylor" <otaylor@fishsoup.net>
 Date: Fri, 13 Nov 2015 15:16:42 +0100
 Subject: [PATCH 03/16] screen, window: Extra padding around transparent
@@ -309,7 +308,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943
  2 files changed, 49 insertions(+), 10 deletions(-)
 
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 4f2efea7cd22..6ae454c8b1ac 100644
+index 128b74befc1e..a1c3161391da 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
 @@ -151,6 +151,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *,
@@ -321,7 +320,7 @@ index 4f2efea7cd22..6ae454c8b1ac 100644
  static void terminal_screen_child_exited  (VteTerminal *terminal,
                                             int status);
  
-@@ -618,6 +620,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -620,6 +622,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
    widget_class->drag_data_received = terminal_screen_drag_data_received;
    widget_class->button_press_event = terminal_screen_button_press;
    widget_class->popup_menu = terminal_screen_popup_menu;
@@ -329,7 +328,7 @@ index 4f2efea7cd22..6ae454c8b1ac 100644
  
    terminal_class->child_exited = terminal_screen_child_exited;
  
-@@ -1144,6 +1147,32 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -1147,6 +1150,32 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
    g_object_thaw_notify (object);
  }
  
@@ -362,7 +361,7 @@ index 4f2efea7cd22..6ae454c8b1ac 100644
  static void
  update_color_scheme (TerminalScreen *screen)
  {
-@@ -1159,7 +1188,6 @@ update_color_scheme (TerminalScreen *screen)
+@@ -1162,7 +1191,6 @@ update_color_scheme (TerminalScreen *screen)
    GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL;
    GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL;
    GtkStyleContext *context;
@@ -370,7 +369,7 @@ index 4f2efea7cd22..6ae454c8b1ac 100644
    gboolean transparent;
    gboolean use_theme_colors;
  
-@@ -1224,9 +1252,7 @@ update_color_scheme (TerminalScreen *screen)
+@@ -1227,9 +1255,7 @@ update_color_scheme (TerminalScreen *screen)
    vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp);
    vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp);
  
@@ -381,7 +380,7 @@ index 4f2efea7cd22..6ae454c8b1ac 100644
  }
  
  static void
-@@ -1745,6 +1771,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
+@@ -1748,6 +1774,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
    terminal_screen_popup_info_unref (info);
  }
  
@@ -396,10 +395,10 @@ index 4f2efea7cd22..6ae454c8b1ac 100644
  terminal_screen_button_press (GtkWidget      *widget,
                                GdkEventButton *event)
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 36d155a9e420..c0219d872725 100644
+index 19881f8..003b9cf 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -1959,15 +1959,21 @@ terminal_window_draw (GtkWidget *widget,
+@@ -1962,15 +1962,22 @@ terminal_window_draw (GtkWidget *widget,
  {
    if (gtk_widget_get_app_paintable (widget))
      {
@@ -407,12 +406,13 @@ index 36d155a9e420..c0219d872725 100644
        GtkStyleContext *context;
 -      int width;
 -      int height;
++
 +      GtkWidget *child;
 +
 +      /* Get the *child* allocation, so we don't overwrite window borders */
 +      child = gtk_bin_get_child (GTK_BIN (widget));
 +      gtk_widget_get_allocation (child, &child_allocation);
- 
+
        context = gtk_widget_get_style_context (widget);
 -      width = gtk_widget_get_allocated_width (widget);
 -      height = gtk_widget_get_allocated_height (widget);
@@ -425,13 +425,13 @@ index 36d155a9e420..c0219d872725 100644
 +                        child_allocation.x, child_allocation.y,
 +                        child_allocation.width, child_allocation.height);
      }
- 
+
    return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
 -- 
 2.25.4
 
 
-From 5e999eed5fb1327a0e1aebaf480dffbba104a38e Mon Sep 17 00:00:00 2001
+From de1231cf68fbe55ab7b7b2c4660091bfb05ec493 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Fri, 18 May 2018 20:15:34 +0200
 Subject: [PATCH 04/16] screen: Try harder to find a foreground process group
@@ -457,10 +457,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
  1 file changed, 29 insertions(+), 1 deletion(-)
 
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 6ae454c8b1ac..fe6cfbeb7200 100644
+index a1c3161391da..e2545c3f9288 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -2332,7 +2332,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
+@@ -2334,7 +2334,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
  #else
    g_snprintf (filename, sizeof (filename), "/proc/%d/cmdline", fgpid);
    if (!g_file_get_contents (filename, &data_buf, &len, NULL))
@@ -501,7 +501,7 @@ index 6ae454c8b1ac..fe6cfbeb7200 100644
 2.25.4
 
 
-From ef82bc454c0639810050ce9849fae253aeeed40e Mon Sep 17 00:00:00 2001
+From b4a8b69b27a26f95371a1780ad61e97529cb8f90 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Thu, 3 May 2018 16:49:28 +0200
 Subject: [PATCH 05/16] screen: Track the current foreground process
@@ -549,7 +549,7 @@ index 0fafcc3a846c..b0f2fc9df7f6 100644
  
  void _terminal_debug_init(void);
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index fe6cfbeb7200..3e18c2477438 100644
+index e2545c3f9288..57ea1cce26d5 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
 @@ -107,6 +107,11 @@ struct _TerminalScreenPrivate
@@ -577,7 +577,7 @@ index fe6cfbeb7200..3e18c2477438 100644
  static void terminal_screen_window_title_changed      (VteTerminal *vte_terminal,
                                                         TerminalScreen *screen);
  
-@@ -623,6 +634,9 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -625,6 +636,9 @@ terminal_screen_class_init (TerminalScreenClass *klass)
    widget_class->hierarchy_changed = terminal_screen_hierarchy_changed;
  
    terminal_class->child_exited = terminal_screen_child_exited;
@@ -587,7 +587,7 @@ index fe6cfbeb7200..3e18c2477438 100644
  
    signals[PROFILE_SET] =
      g_signal_new (I_("profile-set"),
-@@ -722,6 +736,18 @@ terminal_screen_dispose (GObject *object)
+@@ -724,6 +738,18 @@ terminal_screen_dispose (GObject *object)
                                          0, 0, NULL, NULL,
                                          screen);
  
@@ -606,7 +606,7 @@ index fe6cfbeb7200..3e18c2477438 100644
    if (priv->idle_exec_source != 0)
      {
        g_source_remove (priv->idle_exec_source);
-@@ -758,6 +784,7 @@ terminal_screen_finalize (GObject *object)
+@@ -760,6 +786,7 @@ terminal_screen_finalize (GObject *object)
    g_slist_free_full (priv->match_tags, (GDestroyNotify) free_tag_data);
  
    g_free (priv->uuid);
@@ -614,7 +614,7 @@ index fe6cfbeb7200..3e18c2477438 100644
  
    G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object);
  }
-@@ -1956,6 +1983,123 @@ terminal_screen_child_exited (VteTerminal *terminal,
+@@ -1959,6 +1986,123 @@ terminal_screen_child_exited (VteTerminal *terminal,
      }
  }
  
@@ -738,7 +738,7 @@ index fe6cfbeb7200..3e18c2477438 100644
  static void
  terminal_screen_drag_data_received (GtkWidget        *widget,
                                      GdkDragContext   *context,
-@@ -2301,7 +2445,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
+@@ -2303,7 +2447,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
    if (fd == -1)
      return FALSE;
  
@@ -754,7 +754,7 @@ index fe6cfbeb7200..3e18c2477438 100644
 2.25.4
 
 
-From fb674971186ce366ab4963e37b407e8fa329a48d Mon Sep 17 00:00:00 2001
+From 3e7242e41500b5a7c85133dc15a0b290cd67d861 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Thu, 10 May 2018 19:23:16 +0200
 Subject: [PATCH 06/16] Notify when a long-running foreground process group
@@ -832,7 +832,7 @@ index 6a4fe03f2756..4e70facf9a43 100644
    app_load_css (application);
  
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 3e18c2477438..c767dccf5299 100644
+index 57ea1cce26d5..d25b36597396 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
 @@ -54,6 +54,7 @@
@@ -854,7 +854,7 @@ index 3e18c2477438..c767dccf5299 100644
  static void terminal_screen_hierarchy_changed (GtkWidget *widget,
                                                 GtkWidget *previous_toplevel);
  static void terminal_screen_child_exited  (VteTerminal *terminal,
-@@ -626,6 +631,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -628,6 +633,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
    object_class->get_property = terminal_screen_get_property;
    object_class->set_property = terminal_screen_set_property;
  
@@ -862,7 +862,7 @@ index 3e18c2477438..c767dccf5299 100644
    widget_class->realize = terminal_screen_realize;
    widget_class->style_updated = terminal_screen_style_updated;
    widget_class->drag_data_received = terminal_screen_drag_data_received;
-@@ -725,6 +731,10 @@ terminal_screen_dispose (GObject *object)
+@@ -727,6 +733,10 @@ terminal_screen_dispose (GObject *object)
    TerminalScreen *screen = TERMINAL_SCREEN (object);
    TerminalScreenPrivate *priv = screen->priv;
    GtkSettings *settings;
@@ -873,7 +873,7 @@ index 3e18c2477438..c767dccf5299 100644
  
    /* Unset child PID so that when an eventual child-exited signal arrives,
     * we don't emit "close".
-@@ -1887,6 +1897,45 @@ terminal_screen_button_press (GtkWidget      *widget,
+@@ -1890,6 +1900,45 @@ terminal_screen_button_press (GtkWidget      *widget,
    return FALSE;
  }
  
@@ -919,7 +919,7 @@ index 3e18c2477438..c767dccf5299 100644
  /**
   * terminal_screen_get_current_dir:
   * @screen:
-@@ -2031,6 +2080,63 @@ terminal_screen_contents_changed (VteTerminal *terminal)
+@@ -2034,6 +2083,63 @@ terminal_screen_contents_changed (VteTerminal *terminal)
                                                      screen);
  }
  
@@ -983,7 +983,7 @@ index 3e18c2477438..c767dccf5299 100644
  static void
  terminal_screen_shell_precmd (VteTerminal *terminal)
  {
-@@ -2053,6 +2159,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
+@@ -2056,6 +2162,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
        priv->shell_preexec_source_id = 0;
      }
  
@@ -1074,7 +1074,7 @@ index 20cfbceb36b0..a987025e0524 100644
 2.25.4
 
 
-From a4107ba9df399d5ee8058fd36b09b6a0b064d497 Mon Sep 17 00:00:00 2001
+From a6dbcf9b15ae96829c5a1c20e2901c722457b3c6 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Tue, 10 Apr 2018 15:39:35 +0200
 Subject: [PATCH 07/16] profile: Split the Command tab into two nested GtkGrids
@@ -1349,7 +1349,7 @@ index 64f8295bf2b0..426993a4e154 100644
 2.25.4
 
 
-From d2c6d15c0da2304b772920426405f493c1c0e682 Mon Sep 17 00:00:00 2001
+From 528ffc16192fbd45fdb709a0c58dd5f51ab524e9 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Tue, 10 Apr 2018 16:01:51 +0200
 Subject: [PATCH 08/16] Revert "profile: Remove the "Command" sub-heading"
@@ -1642,7 +1642,7 @@ index 426993a4e154..7f4a94c88b6b 100644
 2.25.4
 
 
-From 12e10d8f8e9510c18ebf4a10f6d052c027a450f9 Mon Sep 17 00:00:00 2001
+From c95d6adef9b1c1c447249a44eb56750b321000e0 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Thu, 30 Jun 2016 16:02:13 +0200
 Subject: [PATCH 09/16] Revert "screen: Remove unused description and
@@ -1657,7 +1657,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
  2 files changed, 68 insertions(+)
 
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index c767dccf5299..4ae5cc89002f 100644
+index d25b36597396..91c76df3feea 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
 @@ -111,6 +111,7 @@ struct _TerminalScreenPrivate
@@ -1676,7 +1676,7 @@ index c767dccf5299..4ae5cc89002f 100644
  };
  
  enum
-@@ -590,6 +592,9 @@ terminal_screen_get_property (GObject *object,
+@@ -592,6 +594,9 @@ terminal_screen_get_property (GObject *object,
        case PROP_TITLE:
          g_value_set_string (value, terminal_screen_get_title (screen));
          break;
@@ -1686,7 +1686,7 @@ index c767dccf5299..4ae5cc89002f 100644
        default:
          G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
          break;
-@@ -610,6 +615,7 @@ terminal_screen_set_property (GObject *object,
+@@ -612,6 +617,7 @@ terminal_screen_set_property (GObject *object,
          terminal_screen_set_profile (screen, g_value_get_object (value));
          break;
        case PROP_TITLE:
@@ -1694,7 +1694,7 @@ index c767dccf5299..4ae5cc89002f 100644
          /* not writable */
        default:
          G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-@@ -699,6 +705,13 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -701,6 +707,13 @@ terminal_screen_class_init (TerminalScreenClass *klass)
                            NULL,
                            G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
  
@@ -1708,7 +1708,7 @@ index c767dccf5299..4ae5cc89002f 100644
    g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate));
  
    n_url_regexes = G_N_ELEMENTS (url_regex_patterns);
-@@ -795,6 +808,7 @@ terminal_screen_finalize (GObject *object)
+@@ -797,6 +810,7 @@ terminal_screen_finalize (GObject *object)
  
    g_free (priv->uuid);
    g_free (priv->current_cmdline);
@@ -1716,7 +1716,7 @@ index c767dccf5299..4ae5cc89002f 100644
  
    G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object);
  }
-@@ -1053,6 +1067,21 @@ terminal_screen_get_title (TerminalScreen *screen)
+@@ -1056,6 +1070,21 @@ terminal_screen_get_title (TerminalScreen *screen)
    return vte_terminal_get_window_title (VTE_TERMINAL (screen));
  }
  
@@ -1738,7 +1738,7 @@ index c767dccf5299..4ae5cc89002f 100644
  static void
  terminal_screen_profile_changed_cb (GSettings     *profile,
                                      const char    *prop_name,
-@@ -1381,6 +1410,7 @@ terminal_screen_set_profile (TerminalScreen *screen,
+@@ -1384,6 +1413,7 @@ terminal_screen_set_profile (TerminalScreen *screen,
      g_object_unref (old_profile);
  
    g_object_notify (G_OBJECT (screen), "profile");
@@ -1746,7 +1746,7 @@ index c767dccf5299..4ae5cc89002f 100644
  }
  
  GSettings*
-@@ -1652,6 +1682,8 @@ spawn_result_cb (VteTerminal *terminal,
+@@ -1655,6 +1685,8 @@ spawn_result_cb (VteTerminal *terminal,
  
    priv->child_pid = pid;
  
@@ -1755,7 +1755,7 @@ index c767dccf5299..4ae5cc89002f 100644
    if (error) {
       // FIXMEchpe should be unnecessary, vte already does this internally
      vte_terminal_set_pty (terminal, NULL);
-@@ -1936,6 +1968,35 @@ terminal_screen_focus_in (GtkWidget     *widget,
+@@ -1939,6 +1971,35 @@ terminal_screen_focus_in (GtkWidget     *widget,
    return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event);
  }
  
@@ -1791,7 +1791,7 @@ index c767dccf5299..4ae5cc89002f 100644
  /**
   * terminal_screen_get_current_dir:
   * @screen:
-@@ -1989,6 +2050,8 @@ terminal_screen_child_exited (VteTerminal *terminal,
+@@ -1992,6 +2053,8 @@ terminal_screen_child_exited (VteTerminal *terminal,
  
    priv->child_pid = -1;
  
@@ -1821,7 +1821,7 @@ index 8ea337867222..049bbe5a2b8b 100644
 2.25.4
 
 
-From 12f12cba293ca6740687def05a16510f26022d19 Mon Sep 17 00:00:00 2001
+From 9c755aefcb53d63da73214a911ab75dd4fe6b7e2 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Thu, 30 Jun 2016 17:39:48 +0200
 Subject: [PATCH 10/16] Revert "Remove the static title setting from profile
@@ -1965,10 +1965,10 @@ index 6bfd3e346895..cbb59a2301e6 100644
  #define TERMINAL_PROFILE_USE_SKEY_KEY                   "use-skey"
  #define TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY            "use-system-font"
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 4ae5cc89002f..5e473efa70ea 100644
+index 91c76df3feea..7724af0dfa04 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -1071,11 +1071,14 @@ char *
+@@ -1074,11 +1074,14 @@ char *
  terminal_screen_get_description (TerminalScreen *screen)
  {
    TerminalScreenPrivate *priv = screen->priv;
@@ -1983,7 +1983,7 @@ index 4ae5cc89002f..5e473efa70ea 100644
  
    return g_strdup_printf ("%s — %d",
                            title && title[0] ? title : _("Terminal"),
-@@ -1121,6 +1124,12 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -1124,6 +1127,12 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
        vte_terminal_set_cjk_ambiguous_width (vte_terminal, (int) width);
      }
  
@@ -2000,7 +2000,7 @@ index 4ae5cc89002f..5e473efa70ea 100644
 2.25.4
 
 
-From c76c29e21f381885193947ff252793131aca0ed3 Mon Sep 17 00:00:00 2001
+From f0e0ecdab4c22e7e1f44b5da9a6618c6563c5f5b Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Tue, 17 Feb 2015 17:06:17 +0100
 Subject: [PATCH 11/16] Restore translations for setting a title and
@@ -2380,32 +2380,6 @@ index 4906009cf46f..f97d43b0e515 100644
  
  #: ../src/profile-preferences.glade.h:77
  msgid "_Unlimited"
-diff --git a/po/bn_IN.po b/po/bn_IN.po
-index f196e5084797..0ac3caf77e73 100644
---- a/po/bn_IN.po
-+++ b/po/bn_IN.po
-@@ -2296,8 +2296,8 @@ msgstr "উইন্ডো বন্ধ করুন (_l)"
- #~ msgid "Close Window"
- #~ msgstr "উইন্ডো বন্ধ করুন"
- 
--#~ msgid "Set Title"
--#~ msgstr "শিরোনাম নির্ধারণ করুন"
-+msgid "Set Title"
-+msgstr "শিরোনাম নির্ধারণ করুন"
- 
- #~ msgid "Switch to Tab 2"
- #~ msgstr "ট্যাব ২-এ পরিবর্তন করুন"
-@@ -2356,5 +2356,8 @@ msgstr "উইন্ডো বন্ধ করুন (_l)"
- #~ msgid "_Input Methods"
- #~ msgstr "ইনপুট পদ্ধতি (_I)"
- 
--#~ msgid "_Title:"
--#~ msgstr "শিরোনাম: (_T)"
-+msgid "_Title:"
-+msgstr "শিরোনাম: (_T)"
-+
-+msgid "Transparent background"
-+msgstr "স্বচ্চ পটভূমি "
 diff --git a/po/br.po b/po/br.po
 index e16ea07dfc21..f4cbe857d5ca 100644
 --- a/po/br.po
@@ -2456,10 +2430,10 @@ index 49e710859ac9..8703552984b1 100644
 +msgid "Set Title"
 +msgstr "Postavi naslov"
 diff --git a/po/ca.po b/po/ca.po
-index 29fd5ad05de0..fc770a5b8461 100644
+index d203c31406ea..a1d47c69679d 100644
 --- a/po/ca.po
 +++ b/po/ca.po
-@@ -2472,3 +2472,15 @@ msgstr "Tanca la _finestra"
+@@ -2490,3 +2490,15 @@ msgstr "Tanca la _finestra"
  
  #~ msgid "_Detach Tab"
  #~ msgstr "_Separa la pestanya"
@@ -2496,11 +2470,11 @@ index a6e8fb4250dc..c9ed8508228d 100644
 +msgid "Set Title"
 +msgstr "Estableix el títol"
 diff --git a/po/cs.po b/po/cs.po
-index d592ea40910c..7e394112d4a6 100644
+index f0cf6b424ae0..873c127e0f84 100644
 --- a/po/cs.po
 +++ b/po/cs.po
-@@ -2297,3 +2297,15 @@ msgstr ""
- #: ../src/terminal-window.c:3225
+@@ -2422,3 +2422,15 @@ msgstr ""
+ #: src/terminal-window.c:3224
  msgid "C_lose Window"
  msgstr "_Zavřít okno"
 +
@@ -2542,10 +2516,10 @@ index 644df82363f1..cd862feb50c0 100644
  #: ../src/profile-preferences.glade.h:74
  msgid "_Update login records when command is launched"
 diff --git a/po/da.po b/po/da.po
-index 31d145f37174..ebfaaae38ecf 100644
+index eb21daa279ef..edebccb48e90 100644
 --- a/po/da.po
 +++ b/po/da.po
-@@ -2434,3 +2434,15 @@ msgstr "_Luk vindue"
+@@ -2459,3 +2459,15 @@ msgstr "_Luk vindue"
  
  #~ msgid "_Detach Tab"
  #~ msgstr "_Løsriv faneblad"
@@ -2562,10 +2536,10 @@ index 31d145f37174..ebfaaae38ecf 100644
 +msgid "Transparent background"
 +msgstr "Gennemsigtig baggrund"
 diff --git a/po/de.po b/po/de.po
-index 6d4d38ca0f1c..836617110e03 100644
+index c123573f0cf1..6e40b82edea4 100644
 --- a/po/de.po
 +++ b/po/de.po
-@@ -2507,3 +2507,15 @@ msgstr "Fenster _schließen"
+@@ -2538,3 +2538,15 @@ msgstr "Fenster _schließen"
  
  #~ msgid "_Quit"
  #~ msgstr "_Beenden"
@@ -2608,10 +2582,10 @@ index d97e6102b850..a768fe4adc54 100644
  #: ../src/profile-preferences.glade.h:78
  #, fuzzy
 diff --git a/po/el.po b/po/el.po
-index 99c9a629b472..15f683b5a625 100644
+index 3e44ba5d24f6..f93ecb561ef4 100644
 --- a/po/el.po
 +++ b/po/el.po
-@@ -2735,17 +2735,17 @@ msgstr "Κ_λείσιμο παραθύρου"
+@@ -2888,17 +2888,17 @@ msgstr "Κ_λείσιμο παραθύρου"
  #~ msgid "Default size:"
  #~ msgstr "Προεπιλεγμένο μέγεθος:"
  
@@ -2635,7 +2609,7 @@ index 99c9a629b472..15f683b5a625 100644
  
  #~ msgid "Current Locale"
  #~ msgstr "Τρέχουσα τοπική ρύθμιση"
-@@ -2783,3 +2783,6 @@ msgstr "Κ_λείσιμο παραθύρου"
+@@ -2936,3 +2936,6 @@ msgstr "Κ_λείσιμο παραθύρου"
  
  #~ msgid "_Input Methods"
  #~ msgstr "_Μέθοδοι εισαγωγής"
@@ -2695,10 +2669,10 @@ index 6c9e0cd73d63..db4aa891dd45 100644
  #: ../src/gnome-terminal.glade2.h:87
  msgid "_Update login records when command is launched"
 diff --git a/po/en_GB.po b/po/en_GB.po
-index 4f75ff1425df..7edfb0a08396 100644
+index d2542ff7db4a..dc3bdf23ca9e 100644
 --- a/po/en_GB.po
 +++ b/po/en_GB.po
-@@ -2807,8 +2807,8 @@ msgstr "C_lose Window"
+@@ -2828,8 +2828,8 @@ msgstr "C_lose Window"
  #~ msgid "Default size:"
  #~ msgstr "Default size:"
  
@@ -2709,7 +2683,7 @@ index 4f75ff1425df..7edfb0a08396 100644
  
  #~ msgid "When terminal commands set their o_wn titles:"
  #~ msgstr "When terminal commands set their o_wn titles:"
-@@ -2825,8 +2825,8 @@ msgstr "C_lose Window"
+@@ -2846,8 +2846,8 @@ msgstr "C_lose Window"
  #~ msgid "_Unlimited"
  #~ msgstr "_Unlimited"
  
@@ -2720,7 +2694,7 @@ index 4f75ff1425df..7edfb0a08396 100644
  
  #~ msgid "Switch to Tab 3"
  #~ msgstr "Switch to Tab 3"
-@@ -2867,8 +2867,8 @@ msgstr "C_lose Window"
+@@ -2888,8 +2888,8 @@ msgstr "C_lose Window"
  #~ msgid "_Input Methods"
  #~ msgstr "_Input Methods"
  
@@ -2731,7 +2705,7 @@ index 4f75ff1425df..7edfb0a08396 100644
  
  #~ msgid "Add or Remove Terminal Encodings"
  #~ msgstr "Add or Remove Terminal Encodings"
-@@ -3563,8 +3563,8 @@ msgstr "C_lose Window"
+@@ -3584,8 +3584,8 @@ msgstr "C_lose Window"
  #~ msgid "Background image _scrolls"
  #~ msgstr "Background image _scrolls"
  
@@ -2769,10 +2743,10 @@ index 0e83b981753b..0d98ea57c90a 100644
  #~ msgid "On the left side"
  #~ msgstr "Maldekstre"
 diff --git a/po/es.po b/po/es.po
-index 064f3a44b933..4ac03db22a80 100644
+index 4a169d0d76ff..2a38bed154bf 100644
 --- a/po/es.po
 +++ b/po/es.po
-@@ -2876,17 +2876,17 @@ msgstr "_Cerrar ventana"
+@@ -2889,17 +2889,17 @@ msgstr "_Cerrar ventana"
  #~ msgid "Default size:"
  #~ msgstr "Tamaño predeterminado:"
  
@@ -2796,7 +2770,7 @@ index 064f3a44b933..4ac03db22a80 100644
  
  #~ msgid "Current Locale"
  #~ msgstr "Configuración regional actual"
-@@ -3712,8 +3712,8 @@ msgstr "_Cerrar ventana"
+@@ -3725,8 +3725,8 @@ msgstr "_Cerrar ventana"
  #~ msgid "_Solid color"
  #~ msgstr "Color _sólido"
  
@@ -2819,10 +2793,10 @@ index 4b1c2a7c67e4..770761168806 100644
 +msgid "Transparent background"
 +msgstr "Läbipaistev taust"
 diff --git a/po/eu.po b/po/eu.po
-index f65fad2d0193..8b299a678e1a 100644
+index eaf053b7395d..d657371ac667 100644
 --- a/po/eu.po
 +++ b/po/eu.po
-@@ -2321,3 +2321,15 @@ msgstr "It_xi leihoa"
+@@ -2333,3 +2333,15 @@ msgstr "It_xi leihoa"
  
  #~ msgid "_Detach Tab"
  #~ msgstr "_Desuztartu fitxa"
@@ -2839,10 +2813,10 @@ index f65fad2d0193..8b299a678e1a 100644
 +msgid "Transparent background"
 +msgstr "Atzeko plano gardena"
 diff --git a/po/fa.po b/po/fa.po
-index 2035684dc810..ba9f72b6a7f1 100644
+index 320667da5c90..af24d78d8acc 100644
 --- a/po/fa.po
 +++ b/po/fa.po
-@@ -2761,8 +2761,8 @@ msgstr "_بستن پنجره"
+@@ -2773,8 +2773,8 @@ msgstr "_بستن پنجره"
  #~ msgid "Use custom default terminal si_ze"
  #~ msgstr "استفاده از اندازه‌ی _سفارشی پایانه‌ی پیش‌فرض"
  
@@ -2853,7 +2827,7 @@ index 2035684dc810..ba9f72b6a7f1 100644
  
  #~ msgid "When terminal commands set their o_wn titles:"
  #~ msgstr "وقتی که فرمان‌های پایانه عنوان‌های _خودشان را تنظیم می‌کنند:"
-@@ -2776,8 +2776,8 @@ msgstr "_بستن پنجره"
+@@ -2788,8 +2788,8 @@ msgstr "_بستن پنجره"
  #~ msgid "_Unlimited"
  #~ msgstr "_نامحدود"
  
@@ -2864,7 +2838,7 @@ index 2035684dc810..ba9f72b6a7f1 100644
  
  #~ msgid "Switch to Tab 3"
  #~ msgstr "تعویض به زبانه‌ی ۳"
-@@ -2818,5 +2818,8 @@ msgstr "_بستن پنجره"
+@@ -2830,5 +2830,8 @@ msgstr "_بستن پنجره"
  #~ msgid "_Input Methods"
  #~ msgstr "روش‌های _ورودی"
  
@@ -2876,10 +2850,10 @@ index 2035684dc810..ba9f72b6a7f1 100644
 +msgid "Transparent background"
 +msgstr "پس‌زمینه‌ی شفاف"
 diff --git a/po/fi.po b/po/fi.po
-index 056943256725..bbb7ade1bb6b 100644
+index 72581abb7462..2b1efadccd42 100644
 --- a/po/fi.po
 +++ b/po/fi.po
-@@ -2724,9 +2724,21 @@ msgstr "_Sulje ikkuna"
+@@ -2751,9 +2751,21 @@ msgstr "_Sulje ikkuna"
  #~ msgid "_Update login records when command is launched"
  #~ msgstr "_Päivitä kirjautumistallenne kun komento käynnistetään"
  
@@ -2902,10 +2876,10 @@ index 056943256725..bbb7ade1bb6b 100644
 +msgid "Set Title"
 +msgstr "Aseta otsikko"
 diff --git a/po/fr.po b/po/fr.po
-index f49a3c83426f..cb0c4a8e515a 100644
+index 44bdeb2c7520..ba398e4f3c04 100644
 --- a/po/fr.po
 +++ b/po/fr.po
-@@ -2500,3 +2500,15 @@ msgstr "Fermer _la fenêtre"
+@@ -2513,3 +2513,15 @@ msgstr "Fermer _la fenêtre"
  
  #~ msgid "_Detach Tab"
  #~ msgstr "_Détacher l’onglet"
@@ -2922,10 +2896,10 @@ index f49a3c83426f..cb0c4a8e515a 100644
 +msgid "Set Title"
 +msgstr "Définir le titre"
 diff --git a/po/fur.po b/po/fur.po
-index 50973f59bc2c..2d6e44fc4710 100644
+index ced8f56677f7..c869f85f66ee 100644
 --- a/po/fur.po
 +++ b/po/fur.po
-@@ -539,6 +539,10 @@ msgstr ""
+@@ -545,6 +545,10 @@ msgstr ""
  msgid "Which encoding to use"
  msgstr "Codifiche di doprâ"
  
@@ -2933,10 +2907,10 @@ index 50973f59bc2c..2d6e44fc4710 100644
 +msgid "Transparent background"
 +msgstr "Fondâl trasparent"
 +
- #: src/org.gnome.Terminal.gschema.xml:345
+ #: src/org.gnome.Terminal.gschema.xml:350
  msgid ""
  "Whether ambiguous-width characters are narrow or wide when using UTF-8 "
-@@ -3536,6 +3540,9 @@ msgstr "_Siere barcon"
+@@ -3546,6 +3550,9 @@ msgstr "_Siere barcon"
  #~ msgid "The text you clicked on doesn't seem to be a valid OTP challenge."
  #~ msgstr "Il test fracât nol samee jessi un OTP challenge."
  
@@ -2946,7 +2920,7 @@ index 50973f59bc2c..2d6e44fc4710 100644
  #~ msgid "Switch to Tab 3"
  #~ msgstr "Passe a la schede 3"
  
-@@ -3591,8 +3598,8 @@ msgstr "_Siere barcon"
+@@ -3601,8 +3608,8 @@ msgstr "_Siere barcon"
  #~ msgid "_Input Methods"
  #~ msgstr "_Cemût inserî test"
  
@@ -2969,10 +2943,10 @@ index 93d5fa9d1481..feb87dce3d6b 100644
 +msgid "Transparent background"
 +msgstr "Cúlra trédhearcach"
 diff --git a/po/gl.po b/po/gl.po
-index 89b7501d2358..0761a31a8d1f 100644
+index d411ea4f1347..f8a48d82635c 100644
 --- a/po/gl.po
 +++ b/po/gl.po
-@@ -2418,3 +2418,15 @@ msgstr ""
+@@ -2445,3 +2445,15 @@ msgstr ""
  #: src/terminal-window.c:3224
  msgid "C_lose Window"
  msgstr "P_echar a xanela"
@@ -3037,10 +3011,10 @@ index 76b459cf8dc5..485beeac98b7 100644
  #~ msgid "No such profile \"%s\", using default profile\n"
  #~ msgstr "\"%s\" જેવી કોઈ રૂપરેખા નથી, મૂળભૂત રૂપરેખા વાપરી રહ્યા છે\n"
 diff --git a/po/he.po b/po/he.po
-index 167d2b659b83..845b38be855e 100644
+index ad00c9109e41..82fc3c9573e1 100644
 --- a/po/he.po
 +++ b/po/he.po
-@@ -2882,17 +2882,17 @@ msgstr "סגירת ה_חלון"
+@@ -2769,17 +2769,17 @@ msgstr "סגירת ה_חלון"
  #~ msgid "Default size:"
  #~ msgstr "גודל בררת מחדל:"
  
@@ -3064,7 +3038,7 @@ index 167d2b659b83..845b38be855e 100644
  
  #~ msgid "Current Locale"
  #~ msgstr "השפה הנוכחית"
-@@ -3704,8 +3704,8 @@ msgstr "סגירת ה_חלון"
+@@ -3591,8 +3591,8 @@ msgstr "סגירת ה_חלון"
  #~ msgid "_Solid color"
  #~ msgstr "צבע _אחיד"
  
@@ -3125,10 +3099,10 @@ index 2d7dc5b14008..8d3d0529df61 100644
  #~ msgid "S/Key Challenge Response"
  #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया"
 diff --git a/po/hr.po b/po/hr.po
-index 881b7cc7f3f3..3d2cba35a617 100644
+index 8cb0df752f2f..d7f96a287470 100644
 --- a/po/hr.po
 +++ b/po/hr.po
-@@ -2710,3 +2710,13 @@ msgstr "_Zatvori prozor"
+@@ -2737,3 +2737,13 @@ msgstr "_Zatvori prozor"
  
  #~ msgid "Use transparency from system theme"
  #~ msgstr "Koristi prozirnost iz teme sustava"
@@ -3143,10 +3117,10 @@ index 881b7cc7f3f3..3d2cba35a617 100644
 +msgid "Set Title"
 +msgstr "Postavi naslov"
 diff --git a/po/hu.po b/po/hu.po
-index b498f34e8983..5e2250e6196e 100644
+index 9142e00ab1ac..33ff34110e05 100644
 --- a/po/hu.po
 +++ b/po/hu.po
-@@ -2410,3 +2410,15 @@ msgstr ""
+@@ -2433,3 +2433,15 @@ msgstr ""
  #: src/terminal-window.c:3224
  msgid "C_lose Window"
  msgstr "_Ablak bezárása"
@@ -3189,10 +3163,10 @@ index aaf2d9b292da..4d466f164420 100644
  #: ../src/profile-preferences.glade.h:74
  msgid "_Update login records when command is launched"
 diff --git a/po/id.po b/po/id.po
-index 9d37f273ac6b..764008affd95 100644
+index 5e3f3617dbe8..9df577e3edfe 100644
 --- a/po/id.po
 +++ b/po/id.po
-@@ -2415,3 +2415,15 @@ msgstr "Tutup Jende_la"
+@@ -2442,3 +2442,15 @@ msgstr "Tutup Jende_la"
  
  #~ msgid "_Detach Tab"
  #~ msgstr "_Pisahkan Tab"
@@ -3209,10 +3183,10 @@ index 9d37f273ac6b..764008affd95 100644
 +msgid "Set Title"
 +msgstr "Atur Judul"
 diff --git a/po/it.po b/po/it.po
-index e08dfae8009c..b224bbdc1f3a 100644
+index 3d6e7f02c168..d9560a1a5b1c 100644
 --- a/po/it.po
 +++ b/po/it.po
-@@ -2434,3 +2434,15 @@ msgstr ""
+@@ -2459,3 +2459,15 @@ msgstr ""
  #: src/terminal-window.c:3224
  msgid "C_lose Window"
  msgstr "Chiudi _finestra"
@@ -3229,10 +3203,10 @@ index e08dfae8009c..b224bbdc1f3a 100644
 +msgid "Set Title"
 +msgstr "Imposta titolo"
 diff --git a/po/ja.po b/po/ja.po
-index e757d438fa46..0dd629281491 100644
+index ab72bc42e70b..690281a6713e 100644
 --- a/po/ja.po
 +++ b/po/ja.po
-@@ -2495,3 +2495,15 @@ msgstr "ウィンドウを閉じる(_L)"
+@@ -2534,3 +2534,15 @@ msgstr "ウィンドウを閉じる(_L)"
  
  #~ msgid "_Incremental Search…"
  #~ msgstr "インクリメンタル検索(_I)…"
@@ -3273,10 +3247,10 @@ index e0dd79f280a2..887d395ce150 100644
  
  #: ../src/gnome-terminal.glade2.h:87
 diff --git a/po/kk.po b/po/kk.po
-index 623463c9fa89..730f7c769755 100644
+index d2487add3897..a2beab5fa3f6 100644
 --- a/po/kk.po
 +++ b/po/kk.po
-@@ -2701,3 +2701,15 @@ msgstr "Терезені жа_бу"
+@@ -2712,3 +2712,15 @@ msgstr "Терезені жа_бу"
  
  #~ msgid "Be quiet"
  #~ msgstr "Тыныш болу"
@@ -3345,10 +3319,10 @@ index c887f88a2c87..0fc1c3139258 100644
 +msgid "Transparent background"
 +msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ"
 diff --git a/po/ko.po b/po/ko.po
-index 4e322035a8dd..51f955189dd2 100644
+index 8bddfb9141b8..0d37503a81f7 100644
 --- a/po/ko.po
 +++ b/po/ko.po
-@@ -2445,3 +2445,15 @@ msgstr "창 닫기(_L)"
+@@ -2474,3 +2474,15 @@ msgstr "창 닫기(_L)"
  
  #~ msgid "Verbose output"
  #~ msgstr "많이 출력"
@@ -3391,10 +3365,10 @@ index bc2bb7f03de4..d2a83a007097 100644
  #: ../src/gnome-terminal.glade2.h:87
  msgid "_Update login records when command is launched"
 diff --git a/po/lt.po b/po/lt.po
-index d02997c9e0c3..1b898ae85b9d 100644
+index 3c62d2ffab11..11a04aa72fc5 100644
 --- a/po/lt.po
 +++ b/po/lt.po
-@@ -2729,3 +2729,15 @@ msgstr "_Užverti langą"
+@@ -2739,3 +2739,15 @@ msgstr "_Užverti langą"
  
  #~ msgid "Whether to use a dark theme variant"
  #~ msgstr "Ar naudoti tamsų temos variantą"
@@ -3411,10 +3385,10 @@ index d02997c9e0c3..1b898ae85b9d 100644
 +msgid "Set Title"
 +msgstr "Nustatyti pavadinimą"
 diff --git a/po/lv.po b/po/lv.po
-index 8c9c00c87fd2..87aecdde0dba 100644
+index 57637022c2ee..d495e18ac27a 100644
 --- a/po/lv.po
 +++ b/po/lv.po
-@@ -2539,3 +2539,19 @@ msgstr "Aizvērt _logu"
+@@ -2691,3 +2691,19 @@ msgstr "Aizvērt _logu"
  
  #~ msgid "_Add or Remove…"
  #~ msgstr "_Pievienot vai izņemt…"
@@ -3613,11 +3587,11 @@ index 114f0d4e50c2..5d3f2e011f1c 100644
  #~ msgid "_Update login records when command is launched"
  #~ msgstr "_Kemaskini rekod logmasuk bila arahan dilancarkan"
 diff --git a/po/nb.po b/po/nb.po
-index 683acfe5221e..3dc97ee17fec 100644
+index e48f82b..4a311f7 100644
 --- a/po/nb.po
 +++ b/po/nb.po
-@@ -2261,3 +2261,15 @@ msgstr ""
- #: ../src/terminal-window.c:3210
+@@ -2406,3 +2406,15 @@ msgstr ""
+ #: src/terminal-window.c:3224
  msgid "C_lose Window"
  msgstr "_Lukk vindu"
 +
@@ -3696,10 +3670,10 @@ index 4fe16cc88a9a..53fb89134be0 100644
  #~ msgid ""
  #~ "text/plain dropped on terminal had wrong format (%d) or length (%d)\n"
 diff --git a/po/nl.po b/po/nl.po
-index 5b3caeaa9a25..420cb4c8d936 100644
+index b493d43bbbaf..e97079afacad 100644
 --- a/po/nl.po
 +++ b/po/nl.po
-@@ -2750,3 +2750,15 @@ msgstr "Venster sl_uiten"
+@@ -2776,3 +2776,15 @@ msgstr "Venster sl_uiten"
  
  #~ msgid "_Add or Remove…"
  #~ msgstr "_Toevoegen of verwijderen…"
@@ -3876,10 +3850,10 @@ index b25a2cb41712..3855b2f3423f 100644
  #: ../src/profile-preferences.glade.h:70
  msgid "_Update login records when command is launched"
 diff --git a/po/pt.po b/po/pt.po
-index 5181419ad973..3df37f6d5bc7 100644
+index d7af9e54ce22..f6f92cbeac5a 100644
 --- a/po/pt.po
 +++ b/po/pt.po
-@@ -2360,11 +2360,11 @@ msgstr "Fechar jane_la"
+@@ -2938,11 +2938,11 @@ msgstr "Fechar jane_la"
  #~ msgid "Default size:"
  #~ msgstr "Tamanho predefinido:"
  
@@ -3895,7 +3869,7 @@ index 5181419ad973..3df37f6d5bc7 100644
  
  #~ msgid "Title and Command"
  #~ msgstr "Título e comando"
-@@ -2372,8 +2372,8 @@ msgstr "Fechar jane_la"
+@@ -2950,8 +2950,8 @@ msgstr "Fechar jane_la"
  #~ msgid "_Unlimited"
  #~ msgstr "_Ilimitado"
  
@@ -3906,7 +3880,7 @@ index 5181419ad973..3df37f6d5bc7 100644
  
  #~ msgid "Current Locale"
  #~ msgstr "Configuração Regional Atual"
-@@ -3160,8 +3160,8 @@ msgstr "Fechar jane_la"
+@@ -3705,8 +3705,8 @@ msgstr "Fechar jane_la"
  #~ msgid "Background image _scrolls"
  #~ msgstr "Imagem de fundo _rola"
  
@@ -3918,10 +3892,10 @@ index 5181419ad973..3df37f6d5bc7 100644
  #~ msgid "S_hade transparent or image background:"
  #~ msgstr "Transparente som_breado ou imagem de fundo:"
 diff --git a/po/pt_BR.po b/po/pt_BR.po
-index d5f10e4f2cbd..cd2f908fb579 100644
+index 4152306f6e0c..c8590c320d36 100644
 --- a/po/pt_BR.po
 +++ b/po/pt_BR.po
-@@ -2831,17 +2831,17 @@ msgstr "_Fechar janela"
+@@ -2858,17 +2858,17 @@ msgstr "_Fechar janela"
  #~ msgid "Default size:"
  #~ msgstr "Tamanho padrão:"
  
@@ -3945,7 +3919,7 @@ index d5f10e4f2cbd..cd2f908fb579 100644
  
  #~ msgid "Current Locale"
  #~ msgstr "Codificação atual"
-@@ -3467,3 +3467,6 @@ msgstr "_Fechar janela"
+@@ -3494,3 +3494,6 @@ msgstr "_Fechar janela"
  #~ "terminal poderão usar. Essa é a paleta, na forma de uma lista de nomes de "
  #~ "cores separada por dois pontos. Os nomes de cores devem estar no formato "
  #~ "hexadecimal. Exemplo: \"#FF00FF\""
@@ -3953,10 +3927,10 @@ index d5f10e4f2cbd..cd2f908fb579 100644
 +msgid "Transparent background"
 +msgstr "Fundo transparente"
 diff --git a/po/ro.po b/po/ro.po
-index 5ac49a0cd0d6..f09b96ec6e60 100644
+index 84030877e73a..cbe1e739889b 100644
 --- a/po/ro.po
 +++ b/po/ro.po
-@@ -3501,8 +3501,8 @@ msgstr "Î_nchide fereastra"
+@@ -3514,8 +3514,8 @@ msgstr "Î_nchide fereastra"
  #~ msgid "_Solid color"
  #~ msgstr "Culoare _solidă"
  
@@ -4039,10 +4013,10 @@ index adca7d5acba9..6379cee7f0a3 100644
  #: ../src/gnome-terminal.glade2.h:87
  msgid "_Update login records when command is launched"
 diff --git a/po/sk.po b/po/sk.po
-index e4f9a101fbf5..ad840d8829d0 100644
+index 765dcf2a034d..96bff962d86e 100644
 --- a/po/sk.po
 +++ b/po/sk.po
-@@ -3048,3 +3048,15 @@ msgstr "_Zavrieť okno"
+@@ -3076,3 +3076,15 @@ msgstr "_Zavrieť okno"
  #~ "\n"
  #~ "Viac informácii o jednotlivých príkazoch získate pomocou „%s PRÍKAZ --"
  #~ "help“.\n"
@@ -4059,10 +4033,10 @@ index e4f9a101fbf5..ad840d8829d0 100644
 +msgid "Set Title"
 +msgstr "Nastaviť titulok"
 diff --git a/po/sl.po b/po/sl.po
-index a04bcee488b1..b96df7bd9359 100644
+index 3108543b2ed6..2f7d4b389da1 100644
 --- a/po/sl.po
 +++ b/po/sl.po
-@@ -2824,17 +2824,17 @@ msgstr "_Zapri okno"
+@@ -2836,17 +2836,17 @@ msgstr "_Zapri okno"
  #~ msgid "Default size:"
  #~ msgstr "Privzeta velikost:"
  
@@ -4086,7 +4060,7 @@ index a04bcee488b1..b96df7bd9359 100644
  
  #~ msgid "Current Locale"
  #~ msgstr "Trenutne jezikovne nastavitve"
-@@ -2949,3 +2949,6 @@ msgstr "_Zapri okno"
+@@ -2961,3 +2961,6 @@ msgstr "_Zapri okno"
  
  #~ msgid "_Profile Preferences…"
  #~ msgstr "Možnosti _profila ..."
@@ -4120,10 +4094,10 @@ index 158f6cb167cc..a3494fb70bd6 100644
  #: ../src/gnome-terminal.glade2.h:86
  msgid "_Update login records when command is launched"
 diff --git a/po/sr.po b/po/sr.po
-index 9b3545059f1f..04d2fb625b4d 100644
+index 64a3ca2ba635..a8e565c04333 100644
 --- a/po/sr.po
 +++ b/po/sr.po
-@@ -2719,10 +2719,9 @@ msgstr "_Затвори прозор"
+@@ -2746,10 +2746,9 @@ msgstr "_Затвори прозор"
  #~ msgid "GNOME Terminal Client"
  #~ msgstr "Клијент Гномовог терминала"
  
@@ -4137,7 +4111,7 @@ index 9b3545059f1f..04d2fb625b4d 100644
  
  #~ msgid "Title for terminal"
  #~ msgstr "Наслов за терминал"
-@@ -2768,11 +2767,11 @@ msgstr "_Затвори прозор"
+@@ -2795,11 +2794,11 @@ msgstr "_Затвори прозор"
  #~ msgid "Default size:"
  #~ msgstr "Основна величина:"
  
@@ -4153,7 +4127,7 @@ index 9b3545059f1f..04d2fb625b4d 100644
  
  #~ msgid "Title and Command"
  #~ msgstr "Наслов и наредба"
-@@ -2780,8 +2779,8 @@ msgstr "_Затвори прозор"
+@@ -2807,8 +2806,8 @@ msgstr "_Затвори прозор"
  #~ msgid "_Unlimited"
  #~ msgstr "_Неограничено"
  
@@ -4164,7 +4138,7 @@ index 9b3545059f1f..04d2fb625b4d 100644
  
  #~ msgid "Current Locale"
  #~ msgstr "Текући локалитет"
-@@ -2791,3 +2790,6 @@ msgstr "_Затвори прозор"
+@@ -2818,3 +2817,6 @@ msgstr "_Затвори прозор"
  
  #~ msgid "Hidden"
  #~ msgstr "Скривен"
@@ -4224,10 +4198,10 @@ index 45dbad07fba7..852c47cc6ee5 100644
 +msgid "Transparent background"
 +msgstr "Providna pozadina"
 diff --git a/po/sv.po b/po/sv.po
-index 8ffe3c688434..05389390c925 100644
+index 5c5fa345c9ad..de87367421d7 100644
 --- a/po/sv.po
 +++ b/po/sv.po
-@@ -2725,5 +2725,17 @@ msgstr "Stän_g fönster"
+@@ -2737,5 +2737,17 @@ msgstr "Stän_g fönster"
  #~ msgid "Unknown completion request for \"%s\""
  #~ msgstr "Okänd kompletteringsbegäran för \"%s\""
  
@@ -4460,10 +4434,10 @@ index 63263749655c..496da331bbf9 100644
  #~ msgid ""
  #~ "You already have a profile called “%s”. Do you want to create another "
 diff --git a/po/tr.po b/po/tr.po
-index 868ad445e6a4..660225ffd360 100644
+index 3ac22937b896..bd971dd81d73 100644
 --- a/po/tr.po
 +++ b/po/tr.po
-@@ -2703,3 +2703,15 @@ msgstr "_Pencereyi Kapat"
+@@ -2731,3 +2731,15 @@ msgstr "_Pencereyi Kapat"
  
  #~ msgid "_Same as text color"
  #~ msgstr "_Metin rengiyle aynı"
@@ -4495,10 +4469,10 @@ index 313f76b98eae..be6089762082 100644
  #~ msgid ""
  #~ "You already have a profile called “%s”. Do you want to create another "
 diff --git a/po/uk.po b/po/uk.po
-index 436f7ee4f283..861b6a726ba0 100644
+index d6a261e2de57..9e0cca12a398 100644
 --- a/po/uk.po
 +++ b/po/uk.po
-@@ -2408,3 +2408,18 @@ msgstr ""
+@@ -2422,3 +2422,18 @@ msgstr ""
  #: src/terminal-window.c:3224
  msgid "C_lose Window"
  msgstr "Закр_ити вікно"
@@ -4636,10 +4610,10 @@ index cb78ec67db2d..a4f3b4ddcfb6 100644
  #: ../src/terminal-window.c:986
  msgid "Set _Character Encoding"
 diff --git a/po/zh_CN.po b/po/zh_CN.po
-index 1b60c64c9238..abeee10d082c 100644
+index 4e07e12ea346..dbe611ed5d05 100644
 --- a/po/zh_CN.po
 +++ b/po/zh_CN.po
-@@ -2741,17 +2741,17 @@ msgstr "关闭窗口(_L)"
+@@ -2754,17 +2754,17 @@ msgstr "关闭窗口(_L)"
  #~ msgid "Default size:"
  #~ msgstr "默认大小："
  
@@ -4663,7 +4637,7 @@ index 1b60c64c9238..abeee10d082c 100644
  
  #~ msgid "Current Locale"
  #~ msgstr "当前区域"
-@@ -2864,3 +2864,6 @@ msgstr "关闭窗口(_L)"
+@@ -2877,3 +2877,6 @@ msgstr "关闭窗口(_L)"
  
  #~ msgid "_Find..."
  #~ msgstr "查找(_F)..."
@@ -4706,10 +4680,10 @@ index 61153529f0c7..c366abddd1af 100644
 +msgid "Transparent background"
 +msgstr "透明背景"
 diff --git a/po/zh_TW.po b/po/zh_TW.po
-index fd2360678454..5792c58a64f3 100644
+index 80cb23434a60..20e2a93ce3f0 100644
 --- a/po/zh_TW.po
 +++ b/po/zh_TW.po
-@@ -2723,17 +2723,17 @@ msgstr "關閉視窗(_L)"
+@@ -2735,17 +2735,17 @@ msgstr "關閉視窗(_L)"
  #~ msgid "Default size:"
  #~ msgstr "預設大小："
  
@@ -4733,7 +4707,7 @@ index fd2360678454..5792c58a64f3 100644
  
  #~ msgid "Current Locale"
  #~ msgstr "目前的地區設定"
-@@ -2945,3 +2945,6 @@ msgstr "關閉視窗(_L)"
+@@ -2957,3 +2957,6 @@ msgstr "關閉視窗(_L)"
  
  #~ msgid "Show session management options"
  #~ msgstr "顯示作業階段管理選項"
@@ -4744,7 +4718,7 @@ index fd2360678454..5792c58a64f3 100644
 2.25.4
 
 
-From ea71444c359aae016a51c4c1fcce99f575bbe562 Mon Sep 17 00:00:00 2001
+From fc5845548ab6cbf56888c81fafdf63659ef9c337 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Wed, 25 May 2016 13:47:36 +0200
 Subject: [PATCH 12/16] Restore the action and shortcut to set a static title
@@ -4892,7 +4866,7 @@ index c0219d872725..61c5e7de350a 100644
 2.25.4
 
 
-From 910e1d1de39c09dd70f673f4a899a05005d9fa7d Mon Sep 17 00:00:00 2001
+From e5d3a23ff1f72a2fb2887abcbcb9a4d33dd4cdc3 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Thu, 30 Jun 2016 18:14:36 +0200
 Subject: [PATCH 13/16] screen: Style fix
@@ -4906,10 +4880,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 5e473efa70ea..b2fbf72dbde9 100644
+index 7724af0dfa04..3e93ab8ff7e5 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -831,7 +831,7 @@ terminal_screen_new (GSettings       *profile,
+@@ -833,7 +833,7 @@ terminal_screen_new (GSettings       *profile,
    /* If given an initial title, strip it of control characters and
     * feed it to the terminal.
     */
@@ -4922,7 +4896,7 @@ index 5e473efa70ea..b2fbf72dbde9 100644
 2.25.4
 
 
-From 69bbb3c0f5533d8e0b14bfa13cb08fcc08f19079 Mon Sep 17 00:00:00 2001
+From 4dbaed23edd26456c0509d4bc5424acbdb9140f9 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Thu, 30 Jun 2016 16:58:15 +0200
 Subject: [PATCH 14/16] Restore the rest of the title handling options and make
@@ -5076,7 +5050,7 @@ index cbb59a2301e6..78e7a9a54b60 100644
  #define TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY         "use-custom-command"
  #define TERMINAL_PROFILE_USE_SKEY_KEY                   "use-skey"
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index b2fbf72dbde9..296fb1fead2d 100644
+index 3e93ab8ff7e5..95ad21f6e867 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
 @@ -110,8 +110,11 @@ struct _TerminalScreenPrivate
@@ -5116,7 +5090,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
  static void terminal_screen_check_extra (TerminalScreen *screen,
                                           GdkEvent       *event,
                                           char           **number_info);
-@@ -559,6 +566,9 @@ terminal_screen_init (TerminalScreen *screen)
+@@ -561,6 +568,9 @@ terminal_screen_init (TerminalScreen *screen)
    gtk_target_table_free (targets, n_targets);
    gtk_target_list_unref (target_list);
  
@@ -5126,7 +5100,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
    g_signal_connect (screen, "window-title-changed",
                      G_CALLBACK (terminal_screen_window_title_changed),
                      screen);
-@@ -592,9 +602,6 @@ terminal_screen_get_property (GObject *object,
+@@ -594,9 +604,6 @@ terminal_screen_get_property (GObject *object,
        case PROP_TITLE:
          g_value_set_string (value, terminal_screen_get_title (screen));
          break;
@@ -5136,7 +5110,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
        default:
          G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
          break;
-@@ -615,7 +622,6 @@ terminal_screen_set_property (GObject *object,
+@@ -617,7 +624,6 @@ terminal_screen_set_property (GObject *object,
          terminal_screen_set_profile (screen, g_value_get_object (value));
          break;
        case PROP_TITLE:
@@ -5144,7 +5118,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
          /* not writable */
        default:
          G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-@@ -705,13 +711,6 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -707,13 +713,6 @@ terminal_screen_class_init (TerminalScreenClass *klass)
                            NULL,
                            G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
  
@@ -5158,7 +5132,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
    g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate));
  
    n_url_regexes = G_N_ELEMENTS (url_regex_patterns);
-@@ -808,7 +807,9 @@ terminal_screen_finalize (GObject *object)
+@@ -810,7 +809,9 @@ terminal_screen_finalize (GObject *object)
  
    g_free (priv->uuid);
    g_free (priv->current_cmdline);
@@ -5169,7 +5143,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
  
    G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object);
  }
-@@ -828,28 +829,8 @@ terminal_screen_new (GSettings       *profile,
+@@ -830,28 +831,8 @@ terminal_screen_new (GSettings       *profile,
                           g_settings_get_int (profile, TERMINAL_PROFILE_DEFAULT_SIZE_COLUMNS_KEY),
                           g_settings_get_int (profile, TERMINAL_PROFILE_DEFAULT_SIZE_ROWS_KEY));
  
@@ -5200,7 +5174,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
  
    vte_terminal_set_font_scale (VTE_TERMINAL (screen), zoom);
    terminal_screen_set_font (screen);
-@@ -1061,28 +1042,139 @@ terminal_screen_exec (TerminalScreen *screen,
+@@ -1064,28 +1045,139 @@ terminal_screen_exec (TerminalScreen *screen,
    return TRUE;
  }
  
@@ -5351,7 +5325,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
  }
  
  static void
-@@ -1125,9 +1217,10 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -1128,9 +1220,10 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
      }
  
    if (!prop_name ||
@@ -5363,7 +5337,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
      }
  
    if (gtk_widget_get_realized (GTK_WIDGET (screen)) &&
-@@ -1419,7 +1512,6 @@ terminal_screen_set_profile (TerminalScreen *screen,
+@@ -1422,7 +1515,6 @@ terminal_screen_set_profile (TerminalScreen *screen,
      g_object_unref (old_profile);
  
    g_object_notify (G_OBJECT (screen), "profile");
@@ -5371,7 +5345,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
  }
  
  GSettings*
-@@ -1691,8 +1783,6 @@ spawn_result_cb (VteTerminal *terminal,
+@@ -1694,8 +1786,6 @@ spawn_result_cb (VteTerminal *terminal,
  
    priv->child_pid = pid;
  
@@ -5380,7 +5354,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
    if (error) {
       // FIXMEchpe should be unnecessary, vte already does this internally
      vte_terminal_set_pty (terminal, NULL);
-@@ -1977,33 +2067,45 @@ terminal_screen_focus_in (GtkWidget     *widget,
+@@ -1980,33 +2070,45 @@ terminal_screen_focus_in (GtkWidget     *widget,
    return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event);
  }
  
@@ -5440,7 +5414,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
  }
  
  /**
-@@ -2036,7 +2138,9 @@ static void
+@@ -2039,7 +2141,9 @@ static void
  terminal_screen_window_title_changed (VteTerminal *vte_terminal,
                                        TerminalScreen *screen)
  {
@@ -5451,7 +5425,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
  }
  
  static void
-@@ -2059,8 +2163,6 @@ terminal_screen_child_exited (VteTerminal *terminal,
+@@ -2062,8 +2166,6 @@ terminal_screen_child_exited (VteTerminal *terminal,
  
    priv->child_pid = -1;
  
@@ -5460,7 +5434,7 @@ index b2fbf72dbde9..296fb1fead2d 100644
    action = g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY);
  
    switch (action)
-@@ -2104,6 +2206,23 @@ terminal_screen_child_exited (VteTerminal *terminal,
+@@ -2107,6 +2209,23 @@ terminal_screen_child_exited (VteTerminal *terminal,
      }
  }
  
@@ -5539,7 +5513,7 @@ index 61c5e7de350a..0d61db3c125d 100644
 2.25.4
 
 
-From 26bcbb1ed2d7c2f7ca0d004acca9893e07f0b322 Mon Sep 17 00:00:00 2001
+From a8afd6f8f6214a26f777c0412ce0d7cc3ebdea81 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Wed, 3 Apr 2019 15:38:09 +0200
 Subject: [PATCH 15/16] Update the title with the current foreground process
@@ -5582,7 +5556,7 @@ index 78e7a9a54b60..88dd11254c0d 100644
  #define TERMINAL_PROFILE_TITLE_MODE_KEY                 "title-mode"
  #define TERMINAL_PROFILE_TITLE_KEY                      "title"
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 296fb1fead2d..2ebbbbd10b69 100644
+index 95ad21f6e867..399dc889b96a 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
 @@ -109,7 +109,9 @@ struct _TerminalScreenPrivate
@@ -5595,7 +5569,7 @@ index 296fb1fead2d..2ebbbbd10b69 100644
    gboolean user_title; /* title was manually set */
    char *current_cmdline;
    char *raw_title;
-@@ -1157,6 +1159,20 @@ terminal_screen_format_title (TerminalScreen *screen,
+@@ -1160,6 +1162,20 @@ terminal_screen_format_title (TerminalScreen *screen,
        add_sep = FALSE;
      }
  
@@ -5616,7 +5590,7 @@ index 296fb1fead2d..2ebbbbd10b69 100644
    if (*titleptr == NULL || strcmp (title->str, *titleptr) != 0)
      {
        g_free (*titleptr);
-@@ -1186,6 +1202,7 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -1189,6 +1205,7 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
    GObject *object = G_OBJECT (screen);
    VteTerminal *vte_terminal = VTE_TERMINAL (screen);
    TerminalWindow *window;
@@ -5624,7 +5598,7 @@ index 296fb1fead2d..2ebbbbd10b69 100644
  
    g_object_freeze_notify (object);
  
-@@ -1220,7 +1237,7 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -1223,7 +1240,7 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
        prop_name == I_(TERMINAL_PROFILE_TITLE_MODE_KEY) ||
        prop_name == I_(TERMINAL_PROFILE_TITLE_KEY))
      {
@@ -5633,7 +5607,7 @@ index 296fb1fead2d..2ebbbbd10b69 100644
      }
  
    if (gtk_widget_get_realized (GTK_WIDGET (screen)) &&
-@@ -1248,6 +1265,13 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -1251,6 +1268,13 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
        prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT))
      update_color_scheme (screen);
  
@@ -5647,7 +5621,7 @@ index 296fb1fead2d..2ebbbbd10b69 100644
    if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
        vte_terminal_set_audible_bell (vte_terminal, g_settings_get_boolean (profile, TERMINAL_PROFILE_AUDIBLE_BELL_KEY));
  
-@@ -1312,6 +1336,9 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -1315,6 +1339,9 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
        vte_terminal_set_word_char_exceptions (vte_terminal, word_char_exceptions);
      }
  
@@ -5657,7 +5631,7 @@ index 296fb1fead2d..2ebbbbd10b69 100644
    g_object_thaw_notify (object);
  }
  
-@@ -2138,6 +2165,9 @@ static void
+@@ -2141,6 +2168,9 @@ static void
  terminal_screen_window_title_changed (VteTerminal *vte_terminal,
                                        TerminalScreen *screen)
  {
@@ -5667,7 +5641,7 @@ index 296fb1fead2d..2ebbbbd10b69 100644
    terminal_screen_set_dynamic_title (screen,
                                       vte_terminal_get_window_title (vte_terminal),
  				     FALSE);
-@@ -2244,6 +2274,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen)
+@@ -2247,6 +2277,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen)
    priv->current_cmdline = g_steal_pointer (&cmdline);
    _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline);
  
@@ -5676,7 +5650,7 @@ index 296fb1fead2d..2ebbbbd10b69 100644
   out:
    priv->contents_changed_source_id = 0;
    return G_SOURCE_REMOVE;
-@@ -2336,6 +2368,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
+@@ -2339,6 +2371,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
  
    _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell precmd\n");
  
@@ -5684,7 +5658,7 @@ index 296fb1fead2d..2ebbbbd10b69 100644
    priv->between_preexec_and_precmd = FALSE;
  
    if (priv->contents_changed_source_id != 0)
-@@ -2355,6 +2388,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
+@@ -2358,6 +2391,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal)
  
    g_clear_pointer (&priv->current_cmdline, g_free);
    _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: (none)\n");
@@ -5693,7 +5667,7 @@ index 296fb1fead2d..2ebbbbd10b69 100644
  }
  
  static gboolean
-@@ -2375,6 +2410,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen)
+@@ -2378,6 +2413,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen)
    priv->current_cmdline = g_steal_pointer (&cmdline);
    _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline);
  
@@ -5706,7 +5680,7 @@ index 296fb1fead2d..2ebbbbd10b69 100644
 2.25.4
 
 
-From 38af1f795557034ef35695a12555253486e3ea7d Mon Sep 17 00:00:00 2001
+From 6fcc54a2475fa4d248f6b78ead8625e2d3e1ae9d Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Thu, 27 Feb 2020 19:32:08 +0100
 Subject: [PATCH 16/16] screen, window: Preserve current toolbox, if any
@@ -5716,16 +5690,16 @@ advertises the name of the current toolbox container.
 
 https://gitlab.freedesktop.org/terminal-wg/specifications/issues/17
 ---
- src/terminal-screen.c | 37 ++++++++++++++++++++++++++++++++++---
+ src/terminal-screen.c | 30 +++++++++++++++++++++++++++++-
  src/terminal-screen.h |  6 ++++++
  src/terminal-window.c | 26 ++++++++++++++++++++++++--
- 3 files changed, 64 insertions(+), 5 deletions(-)
+ 3 files changed, 59 insertions(+), 3 deletions(-)
 
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 2ebbbbd10b69..9c42798e4b86 100644
+index 399dc889b96a..db088f6f2695 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -875,6 +875,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
+@@ -877,6 +877,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
                                      TerminalScreen *parent_screen,
                                      GCancellable *cancellable,
                                      GError **error)
@@ -5751,15 +5725,12 @@ index 2ebbbbd10b69..9c42798e4b86 100644
  {
    g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
  
-@@ -885,15 +904,27 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
- 
+@@ -888,8 +907,17 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
+   terminal_unref_exec_data ExecData* data = exec_data_clone (parent_screen->priv->exec_data, FALSE);
    gs_free char* cwd = terminal_screen_get_current_dir (parent_screen);
  
-+  terminal_unref_exec_data ExecData* data = NULL;
 +  if (override_command != NULL)
 +    {
-+      data = exec_data_clone (parent_screen->priv->exec_data);
-+
 +      g_strfreev (data->argv);
 +      data->argv = g_strdupv (override_command);
 +
@@ -5773,15 +5744,6 @@ index 2ebbbbd10b69..9c42798e4b86 100644
                           screen,
                           parent_screen,
                           cwd);
- 
-   return terminal_screen_reexec_from_exec_data (screen,
--                                                NULL /* exec data */,
--                                                NULL /* envv */,
-+                                                data,
-+                                                parent_screen->priv->exec_data->envv,
-                                                 cwd,
-                                                 cancellable,
-                                                 error);
 diff --git a/src/terminal-screen.h b/src/terminal-screen.h
 index 5b7fcc59ddd0..5b1f983a7049 100644
 --- a/src/terminal-screen.h
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index a7f99e7c01ffaabd9d398847db472b6e10ed7eda..5a4584e9584f428740cb92abdcf06dbefb1a0eb7 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,10 +1,10 @@
 Name:           gnome-terminal
-Version:        3.37.90
+Version:        3.38.3
 Release:        1
 Summary:        A terminal emulator for GNOME
 License:        GPLv3+ and GFDL and LGPLv2+
 URL:            http://www.gnome.org/
-Source0:        http://download.gnome.org/sources/gnome-terminal/3.37/gnome-terminal-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/gnome-terminal/3.38/gnome-terminal-%{version}.tar.xz
 
 Patch0000:      gnome-terminal-cntr-ntfy-autottl-ts.patch
 Patch0001:      0001-build-Don-t-treat-warnings-as-errors.patch
@@ -73,6 +73,9 @@ make check
 %{_datadir}/man/man1/gnome-terminal.1*
 
 %changelog
+* Mon Jun 21 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.3-1
+- Upgrade to 3.38.3
+
 * Tue Dec 22 2020 huanghaitao <huanghaitao8@huawei.com> - 3.37.90-1
 - Update to 3.37.90