From 82aebd5b5a98c17b54336b3e09db38c365be4f2b Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 14 Sep 2017 20:04:46 +0200
Subject: [PATCH] Update to 3.26.0

- Rebase downstream patches
---
 .gitignore                                    |   1 +
 ...minal-notify-open-title-transparency.patch | 717 ++++++++----------
 gnome-terminal.spec                           |  12 +-
 sources                                       |   2 +-
 4 files changed, 312 insertions(+), 420 deletions(-)

diff --git a/.gitignore b/.gitignore
index dd58bec..ef14abf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ gnome-terminal-2.31.3.tar.bz2
 /gnome-terminal-3.24.0.tar.xz
 /gnome-terminal-3.24.1.tar.xz
 /gnome-terminal-3.24.2.tar.xz
+/gnome-terminal-3.26.0.tar.xz
diff --git a/gnome-terminal-notify-open-title-transparency.patch b/gnome-terminal-notify-open-title-transparency.patch
index b047559..949ac84 100644
--- a/gnome-terminal-notify-open-title-transparency.patch
+++ b/gnome-terminal-notify-open-title-transparency.patch
@@ -1,4 +1,4 @@
-From a73d915e0df7d3010494255de251368b631170e8 Mon Sep 17 00:00:00 2001
+From 7778fb9077b2cf00507dac367d60dd9d2c856396 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/14] Restore transparency
@@ -23,7 +23,7 @@ restore the translations of the string.
  6 files changed, 99 insertions(+), 1 deletion(-)
 
 diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
-index c68512b3f8f8..1b0121b8b85a 100644
+index ebb450bc9fd8..c2b92f7bc806 100644
 --- a/src/org.gnome.Terminal.gschema.xml
 +++ b/src/org.gnome.Terminal.gschema.xml
 @@ -370,6 +370,16 @@
@@ -146,10 +146,10 @@ index 4b734a3961d1..e434075d86af 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 63f0ca28227c..6209dee51312 100644
+index f6cc4a52f573..b5d156dbb16a 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -829,7 +829,9 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -833,7 +833,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) ||
@@ -160,7 +160,7 @@ index 63f0ca28227c..6209dee51312 100644
      update_color_scheme (screen);
  
    if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
-@@ -899,6 +901,8 @@ update_color_scheme (TerminalScreen *screen)
+@@ -903,6 +905,8 @@ update_color_scheme (TerminalScreen *screen)
    GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL;
    GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL;
    GtkStyleContext *context;
@@ -169,7 +169,7 @@ index 63f0ca28227c..6209dee51312 100644
    gboolean use_theme_colors;
  
    context = gtk_widget_get_style_context (widget);
-@@ -940,6 +944,18 @@ update_color_scheme (TerminalScreen *screen)
+@@ -944,6 +948,18 @@ update_color_scheme (TerminalScreen *screen)
      }
  
    colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors);
@@ -188,7 +188,7 @@ index 63f0ca28227c..6209dee51312 100644
    vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg,
                             colors, n_colors);
    vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp);
-@@ -947,6 +963,10 @@ update_color_scheme (TerminalScreen *screen)
+@@ -951,6 +967,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);
@@ -200,10 +200,10 @@ index 63f0ca28227c..6209dee51312 100644
  
  static void
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 2921c025596c..c41a73231bf4 100644
+index 2719708e20d4..fbc813dd9d7d 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -2621,6 +2621,8 @@ terminal_window_init (TerminalWindow *window)
+@@ -2700,6 +2700,8 @@ terminal_window_init (TerminalWindow *window)
    TerminalWindowPrivate *priv;
    TerminalApp *app;
    TerminalSettingsList *profiles_list;
@@ -212,7 +212,7 @@ index 2921c025596c..c41a73231bf4 100644
    GSettings *gtk_debug_settings;
    GtkActionGroup *action_group;
    GtkAction *action;
-@@ -2637,6 +2639,11 @@ terminal_window_init (TerminalWindow *window)
+@@ -2716,6 +2718,11 @@ terminal_window_init (TerminalWindow *window)
  
    gtk_widget_init_template (GTK_WIDGET (window));
  
@@ -225,10 +225,10 @@ index 2921c025596c..c41a73231bf4 100644
    uuid_unparse (u, uuidstr);
    priv->uuid = g_strdup (uuidstr);
 -- 
-2.12.2
+2.14.1
 
 
-From a48b1ea301b01a00311718b21ab1fdd51207c6ec Mon Sep 17 00:00:00 2001
+From 86ff684b5e06553127011b7adb7d949c1c2476f9 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/14] window: Make the drawing robust across all themes
@@ -248,13 +248,14 @@ 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 c41a73231bf4..fb64fa89b3cc 100644
+index fbc813dd9d7d..287fc95588ca 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -2295,6 +2295,26 @@ terminal_window_realize (GtkWidget *widget)
+@@ -2361,6 +2361,26 @@ terminal_window_realize (GtkWidget *widget)
+   terminal_window_update_size (window);
  }
  
- static gboolean
++static gboolean
 +terminal_window_draw (GtkWidget *widget,
 +                      cairo_t   *cr)
 +{
@@ -274,11 +275,10 @@ index c41a73231bf4..fb64fa89b3cc 100644
 +  return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
 +}
 +
-+static gboolean
+ static gboolean
  terminal_window_state_event (GtkWidget            *widget,
                               GdkEventWindowState  *event)
- {
-@@ -2832,6 +2852,7 @@ terminal_window_class_init (TerminalWindowClass *klass)
+@@ -2911,6 +2931,7 @@ terminal_window_class_init (TerminalWindowClass *klass)
  
    widget_class->show = terminal_window_show;
    widget_class->realize = terminal_window_realize;
@@ -287,10 +287,10 @@ index c41a73231bf4..fb64fa89b3cc 100644
    widget_class->screen_changed = terminal_window_screen_changed;
    widget_class->style_updated = terminal_window_style_updated;
 -- 
-2.12.2
+2.14.1
 
 
-From 45ecb5a45a66ca9ab372eb7b5e638e8b165aa0db Mon Sep 17 00:00:00 2001
+From 592615a2f58d95adc1e22eb769825e1450fec4ab 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/14] screen, window: Extra padding around transparent
@@ -303,7 +303,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943
  2 files changed, 49 insertions(+), 9 deletions(-)
 
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 6209dee51312..043a7ae9c4b2 100644
+index b5d156dbb16a..c502bd1e6a67 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
 @@ -139,6 +139,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *,
@@ -315,7 +315,7 @@ index 6209dee51312..043a7ae9c4b2 100644
  static gboolean terminal_screen_do_exec (TerminalScreen *screen,
                                           FDSetupData    *data,
                                           GError **error);
-@@ -484,6 +486,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -488,6 +490,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;
@@ -323,10 +323,11 @@ index 6209dee51312..043a7ae9c4b2 100644
  
    terminal_class->child_exited = terminal_screen_child_exited;
  
-@@ -887,6 +890,32 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -890,6 +893,32 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+   g_object_thaw_notify (object);
  }
  
- static void
++static void
 +update_toplevel_transparency (TerminalScreen *screen)
 +{
 +  GtkWidget *widget = GTK_WIDGET (screen);
@@ -352,11 +353,10 @@ index 6209dee51312..043a7ae9c4b2 100644
 +    }
 +}
 +
-+static void
+ static void
  update_color_scheme (TerminalScreen *screen)
  {
-   GtkWidget *widget = GTK_WIDGET (screen);
-@@ -964,9 +993,7 @@ update_color_scheme (TerminalScreen *screen)
+@@ -968,9 +997,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);
  
@@ -367,7 +367,7 @@ index 6209dee51312..043a7ae9c4b2 100644
  }
  
  static void
-@@ -1585,6 +1612,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
+@@ -1592,6 +1619,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
    terminal_screen_popup_info_unref (info);
  }
  
@@ -382,10 +382,10 @@ index 6209dee51312..043a7ae9c4b2 100644
  terminal_screen_button_press (GtkWidget      *widget,
                                GdkEventButton *event)
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index fb64fa89b3cc..f1b1c7d1038d 100644
+index 287fc95588ca..e5425d5b0aa7 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -2300,15 +2300,21 @@ terminal_window_draw (GtkWidget *widget,
+@@ -2367,15 +2367,21 @@ terminal_window_draw (GtkWidget *widget,
  {
    if (gtk_widget_get_app_paintable (widget))
      {
@@ -414,10 +414,10 @@ index fb64fa89b3cc..f1b1c7d1038d 100644
  
    return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
 -- 
-2.12.2
+2.14.1
 
 
-From 89d16875f224dccd798eee978b1bc17eef77b281 Mon Sep 17 00:00:00 2001
+From 94c0a0dd5420d19707e3b317989aca388335257a Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Mon, 27 Feb 2017 16:53:51 +0100
 Subject: [PATCH 04/14] screen: Silence -Wunused variable
@@ -428,10 +428,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943
  1 file changed, 1 deletion(-)
 
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 043a7ae9c4b2..dac1663a24ec 100644
+index c502bd1e6a67..c67de274f8a1 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -930,7 +930,6 @@ update_color_scheme (TerminalScreen *screen)
+@@ -934,7 +934,6 @@ update_color_scheme (TerminalScreen *screen)
    GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL;
    GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL;
    GtkStyleContext *context;
@@ -440,10 +440,10 @@ index 043a7ae9c4b2..dac1663a24ec 100644
    gboolean use_theme_colors;
  
 -- 
-2.12.2
+2.14.1
 
 
-From 09a9c926b7a278e76586dbb80329ed988bca7c79 Mon Sep 17 00:00:00 2001
+From 3febd96a694f747eb0375be157bd5ebdac342ae5 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Tue, 27 Jan 2015 18:40:13 +0100
 Subject: [PATCH 05/14] Support desktop notifications from OSC 777
@@ -514,7 +514,7 @@ index 6c783bc1df79..6a79e98183b3 100644
  
    app_load_css (application);
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index dac1663a24ec..2e4d1d6d669d 100644
+index c67de274f8a1..6c96227c2f20 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
 @@ -54,6 +54,7 @@
@@ -550,7 +550,7 @@ index dac1663a24ec..2e4d1d6d669d 100644
  
  static void terminal_screen_window_title_changed      (VteTerminal *vte_terminal,
                                                         TerminalScreen *screen);
-@@ -481,6 +488,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -485,6 +492,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
    object_class->get_property = terminal_screen_get_property;
    object_class->set_property = terminal_screen_set_property;
  
@@ -558,7 +558,7 @@ index dac1663a24ec..2e4d1d6d669d 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;
-@@ -489,6 +497,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -493,6 +501,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
    widget_class->hierarchy_changed = terminal_screen_hierarchy_changed;
  
    terminal_class->child_exited = terminal_screen_child_exited;
@@ -566,7 +566,7 @@ index dac1663a24ec..2e4d1d6d669d 100644
  
    signals[PROFILE_SET] =
      g_signal_new (I_("profile-set"),
-@@ -598,6 +607,10 @@ terminal_screen_dispose (GObject *object)
+@@ -602,6 +611,10 @@ terminal_screen_dispose (GObject *object)
    TerminalScreen *screen = TERMINAL_SCREEN (object);
    TerminalScreenPrivate *priv = screen->priv;
    GtkSettings *settings;
@@ -577,7 +577,7 @@ index dac1663a24ec..2e4d1d6d669d 100644
  
    settings = gtk_widget_get_settings (GTK_WIDGET (screen));
    g_signal_handlers_disconnect_matched (settings, G_SIGNAL_MATCH_DATA,
-@@ -1681,6 +1694,43 @@ terminal_screen_button_press (GtkWidget      *widget,
+@@ -1707,6 +1720,43 @@ terminal_screen_button_press (GtkWidget      *widget,
    return FALSE;
  }
  
@@ -621,10 +621,11 @@ index dac1663a24ec..2e4d1d6d669d 100644
  /**
   * terminal_screen_get_current_dir:
   * @screen:
-@@ -1782,6 +1832,64 @@ terminal_screen_child_exited (VteTerminal *terminal,
+@@ -1807,6 +1857,64 @@ terminal_screen_child_exited (VteTerminal *terminal,
+     }
  }
  
- static void
++static void
 +terminal_screen_notification_received (VteTerminal *terminal,
 +                                       const char  *summary,
 +                                       const char  *body)
@@ -682,10 +683,9 @@ index dac1663a24ec..2e4d1d6d669d 100644
 +    }
 +}
 +
-+static void
+ static void
  terminal_screen_drag_data_received (GtkWidget        *widget,
                                      GdkDragContext   *context,
-                                     gint              x,
 diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c
 index cdd73d0653be..d6909a13ca65 100644
 --- a/src/terminal-tab-label.c
@@ -718,10 +718,11 @@ index cdd73d0653be..d6909a13ca65 100644
    priv->label = label = gtk_label_new (NULL);
    gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
    gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
-@@ -377,6 +382,27 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label,
+@@ -376,6 +381,27 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label,
+     pango_attr_list_unref (attr_list);
  }
  
- /**
++/**
 + * terminal_tab_label_set_icon:
 + * @tab_label: a #TerminalTabLabel
 + * @icon_name: (allow-none): an icon name
@@ -742,10 +743,9 @@ index cdd73d0653be..d6909a13ca65 100644
 +  gtk_widget_set_tooltip_text (GTK_WIDGET (priv->icon), tooltip);
 +}
 +
-+/**
+ /**
   * terminal_tab_label_get_screen:
   * @tab_label: a #TerminalTabLabel
-  *
 diff --git a/src/terminal-tab-label.h b/src/terminal-tab-label.h
 index 20cfbceb36b0..a987025e0524 100644
 --- a/src/terminal-tab-label.h
@@ -762,10 +762,10 @@ index 20cfbceb36b0..a987025e0524 100644
  
  G_END_DECLS
 -- 
-2.12.2
+2.14.1
 
 
-From 587863f8c4960561427b84ad2b034a8c499d304e Mon Sep 17 00:00:00 2001
+From 0c8fc828475d7ff669803606893ee27156f1b146 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Thu, 29 Jan 2015 11:47:21 +0100
 Subject: [PATCH 06/14] Sprinkle debug messages for notifications
@@ -807,10 +807,10 @@ index 5dc3ca4f3df0..7499ebe06c88 100644
  
  void _terminal_debug_init(void);
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 2e4d1d6d669d..d0d2c93fbb1d 100644
+index 6c96227c2f20..897147903240 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -1702,6 +1702,8 @@ terminal_screen_focus_in (GtkWidget     *widget,
+@@ -1728,6 +1728,8 @@ terminal_screen_focus_in (GtkWidget     *widget,
    TerminalApp *app;
    TerminalWindow *window;
  
@@ -819,7 +819,7 @@ index 2e4d1d6d669d..d0d2c93fbb1d 100644
    window = terminal_screen_get_window (screen);
    if (window != NULL)
      {
-@@ -1840,6 +1842,8 @@ terminal_screen_notification_received (VteTerminal *terminal,
+@@ -1866,6 +1868,8 @@ terminal_screen_notification_received (VteTerminal *terminal,
    TerminalScreenPrivate *priv = screen->priv;
    TerminalWindow *window;
  
@@ -828,7 +828,7 @@ index 2e4d1d6d669d..d0d2c93fbb1d 100644
    if (G_UNLIKELY (!priv->shell_prompt_shown))
      {
        priv->shell_prompt_shown = TRUE;
-@@ -1871,6 +1875,7 @@ terminal_screen_notification_received (VteTerminal *terminal,
+@@ -1897,6 +1901,7 @@ terminal_screen_notification_received (VteTerminal *terminal,
            tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container));
            terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), TRUE);
            terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary);
@@ -836,7 +836,7 @@ index 2e4d1d6d669d..d0d2c93fbb1d 100644
          }
      }
    else
-@@ -1886,6 +1891,7 @@ terminal_screen_notification_received (VteTerminal *terminal,
+@@ -1912,6 +1917,7 @@ terminal_screen_notification_received (VteTerminal *terminal,
  
        app = terminal_app_get ();
        g_application_send_notification (G_APPLICATION (app), priv->uuid, notification);
@@ -845,10 +845,10 @@ index 2e4d1d6d669d..d0d2c93fbb1d 100644
  }
  
 -- 
-2.12.2
+2.14.1
 
 
-From e4b87b47ce9fe7693785997b807a6b06110e05ec Mon Sep 17 00:00:00 2001
+From bd5602708f7ad2cfaba5cb46a6e9496dfb7e57ab Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Tue, 17 May 2016 21:08:55 +0200
 Subject: [PATCH 07/14] Restore separate menuitems for opening tabs and windows
@@ -905,10 +905,11 @@ index 6acab386512b..5c5a1aed3560 100644
    <object class="GtkListStore" id="theme-variant-liststore">
      <columns>
        <!-- column-name label -->
-@@ -143,21 +125,6 @@
+@@ -142,21 +124,6 @@
+                         <property name="top_attach">0</property>
                        </packing>
                      </child>
-                     <child>
+-                    <child>
 -                      <object class="GtkLabel" id="label480">
 -                        <property name="visible">True</property>
 -                        <property name="can_focus">False</property>
@@ -923,10 +924,9 @@ index 6acab386512b..5c5a1aed3560 100644
 -                        <property name="top_attach">1</property>
 -                      </packing>
 -                    </child>
--                    <child>
+                     <child>
                        <object class="GtkComboBox" id="theme-variant-combobox">
                          <property name="visible">True</property>
-                         <property name="can_focus">False</property>
 @@ -177,26 +144,6 @@
                          <property name="top_attach">0</property>
                        </packing>
@@ -958,20 +958,20 @@ diff --git a/src/terminal-menus.ui b/src/terminal-menus.ui
 index e248590084d8..fa67540162d5 100644
 --- a/src/terminal-menus.ui
 +++ b/src/terminal-menus.ui
-@@ -19,13 +19,6 @@
+@@ -17,13 +17,6 @@
+ -->
+ <interface>
    <menu id="app-menu">
-     <section>
-       <item>
+-    <section>
+-      <item>
 -        <attribute name="label" translatable="yes">_New Terminal</attribute>
 -        <attribute name="action">win.new-terminal</attribute>
 -        <attribute name="target" type="(ss)">('default','default')</attribute>
 -      </item>
 -    </section>
--    <section>
--      <item>
+     <section>
+       <item>
          <attribute name="label" translatable="yes">_Preferences</attribute>
-         <attribute name="action">app.preferences</attribute>
-       </item>
 diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
 index cd7b0d94f18b..d88bf8885cf6 100644
 --- a/src/terminal-prefs.c
@@ -1019,7 +1019,7 @@ index e434075d86af..a4ba4a6fae66 100644
  #define TERMINAL_SETTING_SHELL_INTEGRATION_KEY          "shell-integration-enabled"
  #define TERMINAL_SETTING_TAB_POLICY_KEY                 "tab-policy"
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index f1b1c7d1038d..fbbc1e8916a8 100644
+index e5425d5b0aa7..6e029ffefd0e 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
 @@ -117,7 +117,8 @@ struct _TerminalWindowPrivate
@@ -1032,7 +1032,7 @@ index f1b1c7d1038d..fbbc1e8916a8 100644
  #define SET_ENCODING_UI_PATH              "/menubar/Terminal/TerminalSetEncoding/EncodingsPH"
  #define SET_ENCODING_ACTION_NAME_PREFIX   "TerminalSetEncoding"
  
-@@ -385,7 +386,6 @@ action_new_terminal_cb (GSimpleAction *action,
+@@ -387,7 +388,6 @@ action_new_terminal_cb (GSimpleAction *action,
    gs_free char *new_working_directory = NULL;
    const char *mode_str, *uuid_str;
    TerminalNewTerminalMode mode;
@@ -1040,7 +1040,7 @@ index f1b1c7d1038d..fbbc1e8916a8 100644
  
    g_assert (TERMINAL_IS_WINDOW (window));
  
-@@ -397,18 +397,8 @@ action_new_terminal_cb (GSimpleAction *action,
+@@ -399,18 +399,8 @@ action_new_terminal_cb (GSimpleAction *action,
      mode = TERMINAL_NEW_TERMINAL_MODE_TAB;
    else if (g_str_equal (mode_str, "window"))
      mode = TERMINAL_NEW_TERMINAL_MODE_WINDOW;
@@ -1061,7 +1061,7 @@ index f1b1c7d1038d..fbbc1e8916a8 100644
  
    profiles_list = terminal_app_get_profiles_list (app);
    if (g_str_equal (uuid_str, "current"))
-@@ -451,9 +441,9 @@ file_new_terminal_callback (GtkAction *action,
+@@ -453,9 +443,9 @@ file_new_terminal_callback (GtkAction *action,
      uuid = g_strdup ("current");
  
    name = gtk_action_get_name (action);
@@ -1073,7 +1073,7 @@ index f1b1c7d1038d..fbbc1e8916a8 100644
      param = g_variant_new ("(ss)", "window", uuid);
    else
      param = g_variant_new ("(ss)", "default", uuid);
-@@ -1485,8 +1475,6 @@ terminal_window_update_new_terminal_menus (TerminalWindow *window)
+@@ -1506,8 +1496,6 @@ terminal_window_update_new_terminal_menus (TerminalWindow *window)
    gtk_action_set_visible (action, have_single_profile);
    action = gtk_action_group_get_action (priv->action_group, "FileNewWindow");
    gtk_action_set_visible (action, have_single_profile);
@@ -1082,7 +1082,7 @@ index f1b1c7d1038d..fbbc1e8916a8 100644
  
    if (have_single_profile)
      {
-@@ -1508,7 +1496,19 @@ terminal_window_update_new_terminal_menus (TerminalWindow *window)
+@@ -1529,7 +1517,19 @@ terminal_window_update_new_terminal_menus (TerminalWindow *window)
        GSettings *profile = (GSettings *) p->data;
        char name[32];
  
@@ -1103,7 +1103,7 @@ index f1b1c7d1038d..fbbc1e8916a8 100644
        terminal_window_create_new_terminal_action (window,
                                                    profile,
                                                    name,
-@@ -1516,7 +1516,7 @@ terminal_window_update_new_terminal_menus (TerminalWindow *window)
+@@ -1537,7 +1537,7 @@ terminal_window_update_new_terminal_menus (TerminalWindow *window)
                                                    G_CALLBACK (file_new_terminal_callback));
  
        gtk_ui_manager_add_ui (priv->ui_manager, priv->new_terminal_ui_id,
@@ -1112,7 +1112,7 @@ index f1b1c7d1038d..fbbc1e8916a8 100644
                               name, name,
                               GTK_UI_MANAGER_MENUITEM, FALSE);
  
-@@ -2457,7 +2457,8 @@ terminal_window_init (TerminalWindow *window)
+@@ -2524,7 +2524,8 @@ terminal_window_init (TerminalWindow *window)
      {
        /* Toplevel */
        { "File", NULL, N_("_File") },
@@ -1122,7 +1122,7 @@ index f1b1c7d1038d..fbbc1e8916a8 100644
        { "Edit", NULL, N_("_Edit") },
        { "View", NULL, N_("_View") },
        { "Search", NULL, N_("_Search") },
-@@ -2475,9 +2476,6 @@ terminal_window_init (TerminalWindow *window)
+@@ -2542,9 +2543,6 @@ terminal_window_init (TerminalWindow *window)
        { "FileNewTab", STOCK_NEW_TAB, N_("Open Ta_b"), "<shift><control>T",
          NULL,
          G_CALLBACK (file_new_terminal_callback) },
@@ -1132,7 +1132,7 @@ index f1b1c7d1038d..fbbc1e8916a8 100644
        { "FileNewProfile", "document-open", N_("New _Profile"), "",
          NULL,
          G_CALLBACK (file_new_profile_callback) },
-@@ -2622,6 +2620,9 @@ terminal_window_init (TerminalWindow *window)
+@@ -2701,6 +2699,9 @@ terminal_window_init (TerminalWindow *window)
        { "PopupNewTerminal", NULL, N_("Open _Terminal"), NULL,
          NULL,
          G_CALLBACK (file_new_terminal_callback) },
@@ -1143,7 +1143,7 @@ index f1b1c7d1038d..fbbc1e8916a8 100644
          NULL,
          G_CALLBACK (popup_leave_fullscreen_callback) },
 diff --git a/src/terminal.xml b/src/terminal.xml
-index d830149a4738..242ebe13e240 100644
+index 95f556e829d9..a5fe7dc340c5 100644
 --- a/src/terminal.xml
 +++ b/src/terminal.xml
 @@ -1,8 +1,10 @@
@@ -1159,19 +1159,19 @@ index d830149a4738..242ebe13e240 100644
        <separator />
        <menuitem action="FileNewProfile" />
        <menuitem action="FileSaveContents" />
-@@ -87,6 +89,7 @@
+@@ -91,6 +93,7 @@
      <menuitem action="PopupNumberInfo" />
      <separator />
      <menuitem action="PopupNewTerminal" />
 +    <menuitem action="PopupNewTab" />
      <separator />
      <menuitem action="PopupCopy" />
-     <menuitem action="PopupPaste" />
+     <menuitem action="PopupCopyHTML" />
 -- 
-2.12.2
+2.14.1
 
 
-From 72847424c8e1c78c1522a08d24c7bf0ea03f166c Mon Sep 17 00:00:00 2001
+From c03b09fc7e7dbedbb3fa57ec82da48b754dd6af9 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Tue, 1 Nov 2016 13:10:01 +0100
 Subject: [PATCH 08/14] Revert "profile: Remove the "Command" sub-heading"
@@ -1454,10 +1454,10 @@ index e1cb3470d0ee..0c09bb08c202 100644
                      </child>
                    </object>
 -- 
-2.12.2
+2.14.1
 
 
-From 52f12c3b6ad1a2a61c2769cb93da603952606334 Mon Sep 17 00:00:00 2001
+From 041d149aba66771e182d0df2eea864a5261b6ea3 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/14] Revert "screen: Remove unused description and
@@ -1472,7 +1472,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110
  2 files changed, 69 insertions(+)
 
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index d0d2c93fbb1d..b5674d8001fb 100644
+index 897147903240..113dfe04be0d 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
 @@ -86,6 +86,7 @@ struct _TerminalScreenPrivate
@@ -1491,7 +1491,7 @@ index d0d2c93fbb1d..b5674d8001fb 100644
    PROP_INITIAL_ENVIRONMENT
  };
  
-@@ -442,6 +444,9 @@ terminal_screen_get_property (GObject *object,
+@@ -446,6 +448,9 @@ terminal_screen_get_property (GObject *object,
        case PROP_TITLE:
          g_value_set_string (value, terminal_screen_get_title (screen));
          break;
@@ -1501,7 +1501,7 @@ index d0d2c93fbb1d..b5674d8001fb 100644
        default:
          G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
          break;
-@@ -467,6 +472,7 @@ terminal_screen_set_property (GObject *object,
+@@ -471,6 +476,7 @@ terminal_screen_set_property (GObject *object,
        case PROP_ICON_TITLE:
        case PROP_ICON_TITLE_SET:
        case PROP_TITLE:
@@ -1509,7 +1509,7 @@ index d0d2c93fbb1d..b5674d8001fb 100644
          /* not writable */
        default:
          G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-@@ -568,6 +574,13 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -572,6 +578,13 @@ terminal_screen_class_init (TerminalScreenClass *klass)
                            NULL,
                            G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
  
@@ -1523,7 +1523,7 @@ index d0d2c93fbb1d..b5674d8001fb 100644
    g_object_class_install_property
      (object_class,
       PROP_INITIAL_ENVIRONMENT,
-@@ -642,6 +655,7 @@ terminal_screen_finalize (GObject *object)
+@@ -646,6 +659,7 @@ terminal_screen_finalize (GObject *object)
  
    terminal_screen_set_profile (screen, NULL);
  
@@ -1531,7 +1531,7 @@ index d0d2c93fbb1d..b5674d8001fb 100644
    g_free (priv->initial_working_directory);
    g_strfreev (priv->override_command);
    g_strfreev (priv->initial_env);
-@@ -784,6 +798,21 @@ terminal_screen_get_icon_title_set (TerminalScreen *screen)
+@@ -788,6 +802,21 @@ terminal_screen_get_icon_title_set (TerminalScreen *screen)
    return vte_terminal_get_icon_title (VTE_TERMINAL (screen)) != NULL;
  }
  
@@ -1553,7 +1553,7 @@ index d0d2c93fbb1d..b5674d8001fb 100644
  static void
  terminal_screen_profile_changed_cb (GSettings     *profile,
                                      const char    *prop_name,
-@@ -1092,6 +1121,7 @@ terminal_screen_set_profile (TerminalScreen *screen,
+@@ -1096,6 +1125,7 @@ terminal_screen_set_profile (TerminalScreen *screen,
      g_object_unref (old_profile);
  
    g_object_notify (G_OBJECT (screen), "profile");
@@ -1561,7 +1561,7 @@ index d0d2c93fbb1d..b5674d8001fb 100644
  }
  
  GSettings*
-@@ -1425,6 +1455,8 @@ spawn_result_cb (VteTerminal *terminal,
+@@ -1429,6 +1459,8 @@ spawn_result_cb (VteTerminal *terminal,
  
    priv->child_pid = pid;
  
@@ -1570,7 +1570,7 @@ index d0d2c93fbb1d..b5674d8001fb 100644
    if (error) {
      GtkWidget *info_bar;
  
-@@ -1733,6 +1765,35 @@ terminal_screen_focus_in (GtkWidget     *widget,
+@@ -1759,6 +1791,35 @@ terminal_screen_focus_in (GtkWidget     *widget,
    return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event);
  }
  
@@ -1606,7 +1606,7 @@ index d0d2c93fbb1d..b5674d8001fb 100644
  /**
   * terminal_screen_get_current_dir:
   * @screen:
-@@ -1790,6 +1851,8 @@ terminal_screen_child_exited (VteTerminal *terminal,
+@@ -1816,6 +1877,8 @@ terminal_screen_child_exited (VteTerminal *terminal,
  
    priv->child_pid = -1;
    
@@ -1616,7 +1616,7 @@ index d0d2c93fbb1d..b5674d8001fb 100644
    
    switch (action)
 diff --git a/src/terminal-screen.h b/src/terminal-screen.h
-index f3b4013d6157..133c2309e8a8 100644
+index 2e8f6dc650a4..f36f567a21e7 100644
 --- a/src/terminal-screen.h
 +++ b/src/terminal-screen.h
 @@ -103,9 +103,15 @@ void         terminal_screen_set_initial_environment (TerminalScreen  *screen,
@@ -1636,10 +1636,10 @@ index f3b4013d6157..133c2309e8a8 100644
  char *terminal_screen_get_current_dir (TerminalScreen *screen);
  
 -- 
-2.12.2
+2.14.1
 
 
-From f2277654e7872f187312907c866e50b8ed5fc8c5 Mon Sep 17 00:00:00 2001
+From 85e3a82c2603cbaf39a77aa1309c447be3030020 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/14] Revert "Remove the static title setting from profile
@@ -1679,7 +1679,7 @@ index 34401c75b0a4..6ac53badcb26 100644
                  settings, TERMINAL_PROFILE_ALLOW_BOLD_KEY,
                  FALSE);
 diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
-index 1b0121b8b85a..0a87c9f0c693 100644
+index c2b92f7bc806..2bd3e76ef0a9 100644
 --- a/src/org.gnome.Terminal.gschema.xml
 +++ b/src/org.gnome.Terminal.gschema.xml
 @@ -167,6 +167,11 @@
@@ -1712,10 +1712,11 @@ diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
 index 0c09bb08c202..fdae0ae245cf 100644
 --- a/src/profile-preferences.ui
 +++ b/src/profile-preferences.ui
-@@ -533,6 +533,92 @@
+@@ -532,6 +532,92 @@
+                 <property name="can_focus">False</property>
                  <property name="border_width">12</property>
                  <property name="spacing">18</property>
-                 <child>
++                <child>
 +                  <object class="GtkVBox" id="vbox79">
 +                    <property name="visible">True</property>
 +                    <property name="can_focus">False</property>
@@ -1801,10 +1802,9 @@ index 0c09bb08c202..fdae0ae245cf 100644
 +                    <property name="position">0</property>
 +                  </packing>
 +                </child>
-+                <child>
+                 <child>
                    <object class="GtkVBox" id="vbox80">
                      <property name="visible">True</property>
-                     <property name="can_focus">False</property>
 diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
 index a4ba4a6fae66..eb2aa7f8448e 100644
 --- a/src/terminal-schemas.h
@@ -1818,10 +1818,10 @@ index a4ba4a6fae66..eb2aa7f8448e 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 b5674d8001fb..ae03835a812a 100644
+index 113dfe04be0d..212ab218eb00 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -802,11 +802,14 @@ char *
+@@ -806,11 +806,14 @@ char *
  terminal_screen_get_description (TerminalScreen *screen)
  {
    TerminalScreenPrivate *priv = screen->priv;
@@ -1836,7 +1836,7 @@ index b5674d8001fb..ae03835a812a 100644
  
    return g_strdup_printf ("%s — %d",
                            title && title[0] ? title : _("Terminal"),
-@@ -856,6 +859,12 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -860,6 +863,12 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
        vte_terminal_set_cjk_ambiguous_width (vte_terminal, (int) width);
      }
  
@@ -1850,10 +1850,10 @@ index b5674d8001fb..ae03835a812a 100644
        (!prop_name ||
         prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) ||
 -- 
-2.12.2
+2.14.1
 
 
-From 6d1ee8b03a9ed32ba2c3463a505a58a33ea655f9 Mon Sep 17 00:00:00 2001
+From 4586a362138529a63ddbf466e1cc87da5232b6d3 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/14] Restore translations for setting a title and
@@ -1877,8 +1877,8 @@ Subject: [PATCH 11/14] Restore translations for setting a title and
  po/ca@valencia.po | 15 +++++++++++++++
  po/cs.po          | 15 +++++++++++++++
  po/cy.po          |  8 ++++----
- po/da.po          | 20 ++++++++++----------
- po/de.po          | 20 ++++++++++----------
+ po/da.po          | 14 ++++++++++++++
+ po/de.po          | 15 +++++++++++++++
  po/dz.po          |  8 ++++----
  po/el.po          | 19 +++++++++++--------
  po/en@shaw.po     |  8 ++++----
@@ -1898,7 +1898,7 @@ Subject: [PATCH 11/14] Restore translations for setting a title and
  po/he.po          | 20 ++++++++++----------
  po/hi.po          | 21 ++++++++++-----------
  po/hr.po          | 38 +++++++++-----------------------------
- po/hu.po          | 19 +++++++++++--------
+ po/hu.po          | 14 ++++++++++++++
  po/hy.po          |  8 ++++----
  po/id.po          | 15 +++++++++++++++
  po/it.po          | 15 +++++++++++++++
@@ -1914,14 +1914,14 @@ Subject: [PATCH 11/14] Restore translations for setting a title and
  po/mai.po         |  8 ++++----
  po/mg.po          | 12 ++++++------
  po/mk.po          |  8 ++++----
- po/ml.po          |  4 ++--
+ po/ml.po          |  3 +++
  po/mn.po          | 12 ++++++------
  po/mr.po          | 20 ++++++++++----------
  po/ms.po          | 12 ++++++------
  po/nb.po          | 15 +++++++++++++++
  po/nds.po         |  8 ++++----
  po/ne.po          | 16 ++++++++--------
- po/nl.po          | 19 +++++++++++--------
+ po/nl.po          | 15 +++++++++++++++
  po/nn.po          |  8 ++++----
  po/oc.po          | 16 ++++++++--------
  po/or.po          |  4 ++--
@@ -1929,7 +1929,7 @@ Subject: [PATCH 11/14] Restore translations for setting a title and
  po/ps.po          |  8 ++++----
  po/pt.po          | 20 ++++++++++----------
  po/pt_BR.po       | 19 +++++++++++--------
- po/ro.po          |  8 ++++----
+ po/ro.po          |  4 ++--
  po/ru.po          | 19 +++++++++++++++++++
  po/rw.po          |  3 +--
  po/si.po          | 12 ++++++------
@@ -1952,7 +1952,7 @@ Subject: [PATCH 11/14] Restore translations for setting a title and
  po/zh_CN.po       | 19 +++++++++++--------
  po/zh_HK.po       | 19 +++++++++++--------
  po/zh_TW.po       | 19 +++++++++++--------
- 92 files changed, 825 insertions(+), 516 deletions(-)
+ 92 files changed, 840 insertions(+), 476 deletions(-)
 
 diff --git a/po/am.po b/po/am.po
 index 3445d96da657..f28fc8bf8a2d 100644
@@ -2040,10 +2040,10 @@ index fcec2668aa11..53c7d2200c59 100644
  #~ msgid "Keyboard Shortcuts"
  #~ msgstr "Alcorces de teclau"
 diff --git a/po/ar.po b/po/ar.po
-index fa2b4b54ff13..0e78cd59896d 100644
+index 4de91d51e9a7..0954b5b6d5ba 100644
 --- a/po/ar.po
 +++ b/po/ar.po
-@@ -2313,11 +2313,11 @@ msgstr "أغ_لق النافذة"
+@@ -2354,11 +2354,11 @@ msgstr "أغ_لق النافذة"
  #~ msgid "Default size:"
  #~ msgstr "الحجم المبدئي:"
  
@@ -2059,7 +2059,7 @@ index fa2b4b54ff13..0e78cd59896d 100644
  
  #~ msgid "Title and Command"
  #~ msgstr "العنوان والأمر"
-@@ -2325,14 +2325,14 @@ msgstr "أغ_لق النافذة"
+@@ -2366,14 +2366,14 @@ msgstr "أغ_لق النافذة"
  #~ msgid "_Unlimited"
  #~ msgstr "_غير محدود"
  
@@ -2078,7 +2078,7 @@ index fa2b4b54ff13..0e78cd59896d 100644
  
  #~ msgid "_Next Tab"
  #~ msgstr "اللسان ال_تالي"
-@@ -3108,8 +3108,8 @@ msgstr "أغ_لق النافذة"
+@@ -3149,8 +3149,8 @@ msgstr "أغ_لق النافذة"
  #~ msgid "Background image _scrolls"
  #~ msgstr "صورة الخلفية ت_لتف"
  
@@ -2203,10 +2203,10 @@ index 586c1e4d827b..08fbdb7b78e7 100644
  #: ../src/terminal-window.c:986
  msgid "Set _Character Encoding"
 diff --git a/po/be.po b/po/be.po
-index d5ea39c55af4..16fdbb5e51d7 100644
+index ce07d47995ca..3c65f9090ef4 100644
 --- a/po/be.po
 +++ b/po/be.po
-@@ -2365,3 +2365,6 @@ msgstr "_Закрыць акно"
+@@ -2392,3 +2392,6 @@ msgstr "_Закрыць акно"
  
  #~ msgid "_Set Title…"
  #~ msgstr "Прызначыць _загаловак..."
@@ -2240,11 +2240,11 @@ index 82ef0664ae1e..27e9877f96e8 100644
  #: ../src/profile-preferences.glade.h:74
  msgid "_Update login records when command is launched"
 diff --git a/po/bg.po b/po/bg.po
-index f42c22c94678..b5e468464e5d 100644
+index 9a4f32e4b135..24157396f439 100644
 --- a/po/bg.po
 +++ b/po/bg.po
-@@ -2281,3 +2281,15 @@ msgstr ""
- #: ../src/terminal-window.c:3727
+@@ -2305,3 +2305,15 @@ msgstr ""
+ #: ../src/terminal-window.c:3953
  msgid "C_lose Window"
  msgstr "_Затваряне на този прозорец"
 +
@@ -2376,10 +2376,10 @@ index 49e710859ac9..7ab2207b63f3 100644
 +msgstr "_Postavi naslov..."
 \ No newline at end of file
 diff --git a/po/ca.po b/po/ca.po
-index 2c2c8cb2f031..321ed59f9657 100644
+index ad74fe9c0919..2541b0004651 100644
 --- a/po/ca.po
 +++ b/po/ca.po
-@@ -2326,3 +2326,18 @@ msgstr "Tanca la _finestra"
+@@ -2357,3 +2357,18 @@ msgstr "Tanca la _finestra"
  
  #~ msgid "Whether to use a dark theme variant"
  #~ msgstr "Si s'ha d'utilitzar la variant de tema fosc"
@@ -2422,11 +2422,11 @@ index 2dafab8ca90d..1d6e809234d0 100644
 +msgid "_Set Title…"
 +msgstr "_Estableix el títol…"
 diff --git a/po/cs.po b/po/cs.po
-index 32f9c41f64db..15711e69573d 100644
+index e910e1dadaa2..0cd66931b6c6 100644
 --- a/po/cs.po
 +++ b/po/cs.po
-@@ -2264,3 +2264,18 @@ msgstr ""
- #: ../src/terminal-window.c:3852
+@@ -2294,3 +2294,18 @@ msgstr ""
+ #: ../src/terminal-window.c:3953
  msgid "C_lose Window"
  msgstr "_Zavřít okno"
 +
@@ -2471,102 +2471,50 @@ 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 6b49e78a90c0..194a59bbe53a 100644
+index 9a85c9010d04..9f6724bbcba1 100644
 --- a/po/da.po
 +++ b/po/da.po
-@@ -2380,11 +2380,11 @@ msgstr "_Luk vindue"
- #~ msgid "Default size:"
- #~ msgstr "Standardstørrelse:"
+@@ -2311,3 +2311,17 @@ msgstr ""
+ msgid "C_lose Window"
+ msgstr "_Luk vindue"
  
--#~ msgid "Title"
--#~ msgstr "Titel"
 +msgid "Title"
 +msgstr "Titel"
- 
--#~ msgid "_Title:"
--#~ msgstr "_Titel:"
++
 +msgid "_Title:"
 +msgstr "_Titel:"
- 
- #~ msgid "Title and Command"
- #~ msgstr "Titel og kommando"
-@@ -2392,14 +2392,14 @@ msgstr "_Luk vindue"
- #~ msgid "_Unlimited"
- #~ msgstr "_Ubegrænset"
- 
--#~ msgid "Set Title"
--#~ msgstr "Sæt titel"
++
 +msgid "Set Title"
 +msgstr "Sæt titel"
- 
- #~ msgid "Current Locale"
- #~ msgstr "Aktuel region"
- 
--#~ msgid "_Set Title…"
--#~ msgstr "_Sæt titel …"
++
 +msgid "_Set Title…"
 +msgstr "_Sæt titel …"
- 
- #~ msgid "What to do with dynamic title"
- #~ msgstr "Hvad der skal gøres med dynamisk titel"
-@@ -3195,8 +3195,8 @@ msgstr "_Luk vindue"
- #~ msgid "_Solid color"
- #~ msgstr "_Ensfarvet"
- 
--#~ msgid "_Transparent background"
--#~ msgstr "_Gennemsigtig baggrund"
++
 +msgid "Transparent background"
 +msgstr "Gennemsigtig baggrund"
- 
- #~ msgid ""
- #~ "You already have a profile called “%s”. Do you want to create another "
 diff --git a/po/de.po b/po/de.po
-index 89e42f696fe0..8ada2d9c3a78 100644
+index caaf47e742a4..0bcfa738ebaf 100644
 --- a/po/de.po
 +++ b/po/de.po
-@@ -2440,23 +2440,23 @@ msgstr "Fenster _schließen"
- #~ msgid "Default size:"
- #~ msgstr "Vorgabegröße:"
- 
--#~ msgid "Title"
--#~ msgstr "Titel"
+@@ -2359,3 +2359,18 @@ msgstr ""
+ #: ../src/terminal-window.c:3953
+ msgid "C_lose Window"
+ msgstr "Fenster _schließen"
++
 +msgid "Title"
 +msgstr "Titel"
- 
--#~ msgid "_Title:"
--#~ msgstr "_Titel:"
++
 +msgid "_Title:"
 +msgstr "_Titel:"
- 
- #~ msgid "Title and Command"
- #~ msgstr "Titel und Befehl"
- 
--#~ msgid "Set Title"
--#~ msgstr "Titel festlegen"
++
 +msgid "Set Title"
 +msgstr "Titel festlegen"
- 
- #~ msgid "Current Locale"
- #~ msgstr "Momentan verwendete Standorteinstellungen"
- 
--#~ msgid "_Set Title…"
--#~ msgstr "T_itel festlegen …"
++
 +msgid "_Set Title…"
 +msgstr "T_itel festlegen …"
- 
- #~ msgid "_Next Tab"
- #~ msgstr "_Nächster Reiter"
-@@ -3275,8 +3275,8 @@ msgstr "Fenster _schließen"
- #~ msgid "Background image _scrolls"
- #~ msgstr "Hintergrundbild _folgt Bildlauf"
- 
--#~ msgid "_Transparent background"
--#~ msgstr "_Transparenter Hintergrund"
++
 +msgid "Transparent background"
 +msgstr "Transparenter Hintergrund"
- 
- #~ msgid "S_hade transparent or image background:"
- #~ msgstr "Transparenz und Bildhintergründe _abdunkeln:"
 diff --git a/po/dz.po b/po/dz.po
 index d97e6102b850..a768fe4adc54 100644
 --- a/po/dz.po
@@ -2796,10 +2744,10 @@ index 567c08dc1da8..c538c13fe771 100644
  #~ msgid "On the left side"
  #~ msgstr "Maldekstre"
 diff --git a/po/es.po b/po/es.po
-index 7c6c37019412..c705f01daed0 100644
+index 3473d714f657..ba60342ad521 100644
 --- a/po/es.po
 +++ b/po/es.po
-@@ -2492,23 +2492,23 @@ msgstr "_Cerrar ventana"
+@@ -2454,23 +2454,23 @@ msgstr "_Cerrar ventana"
  #~ msgid "Default size:"
  #~ msgstr "Tamaño predeterminado:"
  
@@ -2831,7 +2779,7 @@ index 7c6c37019412..c705f01daed0 100644
  
  #~ msgid "_Next Tab"
  #~ msgstr "Pestaña _siguiente"
-@@ -3373,8 +3373,8 @@ msgstr "_Cerrar ventana"
+@@ -3335,8 +3335,8 @@ msgstr "_Cerrar ventana"
  #~ msgid "_Solid color"
  #~ msgstr "Color _sólido"
  
@@ -2854,10 +2802,10 @@ index 4b1c2a7c67e4..770761168806 100644
 +msgid "Transparent background"
 +msgstr "Läbipaistev taust"
 diff --git a/po/eu.po b/po/eu.po
-index 6e81231d5ba9..97f9467cc115 100644
+index f3aab7879a6f..315bb804e46e 100644
 --- a/po/eu.po
 +++ b/po/eu.po
-@@ -2450,11 +2450,11 @@ msgstr "It_xi leihoa"
+@@ -2411,11 +2411,11 @@ msgstr "It_xi leihoa"
  #~ msgid "Default size:"
  #~ msgstr "Tamaina lehenetsia:"
  
@@ -2873,7 +2821,7 @@ index 6e81231d5ba9..97f9467cc115 100644
  
  #~ msgid "Title and Command"
  #~ msgstr "Titulua eta komandoa"
-@@ -2462,14 +2462,14 @@ msgstr "It_xi leihoa"
+@@ -2423,14 +2423,14 @@ msgstr "It_xi leihoa"
  #~ msgid "_Unlimited"
  #~ msgstr "_Mugagabea"
  
@@ -2892,7 +2840,7 @@ index 6e81231d5ba9..97f9467cc115 100644
  
  #~ msgid "What to do with dynamic title"
  #~ msgstr "Zer egin titulu dinamikoarekin"
-@@ -3250,8 +3250,8 @@ msgstr "It_xi leihoa"
+@@ -3211,8 +3211,8 @@ msgstr "It_xi leihoa"
  #~ msgid "_Solid color"
  #~ msgstr "_Kolore solidoa"
  
@@ -2952,10 +2900,10 @@ index cb551a1ecd07..bcc820444edd 100644
 +msgid "Transparent background"
 +msgstr "پس‌زمینه‌ی شفاف"
 diff --git a/po/fi.po b/po/fi.po
-index 63048bd8a459..841164d7ff38 100644
+index 58029541b6ca..83733eb6a49e 100644
 --- a/po/fi.po
 +++ b/po/fi.po
-@@ -2358,9 +2358,24 @@ msgstr "_Sulje ikkuna"
+@@ -2361,9 +2361,24 @@ msgstr "_Sulje ikkuna"
  #~ msgid "_Update login records when command is launched"
  #~ msgstr "_Päivitä kirjautumistallenne kun komento käynnistetään"
  
@@ -2981,10 +2929,10 @@ index 63048bd8a459..841164d7ff38 100644
 +msgid "_Set Title…"
 +msgstr "Aseta otsikko…"
 diff --git a/po/fr.po b/po/fr.po
-index 7ce85fc1830e..45fcbdeb72cb 100644
+index 4ccd9e2e8c0f..ee382ff30491 100644
 --- a/po/fr.po
 +++ b/po/fr.po
-@@ -2320,3 +2320,18 @@ msgstr "Fermer _la fenêtre"
+@@ -2355,3 +2355,18 @@ msgstr "Fermer _la fenêtre"
  
  #~ msgid "_Same as text color"
  #~ msgstr "_Même couleur que le texte"
@@ -3004,7 +2952,7 @@ index 7ce85fc1830e..45fcbdeb72cb 100644
 +msgid "_Set Title…"
 +msgstr "_Modifier le titre…"
 diff --git a/po/fur.po b/po/fur.po
-index 8401c5680d55..71eb6c36ed5f 100644
+index c1c912d4c0d9..6d2afe2b1778 100644
 --- a/po/fur.po
 +++ b/po/fur.po
 @@ -631,6 +631,10 @@ msgstr ""
@@ -3018,7 +2966,7 @@ index 8401c5680d55..71eb6c36ed5f 100644
  #: ../src/org.gnome.Terminal.gschema.xml.h:63
  msgid ""
  "Whether ambiguous-width characters are narrow or wide when using UTF-8 "
-@@ -3088,8 +3092,8 @@ msgstr "_Siere barcon"
+@@ -3118,8 +3122,8 @@ msgstr "_Siere barcon"
  #~ msgid "Close Tab"
  #~ msgstr "Siere schede"
  
@@ -3029,7 +2977,7 @@ index 8401c5680d55..71eb6c36ed5f 100644
  
  #~ msgid "Switch to Tab 2"
  #~ msgstr "Passe a la schede 2"
-@@ -3152,8 +3156,8 @@ msgstr "_Siere barcon"
+@@ -3182,8 +3186,8 @@ msgstr "_Siere barcon"
  #~ msgid "_Input Methods"
  #~ msgstr "_Cemût inserî test"
  
@@ -3040,7 +2988,7 @@ index 8401c5680d55..71eb6c36ed5f 100644
  
  #~ msgid ""
  #~ "text/plain dropped on terminal had wrong format (%d) or length (%d)\n"
-@@ -3218,8 +3222,8 @@ msgstr "_Siere barcon"
+@@ -3248,8 +3252,8 @@ msgstr "_Siere barcon"
  #~ msgid "Show Menu_bar"
  #~ msgstr "Mostre ba_re di menu"
  
@@ -3063,10 +3011,10 @@ index 93d5fa9d1481..feb87dce3d6b 100644
 +msgid "Transparent background"
 +msgstr "Cúlra trédhearcach"
 diff --git a/po/gl.po b/po/gl.po
-index 640d0a1cdb29..00a78d8dd547 100644
+index 73ef54467c9a..94c43eec2f23 100644
 --- a/po/gl.po
 +++ b/po/gl.po
-@@ -2393,23 +2393,23 @@ msgstr "P_echar a xanela"
+@@ -2428,23 +2428,23 @@ msgstr "P_echar a xanela"
  #~ msgid "Default size:"
  #~ msgstr "Tamaño predeterminado:"
  
@@ -3098,7 +3046,7 @@ index 640d0a1cdb29..00a78d8dd547 100644
  
  #~ msgid "_Next Tab"
  #~ msgstr "_Seguinte lapela"
-@@ -3256,8 +3256,8 @@ msgstr "P_echar a xanela"
+@@ -3291,8 +3291,8 @@ msgstr "P_echar a xanela"
  #~ msgid "Background image _scrolls"
  #~ msgstr "A imaxe de fondo _desprázase"
  
@@ -3276,10 +3224,10 @@ index 2d7dc5b14008..acbff9a1a2ad 100644
  #~ msgid "S/Key Challenge Response"
  #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया"
 diff --git a/po/hr.po b/po/hr.po
-index 9d3fe425fbde..93a51ca865e9 100644
+index 2643243f64ff..ca4487b7921c 100644
 --- a/po/hr.po
 +++ b/po/hr.po
-@@ -2263,35 +2263,15 @@ msgstr ""
+@@ -2293,35 +2293,15 @@ msgstr ""
  msgid "C_lose Window"
  msgstr "_Zatvori prozor"
  
@@ -3325,48 +3273,24 @@ index 9d3fe425fbde..93a51ca865e9 100644
 +msgid "_Set Title…"
 +msgstr "Postavi naslov"
 diff --git a/po/hu.po b/po/hu.po
-index a8956e0be645..ada3e12af699 100644
+index e188662c18f1..601599a74e60 100644
 --- a/po/hu.po
 +++ b/po/hu.po
-@@ -2384,11 +2384,11 @@ msgstr "_Ablak bezárása"
- #~ msgid "Default size:"
- #~ msgstr "Alapértelmezett méret:"
+@@ -2312,3 +2312,17 @@ msgstr ""
+ msgid "C_lose Window"
+ msgstr "_Ablak bezárása"
  
--#~ msgid "Title"
--#~ msgstr "Cím"
 +msgid "Title"
 +msgstr "Cím"
- 
--#~ msgid "_Title:"
--#~ msgstr "_Cím:"
++
 +msgid "_Title:"
 +msgstr "_Cím:"
- 
- #~ msgid "Title and Command"
- #~ msgstr "Cím és parancs"
-@@ -2396,14 +2396,14 @@ msgstr "_Ablak bezárása"
- #~ msgid "_Unlimited"
- #~ msgstr "_Végtelen"
- 
--#~ msgid "Set Title"
--#~ msgstr "Cím beállítása"
++
 +msgid "Set Title"
 +msgstr "Cím beállítása"
- 
- #~ msgid "Current Locale"
- #~ msgstr "Jelenlegi területi beállítás"
- 
--#~ msgid "_Set Title…"
--#~ msgstr "_Cím beállítása…"
++
 +msgid "_Set Title…"
 +msgstr "_Cím beállítása…"
- 
- #~ msgid "Always visible"
- #~ msgstr "Mindig látható"
-@@ -2708,3 +2708,6 @@ msgstr "_Ablak bezárása"
- 
- #~ msgid "Background image"
- #~ msgstr "Háttérkép"
 +
 +msgid "Transparent background"
 +msgstr "Áttetsző háttér"
@@ -3397,11 +3321,11 @@ 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 a7e0d866e539..c03b4751a782 100644
+index 28a794245edc..da8becc775e5 100644
 --- a/po/id.po
 +++ b/po/id.po
-@@ -2268,3 +2268,18 @@ msgstr ""
- #: ../src/terminal-window.c:3852
+@@ -2298,3 +2298,18 @@ msgstr ""
+ #: ../src/terminal-window.c:3953
  msgid "C_lose Window"
  msgstr "Tutup Jende_la"
 +
@@ -3420,11 +3344,11 @@ index a7e0d866e539..c03b4751a782 100644
 +msgid "_Set Title…"
 +msgstr "_Atur Judul…"
 diff --git a/po/it.po b/po/it.po
-index e0faef47298a..6b8d12538cb3 100644
+index 9b8b23c72d0c..1761b0901aab 100644
 --- a/po/it.po
 +++ b/po/it.po
-@@ -2374,3 +2374,18 @@ msgstr ""
- #: ../src/terminal-window.c:3852
+@@ -2337,3 +2337,18 @@ msgstr ""
+ #: ../src/terminal-window.c:3953
  msgid "C_lose Window"
  msgstr "Chiudi _finestra"
 +
@@ -3443,13 +3367,13 @@ index e0faef47298a..6b8d12538cb3 100644
 +msgid "_Set Title…"
 +msgstr "_Imposta titolo…"
 diff --git a/po/ja.po b/po/ja.po
-index b4f1fb99ee27..3e64b9d01077 100644
+index 9a18d3db624f..e46a373097df 100644
 --- a/po/ja.po
 +++ b/po/ja.po
-@@ -2406,3 +2406,18 @@ msgstr "ウィンドウを閉じる(_L)"
- 
- #~ msgid "_Update login records when command is launched"
- #~ msgstr "コマンドを実行した時にログイン記録を更新する(_U)"
+@@ -2096,3 +2096,18 @@ msgstr "この端末には未だ実行中のプロセスが存在しています
+ #: ../src/terminal-window.c:3953
+ msgid "C_lose Window"
+ msgstr "ウィンドウを閉じる(_L)"
 +
 +msgid "Transparent background"
 +msgstr "透過な画像にする"
@@ -3501,10 +3425,10 @@ index 2a0bc91fad40..f87c4496d591 100644
  #: ../src/terminal-window.c:988
  msgid "Set _Character Encoding"
 diff --git a/po/kk.po b/po/kk.po
-index b383a629a14d..6b3419987ebc 100644
+index 963a7ba1cebf..28afd931cb76 100644
 --- a/po/kk.po
 +++ b/po/kk.po
-@@ -2282,3 +2282,18 @@ msgstr "Терезені жа_бу"
+@@ -2312,3 +2312,18 @@ msgstr "Терезені жа_бу"
  
  #~ msgid "Be quiet"
  #~ msgstr "Тыныш болу"
@@ -3587,10 +3511,10 @@ index c887f88a2c87..3f3d7fe378b3 100644
 +msgid "Transparent background"
 +msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ"
 diff --git a/po/ko.po b/po/ko.po
-index 938cba133e13..3a36107793e7 100644
+index acf1b6f9168a..c218b251e077 100644
 --- a/po/ko.po
 +++ b/po/ko.po
-@@ -2320,3 +2320,18 @@ msgstr "창 닫기(_L)"
+@@ -2353,3 +2353,18 @@ msgstr "창 닫기(_L)"
  
  #~ msgid "Whether to use a dark theme variant"
  #~ msgstr "어두운 테마를 사용할 지 여부"
@@ -3636,10 +3560,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 e8362f8da02d..567fc6b0495d 100644
+index 26611467b341..3656efea8605 100644
 --- a/po/lt.po
 +++ b/po/lt.po
-@@ -2296,3 +2296,18 @@ msgstr "_Užverti langą"
+@@ -2331,3 +2331,18 @@ msgstr "_Užverti langą"
  
  #~ msgid "Whether to use a dark theme variant"
  #~ msgstr "Ar naudoti tamsų temos variantą"
@@ -3659,10 +3583,10 @@ index e8362f8da02d..567fc6b0495d 100644
 +msgid "_Set Title…"
 +msgstr "_Nustatyti pavadinimą…"
 diff --git a/po/lv.po b/po/lv.po
-index 51105b99fe5e..f3323e1361b4 100644
+index 46a3ae1442cd..3fa397f1b918 100644
 --- a/po/lv.po
 +++ b/po/lv.po
-@@ -2320,3 +2320,21 @@ msgstr ""
+@@ -2283,3 +2283,21 @@ msgstr ""
  msgid "C_lose Window"
  msgstr "Aizvērt _logu"
  
@@ -3774,20 +3698,16 @@ index 4fe43192fe57..a5a874b49c59 100644
  #: ../src/profile-preferences.glade.h:78
  #| msgid "_Text color:"
 diff --git a/po/ml.po b/po/ml.po
-index cc1928dcda63..62abd2131499 100644
+index a23f4cc4f1ae..49caa9efe94f 100644
 --- a/po/ml.po
 +++ b/po/ml.po
-@@ -2751,8 +2751,8 @@ msgstr "ടെര്‍മിനല്‍ അ_ടയ്ക്കുക"
- #~ msgid "_Solid color"
- #~ msgstr "_സോളിഡ് നിറം"
+@@ -2461,3 +2461,6 @@ msgstr "ജാലകം അടയ്ക്കുക (_l)"
  
--#~ msgid "_Transparent background"
--#~ msgstr "_പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം"
+ #~ msgid "_Unlimited"
+ #~ msgstr "പരിധിയില്ല (_U)"
++
 +msgid "Transparent background"
 +msgstr "പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം"
- 
- #~ msgid "S/Key Challenge Response"
- #~ msgstr "S/Key ചാലഞ്ച് മറുപടി"
 diff --git a/po/mn.po b/po/mn.po
 index 2f9d86072d1c..e67c1792bad5 100644
 --- a/po/mn.po
@@ -4019,48 +3939,25 @@ index 4fe16cc88a9a..2a033b8c17d4 100644
  #~ msgid "_Next Tab"
  #~ msgstr "पछिल्लो ट्याब"
 diff --git a/po/nl.po b/po/nl.po
-index a51720be1610..0b6f3d7786ed 100644
+index 62d0aa881c79..cef17b409dfb 100644
 --- a/po/nl.po
 +++ b/po/nl.po
-@@ -2218,11 +2218,11 @@ msgstr "Venster sl_uiten"
- #~ msgid "Default size:"
- #~ msgstr "Standaardgrootte:"
- 
--#~ msgid "Title"
--#~ msgstr "Titel"
+@@ -2345,3 +2345,18 @@ msgstr ""
+ #: ../src/terminal-window.c:3953
+ msgid "C_lose Window"
+ msgstr "Venster sl_uiten"
++
 +msgid "Title"
 +msgstr "Titel"
- 
--#~ msgid "_Title:"
--#~ msgstr "_Titel:"
++
 +msgid "_Title:"
 +msgstr "_Titel:"
- 
- #~ msgid "Title and Command"
- #~ msgstr "Titel en opdracht"
-@@ -2230,14 +2230,14 @@ msgstr "Venster sl_uiten"
- #~ msgid "_Unlimited"
- #~ msgstr "_Onbeperkt"
- 
--#~ msgid "Set Title"
--#~ msgstr "Titel instellen"
++
 +msgid "Set Title"
 +msgstr "Titel instellen"
- 
- #~ msgid "Current Locale"
- #~ msgstr "Huidige locale"
- 
--#~ msgid "_Set Title…"
--#~ msgstr "Titel _instellen…"
++
 +msgid "_Set Title…"
 +msgstr "Titel _instellen…"
- 
- #~ msgid "_About Terminal"
- #~ msgstr "_Info over Terminal"
-@@ -2352,3 +2352,6 @@ msgstr "Venster sl_uiten"
- 
- #~ msgid "Switch to Tab 12"
- #~ msgstr "Ga naar tab 12"
 +
 +msgid "Transparent background"
 +msgstr "Transparante achtergrond"
@@ -4294,10 +4191,10 @@ index 5181419ad973..40eb8227f333 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 b392e36849dd..d5af07610a1e 100644
+index 3f24385e86b6..cb449b221df8 100644
 --- a/po/pt_BR.po
 +++ b/po/pt_BR.po
-@@ -2401,23 +2401,23 @@ msgstr "_Fechar janela"
+@@ -2437,23 +2437,23 @@ msgstr "_Fechar janela"
  #~ msgid "Default size:"
  #~ msgstr "Tamanho padrão:"
  
@@ -4329,7 +4226,7 @@ index b392e36849dd..d5af07610a1e 100644
  
  #~ msgid "_Next Tab"
  #~ msgstr "Pró_xima aba"
-@@ -3070,3 +3070,6 @@ msgstr "_Fechar janela"
+@@ -3106,3 +3106,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\""
@@ -4337,31 +4234,20 @@ index b392e36849dd..d5af07610a1e 100644
 +msgid "Transparent background"
 +msgstr "Fundo transparente"
 diff --git a/po/ro.po b/po/ro.po
-index 179dd77fd166..cf1b9986c923 100644
+index 23d40cf63e30..9386940431dd 100644
 --- a/po/ro.po
 +++ b/po/ro.po
-@@ -1282,8 +1282,8 @@ msgid "_Base on:"
- msgstr "_Bazat pe:"
+@@ -3176,8 +3176,8 @@ msgstr "Î_nchide fereastra"
+ #~ msgid "_Solid color"
+ #~ msgstr "Culoare _solidă"
  
- #: ../src/profile-preferences.glade.h:1
--msgid "<b>Command</b>"
--msgstr "<b>Comandă</b>"
-+msgid "Command"
-+msgstr "Comandă"
- 
- #: ../src/profile-preferences.glade.h:2
- msgid "<b>Foreground, Background, Bold and Underline</b>"
-@@ -1576,8 +1576,8 @@ msgid "_Text color:"
- msgstr "Culoare _text:"
- 
- #: ../src/profile-preferences.glade.h:77
--msgid "_Transparent background"
--msgstr "Fundal _transparent"
+-#~ msgid "_Transparent background"
+-#~ msgstr "Fundal _transparent"
 +msgid "Transparent background"
 +msgstr "Fundal transparent"
  
- #: ../src/profile-preferences.glade.h:78
- msgid "_Underline color:"
+ #~ msgid "_Unlimited"
+ #~ msgstr "_Neliminat"
 diff --git a/po/ru.po b/po/ru.po
 index 84c4e76ed0bf..e8e53a7c88af 100644
 --- a/po/ru.po
@@ -4448,10 +4334,10 @@ index adca7d5acba9..adeea9e95544 100644
  #: ../src/terminal-window.c:1025
  msgid "Set _Character Encoding"
 diff --git a/po/sk.po b/po/sk.po
-index e56c5ddc6b1e..57fa93b2a288 100644
+index 98bba7bcd28a..fbf190d1b778 100644
 --- a/po/sk.po
 +++ b/po/sk.po
-@@ -2600,3 +2600,18 @@ msgstr "_Zavrieť okno"
+@@ -2631,3 +2631,18 @@ msgstr "_Zavrieť okno"
  #~ "\n"
  #~ "Viac informácii o jednotlivých príkazoch získate pomocou „%s PRÍKAZ --"
  #~ "help“.\n"
@@ -4471,10 +4357,10 @@ index e56c5ddc6b1e..57fa93b2a288 100644
 +msgid "_Set Title…"
 +msgstr "_Nastaviť titulok…"
 diff --git a/po/sl.po b/po/sl.po
-index 754abb4ba4a2..015fc467de78 100644
+index 2302966b5585..7a08ee9c7e87 100644
 --- a/po/sl.po
 +++ b/po/sl.po
-@@ -2364,23 +2364,23 @@ msgstr "_Zapri okno"
+@@ -2428,23 +2428,23 @@ msgstr "_Zapri okno"
  #~ msgid "Default size:"
  #~ msgstr "Privzeta velikost:"
  
@@ -4506,7 +4392,7 @@ index 754abb4ba4a2..015fc467de78 100644
  
  #~ msgid "_Next Tab"
  #~ msgstr "_Naslednji zavihek"
-@@ -2525,3 +2525,6 @@ msgstr "_Zapri okno"
+@@ -2589,3 +2589,6 @@ msgstr "_Zapri okno"
  
  #~ msgid "_Profile Preferences…"
  #~ msgstr "Možnosti _profila ..."
@@ -4540,10 +4426,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 58f21ac8c7d8..05cee5fd05b3 100644
+index 756e6d2e8cd8..2af31d40b11d 100644
 --- a/po/sr.po
 +++ b/po/sr.po
-@@ -2307,10 +2307,9 @@ msgstr "_Затвори прозор"
+@@ -2341,10 +2341,9 @@ msgstr "_Затвори прозор"
  #~ msgid "GNOME Terminal Client"
  #~ msgstr "Клијент Гномовог терминала"
  
@@ -4557,7 +4443,7 @@ index 58f21ac8c7d8..05cee5fd05b3 100644
  
  #~ msgid "Title for terminal"
  #~ msgstr "Наслов за терминал"
-@@ -2356,11 +2355,11 @@ msgstr "_Затвори прозор"
+@@ -2390,11 +2389,11 @@ msgstr "_Затвори прозор"
  #~ msgid "Default size:"
  #~ msgstr "Основна величина:"
  
@@ -4573,7 +4459,7 @@ index 58f21ac8c7d8..05cee5fd05b3 100644
  
  #~ msgid "Title and Command"
  #~ msgstr "Наслов и наредба"
-@@ -2368,14 +2367,14 @@ msgstr "_Затвори прозор"
+@@ -2402,14 +2401,14 @@ msgstr "_Затвори прозор"
  #~ msgid "_Unlimited"
  #~ msgstr "_Неограничено"
  
@@ -4592,7 +4478,7 @@ index 58f21ac8c7d8..05cee5fd05b3 100644
  
  #~ msgid "Always visible"
  #~ msgstr "Увек видљив"
-@@ -2397,3 +2396,6 @@ msgstr "_Затвори прозор"
+@@ -2431,3 +2430,6 @@ msgstr "_Затвори прозор"
  
  #~ msgid "Close Window"
  #~ msgstr "Затвори прозор"
@@ -4600,10 +4486,10 @@ index 58f21ac8c7d8..05cee5fd05b3 100644
 +msgid "Transparent background"
 +msgstr "Провидна позадина"
 diff --git a/po/sr@latin.po b/po/sr@latin.po
-index f1416e3ddc02..c797affb900e 100644
+index df24091cce1b..8bad95380588 100644
 --- a/po/sr@latin.po
 +++ b/po/sr@latin.po
-@@ -2378,10 +2378,9 @@ msgstr "_Zatvori prozor"
+@@ -2341,10 +2341,9 @@ msgstr "_Zatvori prozor"
  #~ msgid "GNOME Terminal Client"
  #~ msgstr "Klijent Gnomovog terminala"
  
@@ -4617,7 +4503,7 @@ index f1416e3ddc02..c797affb900e 100644
  
  #~ msgid "Title for terminal"
  #~ msgstr "Naslov za terminal"
-@@ -2427,11 +2426,11 @@ msgstr "_Zatvori prozor"
+@@ -2390,11 +2389,11 @@ msgstr "_Zatvori prozor"
  #~ msgid "Default size:"
  #~ msgstr "Osnovna veličina:"
  
@@ -4633,7 +4519,7 @@ index f1416e3ddc02..c797affb900e 100644
  
  #~ msgid "Title and Command"
  #~ msgstr "Naslov i naredba"
-@@ -2439,14 +2438,14 @@ msgstr "_Zatvori prozor"
+@@ -2402,14 +2401,14 @@ msgstr "_Zatvori prozor"
  #~ msgid "_Unlimited"
  #~ msgstr "_Neograničeno"
  
@@ -4652,7 +4538,7 @@ index f1416e3ddc02..c797affb900e 100644
  
  #~ msgid "Always visible"
  #~ msgstr "Uvek vidljiv"
-@@ -2468,3 +2467,6 @@ msgstr "_Zatvori prozor"
+@@ -2431,3 +2430,6 @@ msgstr "_Zatvori prozor"
  
  #~ msgid "Close Window"
  #~ msgstr "Zatvori prozor"
@@ -4660,10 +4546,10 @@ index f1416e3ddc02..c797affb900e 100644
 +msgid "Transparent background"
 +msgstr "Providna pozadina"
 diff --git a/po/sv.po b/po/sv.po
-index 58ed1c8a9ffb..ebbd2d297151 100644
+index 3a67d6247216..2ab280b3a11c 100644
 --- a/po/sv.po
 +++ b/po/sv.po
-@@ -2307,5 +2307,17 @@ msgstr "Stän_g fönster"
+@@ -2337,5 +2337,17 @@ msgstr "Stän_g fönster"
  #~ msgid "Unknown completion request for \"%s\""
  #~ msgstr "Okänd kompletteringsbegäran för \"%s\""
  
@@ -4896,10 +4782,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 85a5c59ed059..1bee2df4d2de 100644
+index 472e7624eeb2..f8107707a5ba 100644
 --- a/po/tr.po
 +++ b/po/tr.po
-@@ -2307,3 +2307,15 @@ msgstr "_Pencereyi Kapat"
+@@ -2300,3 +2300,15 @@ msgstr "_Pencereyi Kapat"
  
  #~ msgid "_Same as text color"
  #~ msgstr "_Metin rengiyle aynı"
@@ -4981,10 +4867,10 @@ index a08f25914d12..a4fbcbe6e474 100644
  #~ msgid "Switch to Tab 2"
  #~ msgstr "До вкладки 2"
 diff --git a/po/vi.po b/po/vi.po
-index a5bc6ffcc17b..67625e6166d0 100644
+index 98bb18d02e33..253ea1dbaf3f 100644
 --- a/po/vi.po
 +++ b/po/vi.po
-@@ -2408,8 +2408,8 @@ msgstr "Đón_g cửa sổ"
+@@ -2438,8 +2438,8 @@ msgstr "Đón_g cửa sổ"
  #~ msgid "Default size:"
  #~ msgstr "Cỡ mặc định:"
  
@@ -4995,7 +4881,7 @@ index a5bc6ffcc17b..67625e6166d0 100644
  
  #~ msgid "When terminal commands set their o_wn titles:"
  #~ msgstr "Khi câu lệnh thiết bị cuối tự đặt tựa đề _mình:"
-@@ -2429,8 +2429,8 @@ msgstr "Đón_g cửa sổ"
+@@ -2459,8 +2459,8 @@ msgstr "Đón_g cửa sổ"
  #~ msgid "Close Window"
  #~ msgstr "Đóng cửa sổ"
  
@@ -5006,7 +4892,7 @@ index a5bc6ffcc17b..67625e6166d0 100644
  
  #~ msgid "Switch to Tab 2"
  #~ msgstr "Chuyển sang Thanh 2"
-@@ -2477,8 +2477,8 @@ msgstr "Đón_g cửa sổ"
+@@ -2507,8 +2507,8 @@ msgstr "Đón_g cửa sổ"
  #~ msgid "_Close Window"
  #~ msgstr "Đón_g cửa sổ"
  
@@ -5017,7 +4903,7 @@ index a5bc6ffcc17b..67625e6166d0 100644
  
  #~ msgid "_Next Tab"
  #~ msgstr "Thanh _sau"
-@@ -2489,8 +2489,8 @@ msgstr "Đón_g cửa sổ"
+@@ -2519,8 +2519,8 @@ msgstr "Đón_g cửa sổ"
  #~ msgid "_Input Methods"
  #~ msgstr "K_iểu gõ"
  
@@ -5028,7 +4914,7 @@ index a5bc6ffcc17b..67625e6166d0 100644
  
  #~ msgid "Disable connection to session manager"
  #~ msgstr "Tắt kết nối đến trình quản lý phiên làm việc"
-@@ -2875,3 +2875,6 @@ msgstr "Đón_g cửa sổ"
+@@ -2905,3 +2905,6 @@ msgstr "Đón_g cửa sổ"
  #~ "Phím tắt để đặt lại thiết bị cuối. Dùng dạng chuỗi có cùng một khuôn dạng "
  #~ "với tập tin tài nguyên GTK+. Nếu bạn đặt tùy chọn là chuỗi “disabled” (bị "
  #~ "tắt), nghĩa là không có phím tắt cho hành động này."
@@ -5196,10 +5082,10 @@ index 61153529f0c7..3b269ea13a71 100644
 +msgid "Transparent background"
 +msgstr "透明背景"
 diff --git a/po/zh_TW.po b/po/zh_TW.po
-index fb3fda0be7d6..bb73a0c743a9 100644
+index f5e3110135c3..f9d7c6449a3e 100644
 --- a/po/zh_TW.po
 +++ b/po/zh_TW.po
-@@ -2310,23 +2310,23 @@ msgstr "關閉視窗(_L)"
+@@ -2340,23 +2340,23 @@ msgstr "關閉視窗(_L)"
  #~ msgid "Default size:"
  #~ msgstr "預設大小："
  
@@ -5231,7 +5117,7 @@ index fb3fda0be7d6..bb73a0c743a9 100644
  
  #~ msgid "_Next Tab"
  #~ msgstr "下一個分頁(_N)"
-@@ -2571,3 +2571,6 @@ msgstr "關閉視窗(_L)"
+@@ -2601,3 +2601,6 @@ msgstr "關閉視窗(_L)"
  
  #~ msgid "Show session management options"
  #~ msgstr "顯示作業階段管理選項"
@@ -5239,10 +5125,10 @@ index fb3fda0be7d6..bb73a0c743a9 100644
 +msgid "Transparent background"
 +msgstr "透明背景"
 -- 
-2.12.2
+2.14.1
 
 
-From a20e4c331eca4f4b6445aeeebdc2548c415941ea Mon Sep 17 00:00:00 2001
+From f8f02e8daea036824de0788195977359fe4a75ef 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/14] Restore the action and shortcut to set a static title
@@ -5273,10 +5159,10 @@ index 6ac53badcb26..6b270284dc72 100644
      { "reset_and_clear",  "reset-and-clear"    },
      { "prev_tab",         "prev-tab"           },
 diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
-index 0a87c9f0c693..6a77a822e637 100644
+index 2bd3e76ef0a9..5ca62f389274 100644
 --- a/src/org.gnome.Terminal.gschema.xml
 +++ b/src/org.gnome.Terminal.gschema.xml
-@@ -446,6 +446,10 @@
+@@ -450,6 +450,10 @@
        <default>'disabled'</default>
        <summary>Keyboard shortcut to toggle the read-only state</summary>
      </key>
@@ -5288,10 +5174,10 @@ index 0a87c9f0c693..6a77a822e637 100644
        <default>'disabled'</default>
        <summary>Keyboard shortcut to reset the terminal</summary>
 diff --git a/src/terminal-accels.c b/src/terminal-accels.c
-index 3bf8f4b8e3ed..89c73d4783ac 100644
+index 3adbfc7c0cd0..09e27716820e 100644
 --- a/src/terminal-accels.c
 +++ b/src/terminal-accels.c
-@@ -74,6 +74,7 @@
+@@ -75,6 +75,7 @@
  #define KEY_RESET               "reset"
  #define KEY_SAVE_CONTENTS       "save-contents"
  #define KEY_SELECT_ALL          "select-all"
@@ -5299,7 +5185,7 @@ index 3bf8f4b8e3ed..89c73d4783ac 100644
  #define KEY_TOGGLE_MENUBAR      "toggle-menubar"
  #define KEY_ZOOM_IN             "zoom-in"
  #define KEY_ZOOM_NORMAL         "zoom-normal"
-@@ -107,6 +108,7 @@
+@@ -109,6 +110,7 @@
  #define ACCEL_PATH_KEY_RESET_AND_CLEAR      ACCEL_PATH_ROOT "TerminalResetClear"
  #define ACCEL_PATH_KEY_SAVE_CONTENTS        ACCEL_PATH_ROOT "FileSaveContents"
  #define ACCEL_PATH_KEY_SELECT_ALL           ACCEL_PATH_ROOT "EditSelectAll"
@@ -5307,7 +5193,7 @@ index 3bf8f4b8e3ed..89c73d4783ac 100644
  #define ACCEL_PATH_KEY_TOGGLE_MENUBAR       ACCEL_PATH_ROOT "ViewMenubar"
  #define ACCEL_PATH_KEY_ZOOM_IN              ACCEL_PATH_ROOT "ViewZoomIn"
  #define ACCEL_PATH_KEY_ZOOM_NORMAL          ACCEL_PATH_ROOT "ViewZoom100"
-@@ -190,6 +192,7 @@ static KeyEntry terminal_entries[] = {
+@@ -193,6 +195,7 @@ static KeyEntry terminal_entries[] = {
    ENTRY (N_("Read-Only"),       KEY_READ_ONLY,          "read-only", NULL, NULL   ),
    ENTRY (N_("Reset"),           KEY_RESET,              "reset",     "b",  "false"),
    ENTRY (N_("Reset and Clear"), KEY_RESET_AND_CLEAR,    "reset",     "b",  "true" ),
@@ -5316,10 +5202,10 @@ index 3bf8f4b8e3ed..89c73d4783ac 100644
  
  static KeyEntry tabs_entries[] = {
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index fbbc1e8916a8..c8d9123d88ed 100644
+index 6e029ffefd0e..479fdf65195d 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -206,6 +206,8 @@ static void view_zoom_out_callback            (GtkAction *action,
+@@ -208,6 +208,8 @@ static void view_zoom_out_callback            (GtkAction *action,
                                                 TerminalWindow *window);
  static void view_zoom_normal_callback         (GtkAction *action,
                                                 TerminalWindow *window);
@@ -5328,10 +5214,11 @@ index fbbc1e8916a8..c8d9123d88ed 100644
  static void terminal_add_encoding_callback    (GtkAction *action,
                                                 TerminalWindow *window);
  static void terminal_reset_callback           (GtkAction *action,
-@@ -734,6 +736,88 @@ action_move_tab_cb (GSimpleAction *action,
+@@ -754,6 +756,88 @@ action_move_tab_cb (GSimpleAction *action,
+                                          value);
  }
  
- static void
++static void
 +terminal_set_title_dialog_response_cb (GtkWidget *dialog,
 +                                       int response,
 +                                       TerminalScreen *screen)
@@ -5413,11 +5300,10 @@ index fbbc1e8916a8..c8d9123d88ed 100644
 +                     NULL);
 +}
 +
-+static void
+ static void
  action_zoom_cb (GSimpleAction *action,
                  GVariant *parameter,
-                 gpointer user_data)
-@@ -2441,6 +2525,7 @@ terminal_window_init (TerminalWindow *window)
+@@ -2508,6 +2592,7 @@ terminal_window_init (TerminalWindow *window)
      { "reset",               action_reset_cb,          "b",    NULL, NULL },
      { "switch-tab",          action_switch_tab_cb,     "i",    NULL, NULL },
      { "move-tab",            action_move_tab_cb,       "i",    NULL, NULL },
@@ -5425,7 +5311,7 @@ index fbbc1e8916a8..c8d9123d88ed 100644
      { "zoom",                action_zoom_cb,           "i",    NULL, NULL },
      { "detach-tab",          action_detach_tab_cb,     NULL,   NULL, NULL },
      { "find",                action_find_cb,           "s",    NULL, NULL },
-@@ -2544,6 +2629,9 @@ terminal_window_init (TerminalWindow *window)
+@@ -2614,6 +2699,9 @@ terminal_window_init (TerminalWindow *window)
  
        /* Terminal menu */
        { "TerminalProfiles", NULL, N_("Change _Profile") },
@@ -5436,10 +5322,10 @@ index fbbc1e8916a8..c8d9123d88ed 100644
        { "TerminalReset", NULL, N_("_Reset"), NULL,
          NULL,
 diff --git a/src/terminal.xml b/src/terminal.xml
-index 242ebe13e240..d56b82f0301d 100644
+index a5fe7dc340c5..0b383d000330 100644
 --- a/src/terminal.xml
 +++ b/src/terminal.xml
-@@ -48,6 +48,7 @@
+@@ -49,6 +49,7 @@
      </menu>
      <menu action="Terminal">
        <menu action="TerminalProfiles" />
@@ -5447,7 +5333,7 @@ index 242ebe13e240..d56b82f0301d 100644
        <menu action="TerminalSetEncoding" >
          <placeholder name="EncodingsPH" />
          <separator />
-@@ -111,6 +112,7 @@
+@@ -116,6 +117,7 @@
      <menuitem action="TabsMoveRight"/>
      <separator />
      <menuitem action="TabsDetach"/>
@@ -5456,10 +5342,10 @@ index 242ebe13e240..d56b82f0301d 100644
      <menuitem action="FileCloseTab"/>
    </popup>
 -- 
-2.12.2
+2.14.1
 
 
-From a294e2425db1ef74f756f9ad37299a6882df59c9 Mon Sep 17 00:00:00 2001
+From 8792ce5d075ddee775a6fb8544aeb090e198be68 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/14] screen: Style fix
@@ -5473,10 +5359,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 ae03835a812a..5a4c100b629c 100644
+index 212ab218eb00..8889033e8f40 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -707,7 +707,7 @@ terminal_screen_new (GSettings       *profile,
+@@ -711,7 +711,7 @@ terminal_screen_new (GSettings       *profile,
    /* If given an initial title, strip it of control characters and
     * feed it to the terminal.
     */
@@ -5486,10 +5372,10 @@ index ae03835a812a..5a4c100b629c 100644
      const char *p;
  
 -- 
-2.12.2
+2.14.1
 
 
-From feab011056f8495944ee700472dd97eeea5afc89 Mon Sep 17 00:00:00 2001
+From 684b5836d103d8ff801557754c133a64c73f988f 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/14] Restore the rest of the title handling options and make
@@ -5534,7 +5420,7 @@ index 6b270284dc72..1bd03ae9dcbf 100644
                    settings, TERMINAL_PROFILE_TITLE_KEY);
    migrate_bool (client, path, KEY_ALLOW_BOLD,
 diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
-index 6a77a822e637..521d402a1b54 100644
+index 5ca62f389274..c01a77cb40d9 100644
 --- a/src/org.gnome.Terminal.gschema.xml
 +++ b/src/org.gnome.Terminal.gschema.xml
 @@ -24,6 +24,13 @@
@@ -5652,10 +5538,11 @@ diff --git a/src/terminal-enums.h b/src/terminal-enums.h
 index bdd354e38360..731dcf2aaebc 100644
 --- a/src/terminal-enums.h
 +++ b/src/terminal-enums.h
-@@ -31,6 +31,14 @@ typedef enum {
+@@ -30,6 +30,14 @@ typedef enum {
+ } TerminalNewTerminalMode;
  
  typedef enum
- {
++{
 +  TERMINAL_TITLE_REPLACE,
 +  TERMINAL_TITLE_BEFORE,
 +  TERMINAL_TITLE_AFTER,
@@ -5663,10 +5550,9 @@ index bdd354e38360..731dcf2aaebc 100644
 +} TerminalTitleMode;
 +
 +typedef enum 
-+{
+ {
    TERMINAL_EXIT_CLOSE,
    TERMINAL_EXIT_RESTART,
-   TERMINAL_EXIT_HOLD
 diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
 index eb2aa7f8448e..a6d2a92ee816 100644
 --- a/src/terminal-schemas.h
@@ -5680,7 +5566,7 @@ index eb2aa7f8448e..a6d2a92ee816 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 5a4c100b629c..d4cf528d8b14 100644
+index 8889033e8f40..88000b30a5c1 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
 @@ -86,13 +86,17 @@ struct _TerminalScreenPrivate
@@ -5719,10 +5605,10 @@ index 5a4c100b629c..d4cf528d8b14 100644
 +static void terminal_screen_cook_title      (TerminalScreen *screen);
 +static void terminal_screen_cook_icon_title (TerminalScreen *screen);
 +
+ static char* terminal_screen_check_hyperlink   (TerminalScreen            *screen,
+                                                 GdkEvent                  *event);
  static void terminal_screen_check_extra (TerminalScreen *screen,
-                                          GdkEvent       *event,
-                                          char           **number_info);
-@@ -399,6 +407,9 @@ terminal_screen_init (TerminalScreen *screen)
+@@ -403,6 +411,9 @@ terminal_screen_init (TerminalScreen *screen)
    gtk_target_table_free (targets, n_targets);
    gtk_target_list_unref (target_list);
  
@@ -5732,7 +5618,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
    g_signal_connect (screen, "window-title-changed",
                      G_CALLBACK (terminal_screen_window_title_changed),
                      screen);
-@@ -444,9 +455,6 @@ terminal_screen_get_property (GObject *object,
+@@ -448,9 +459,6 @@ terminal_screen_get_property (GObject *object,
        case PROP_TITLE:
          g_value_set_string (value, terminal_screen_get_title (screen));
          break;
@@ -5742,7 +5628,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
        default:
          G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
          break;
-@@ -472,7 +480,6 @@ terminal_screen_set_property (GObject *object,
+@@ -476,7 +484,6 @@ terminal_screen_set_property (GObject *object,
        case PROP_ICON_TITLE:
        case PROP_ICON_TITLE_SET:
        case PROP_TITLE:
@@ -5750,7 +5636,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
          /* not writable */
        default:
          G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-@@ -574,13 +581,6 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -578,13 +585,6 @@ terminal_screen_class_init (TerminalScreenClass *klass)
                            NULL,
                            G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
  
@@ -5764,7 +5650,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
    g_object_class_install_property
      (object_class,
       PROP_INITIAL_ENVIRONMENT,
-@@ -655,7 +655,11 @@ terminal_screen_finalize (GObject *object)
+@@ -659,7 +659,11 @@ terminal_screen_finalize (GObject *object)
  
    terminal_screen_set_profile (screen, NULL);
  
@@ -5777,7 +5663,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
    g_free (priv->initial_working_directory);
    g_strfreev (priv->override_command);
    g_strfreev (priv->initial_env);
-@@ -704,28 +708,8 @@ terminal_screen_new (GSettings       *profile,
+@@ -708,28 +712,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));
  
@@ -5808,10 +5694,11 @@ index 5a4c100b629c..d4cf528d8b14 100644
  
    priv->initial_working_directory = g_strdup (working_dir);
  
-@@ -781,45 +765,174 @@ terminal_screen_exec (TerminalScreen *screen,
+@@ -784,46 +768,175 @@ terminal_screen_exec (TerminalScreen *screen,
+   return terminal_screen_do_exec (screen, data, error);
  }
  
- const char*
++const char*
 +terminal_screen_get_raw_title (TerminalScreen *screen)
 +{
 +  TerminalScreenPrivate *priv = screen->priv;
@@ -5822,7 +5709,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
 +  return "";
 +}
 +
-+const char*
+ const char*
  terminal_screen_get_title (TerminalScreen *screen)
  {
 -  return vte_terminal_get_window_title (VTE_TERMINAL (screen));
@@ -5997,7 +5884,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
  {
    TerminalScreenPrivate *priv = screen->priv;
    GObject *object = G_OBJECT (screen);
-@@ -860,9 +973,11 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -864,9 +977,11 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
      }
  
    if (!prop_name ||
@@ -6010,7 +5897,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
      }
  
    if (gtk_widget_get_realized (GTK_WIDGET (screen)) &&
-@@ -1130,7 +1245,6 @@ terminal_screen_set_profile (TerminalScreen *screen,
+@@ -1134,7 +1249,6 @@ terminal_screen_set_profile (TerminalScreen *screen,
      g_object_unref (old_profile);
  
    g_object_notify (G_OBJECT (screen), "profile");
@@ -6018,7 +5905,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
  }
  
  GSettings*
-@@ -1464,8 +1578,6 @@ spawn_result_cb (VteTerminal *terminal,
+@@ -1468,8 +1582,6 @@ spawn_result_cb (VteTerminal *terminal,
  
    priv->child_pid = pid;
  
@@ -6027,7 +5914,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
    if (error) {
      GtkWidget *info_bar;
  
-@@ -1774,33 +1886,83 @@ terminal_screen_focus_in (GtkWidget     *widget,
+@@ -1800,33 +1912,83 @@ terminal_screen_focus_in (GtkWidget     *widget,
    return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event);
  }
  
@@ -6125,7 +6012,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
  }
  
  /**
-@@ -1833,15 +1995,18 @@ static void
+@@ -1859,15 +2021,18 @@ static void
  terminal_screen_window_title_changed (VteTerminal *vte_terminal,
                                        TerminalScreen *screen)
  {
@@ -6147,7 +6034,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
  }
  
  static void
-@@ -1860,8 +2025,6 @@ terminal_screen_child_exited (VteTerminal *terminal,
+@@ -1886,8 +2051,6 @@ terminal_screen_child_exited (VteTerminal *terminal,
  
    priv->child_pid = -1;
    
@@ -6156,7 +6043,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
    action = g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY);
    
    switch (action)
-@@ -1905,6 +2068,24 @@ terminal_screen_child_exited (VteTerminal *terminal,
+@@ -1931,6 +2094,24 @@ terminal_screen_child_exited (VteTerminal *terminal,
      }
  }
  
@@ -6182,7 +6069,7 @@ index 5a4c100b629c..d4cf528d8b14 100644
  terminal_screen_notification_received (VteTerminal *terminal,
                                         const char  *summary,
 diff --git a/src/terminal-screen.h b/src/terminal-screen.h
-index 133c2309e8a8..2e6406c24670 100644
+index f36f567a21e7..e8a86a0d5f30 100644
 --- a/src/terminal-screen.h
 +++ b/src/terminal-screen.h
 @@ -103,15 +103,19 @@ void         terminal_screen_set_initial_environment (TerminalScreen  *screen,
@@ -6208,10 +6095,10 @@ index 133c2309e8a8..2e6406c24670 100644
  char *terminal_screen_get_current_dir (TerminalScreen *screen);
  
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index c8d9123d88ed..153d273bad75 100644
+index 479fdf65195d..9854c1f7d553 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -753,6 +753,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog,
+@@ -774,6 +774,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog,
    gtk_widget_destroy (dialog);
  }
  
@@ -6224,7 +6111,7 @@ index c8d9123d88ed..153d273bad75 100644
  static void
  action_set_title_cb (GSimpleAction *action,
                       GVariant *parameter,
-@@ -3127,14 +3133,11 @@ sync_screen_title (TerminalScreen *screen,
+@@ -3206,14 +3212,11 @@ sync_screen_title (TerminalScreen *screen,
                     TerminalWindow *window)
  {
    TerminalWindowPrivate *priv = window->priv;
@@ -6241,5 +6128,5 @@ index c8d9123d88ed..153d273bad75 100644
  
  static void
 -- 
-2.12.2
+2.14.1
 
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 6bb17ee..72f0a61 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -2,17 +2,17 @@
 
 %define glib2_version 2.42.0
 %define gtk3_version 3.20.0
-%define vte_version 0.48.2
+%define vte_version 0.50.0
 %define desktop_file_utils_version 0.2.90
 
 Name: gnome-terminal
-Version: 3.24.2
-Release: 3%{?dist}
+Version: 3.26.0
+Release: 1%{?dist}
 Summary: Terminal emulator for GNOME
 
 License: GPLv3+ and GFDL
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/gnome-terminal/3.24/gnome-terminal-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/gnome-terminal/3.26/gnome-terminal-%{version}.tar.xz
 Source1: org.gnome.Terminal.gschema.override
 
 Patch0: 0001-build-Don-t-treat-warnings-as-errors.patch
@@ -109,6 +109,10 @@ fi
 %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml
 
 %changelog
+* Thu Sep 14 2017 Kalev Lember <klember@redhat.com> - 3.26.0-1
+- Update to 3.26.0
+- Rebase downstream patches
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index 5bfccf6..735f3f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-terminal-3.24.2.tar.xz) = 08cd7b1b08cf22618554b1a051dcfee4a967165bfe93b77a6bc8b0c935695101e773e8d53a482d71aadb9ba7be7ac991d82dbf53b7a6f74f1f5144e4158f8a93
+SHA512 (gnome-terminal-3.26.0.tar.xz) = 13e87fd0bfa5ebed9c8f91e9a57880b0d5b67adc31de6119e7547e4f3f84442e009f1fb9f525f5c1ccdf011bdc6f95c97cf8dab0760fe596a200860ffa880627