Merge ~3v1n0/ubuntu/+source/gnome-terminal:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-terminal:ubuntu/master

[Marco Trevisan (Treviño)]

[Iain Lane (laney)]

Done, but rebased and I didn't take your finalise commit since I needed to update the changelog for the extra one in master, and add a bug reference.

Thanks!

review: Approve

diff --git a/ChangeLog b/ChangeLog
index 99201a0..c230c2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,417 @@
-commit 4b4a14abdd047b55b5940afa11aa9b2004eb76d6
+commit 4b2638a4c99b991ff8a07dfd52b4397d6636fdd9
 Author: Christian Persch <[e-mail]>
-Date:   Mon May 21 20:56:25 2018 +0200
+Date:   Sun Sep 2 11:44:47 2018 +0200
 
-    Version 3.28.2
+    Version 3.30.0
 
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 3f41703ba18836195afe93a6819ca89a4c7bce5b
+commit 3163e640d259445b1b7720b8a17bc20c496fa6a6
+Author: Efstathios Iosifidis <[e-mail]>
+Date:   Fri Aug 31 10:40:16 2018 +0000
+
+    Update Greek translation
+
+ po/el.po | 109 ++++++++++++++++++++++-----------------------------------------
+ 1 file changed, 38 insertions(+), 71 deletions(-)
+
+commit 2633f949ceddcaa4eed5a6f84813449be242ff1f
+Author: Seong-ho Cho <[e-mail]>
+Date:   Tue Aug 28 16:13:15 2018 +0000
+
+    Update Korean translation
+
+ help/ko/ko.po | 2224 +++++++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 1361 insertions(+), 863 deletions(-)
+
+commit 805352ce9142528893f38270e8a3256c2a3f2cf5
+Author: Christian Persch <[e-mail]>
+Date:   Sun Aug 26 21:19:37 2018 +0200
+
+    Post release version bump
+
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 9009c99fb25e44373db0debea555f14365157c0d
+Author: Christian Persch <[e-mail]>
+Date:   Sun Aug 26 21:14:34 2018 +0200
+
+    Version 3.29.92
+
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit a6a743b4a963bce167454a80f6cd5ab4bc7cb214
+Author: Mario Blättermann <[e-mail]>
+Date:   Fri Aug 24 20:31:20 2018 +0000
+
+    Update German translation
+
+ po/de.po | 330 ++++++++++++++++++++++++++++-----------------------------------
+ 1 file changed, 146 insertions(+), 184 deletions(-)
+
+commit cfe80bd8264b478743a6bdbb499c671c92ac572d
+Author: Christian Persch <[e-mail]>
+Date:   Fri Aug 24 11:08:06 2018 +0200
+
+    client: legacy: Validate startup ID as UTF-8
+    
+    The --preferences codepath passes it as "s" variant to
+    the remove GtkApplication, so it must be UTF-8.
+
+ src/terminal-options.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 29284ed9c9180209c663f4ee9d2b7991a0c4d8b3
+Author: Christian Persch <[e-mail]>
+Date:   Fri Aug 24 11:08:06 2018 +0200
+
+    desktop: Explicitly call with --window
+    
+    This isn't strictly necessary, but just to clarify.
+
+ org.gnome.Terminal.desktop.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a44213e30b652a0107ffe17840795d446db7eb73
+Author: Egmont Koblinger <[e-mail]>
+Date:   Wed Aug 22 09:37:08 2018 +0200
+
+    desktop: Add New Window and Preferences actions
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=792849
+
+ org.gnome.Terminal.desktop.in.in | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+commit 2eaf0397098f3b69d3af16cd5e3b788c507859f0
+Author: Christian Persch <[e-mail]>
+Date:   Tue Aug 21 18:34:37 2018 +0200
+
+    client: legacy: Transmit startup id also when opening preferences
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=792849
+
+ src/terminal.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+commit a5e26b9da52b9898f7fc2a3c535d177fad5f8a31
+Author: Christian Persch <[e-mail]>
+Date:   Tue Aug 21 18:34:37 2018 +0200
+
+    doap: Fix email address
+
+ gnome-terminal.doap | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 87ea33e132252c6417723d5f7227f38d4b38caf0
+Author: Christian Persch <[e-mail]>
+Date:   Mon Aug 20 22:49:32 2018 +0200
+
+    server: Add comment about pending dbus signals
+
+ src/server.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 23245b029c7f21d53c5ac23373b7d4ad5ddde803
+Author: Christian Persch <[e-mail]>
+Date:   Mon Aug 20 22:49:32 2018 +0200
+
+    client: legacy: Make wait return when the server exits
+    
+    When the gnome-terminal-server instance exits before it can
+    send out our child-exited signal (for example because it
+    crashed), assume that the child process was terminated too,
+    and terminate the wait.
+    
+    https://gitlab.gnome.org/GNOME/gnome-terminal/issues/16
+
+ src/terminal-options.c |  1 +
+ src/terminal-options.h |  1 +
+ src/terminal.c         | 38 ++++++++++++++++++++++++++++++++------
+ 3 files changed, 34 insertions(+), 6 deletions(-)
+
+commit bb313e37eeddd14eacd91083d29aab332be8e227
+Author: Christian Persch <[e-mail]>
+Date:   Mon Aug 20 22:49:32 2018 +0200
+
+    screen: Unregister the TerminalReceiver after dispose
+    
+    The receiver is stil necessary to transmit the child-exited
+    signal via dbus, which is generated by VteTerminal:dispose.
+    
+    https://gitlab.gnome.org/GNOME/gnome-terminal/issues/16
+
+ src/terminal-screen.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+commit fc0dd9ac66d7a19b760d8c6d05b449ddef0681f5
+Author: Christian Persch <[e-mail]>
+Date:   Mon Aug 20 22:49:32 2018 +0200
+
+    build: Suppress vte deprecation warnings
+
+ src/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit ce9b93f6d8b57872e37992984cdf12a85211d9b8
+Author: Christian Persch <[e-mail]>
+Date:   Mon Aug 20 22:49:32 2018 +0200
+
+    screen: Don't emit child-exited on closing
+    
+    When the TerminalScreen is already being disposed and
+    the child-exited arrives from within VteTerminal::dispose,
+    don't try to emit the "close" signal so that TerminalWindow
+    won't try to re-remove the screen from the window which it's
+    already removing.
+
+ src/terminal-screen.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+commit 3f630122699ad46267d4c4724f02cf19be5bc044
+Author: Efstathios Iosifidis <[e-mail]>
+Date:   Sun Aug 19 18:40:44 2018 +0000
+
+    Update Greek translation
+
+ po/el.po | 375 ++++++++++++++++++++++++++-------------------------------------
+ 1 file changed, 157 insertions(+), 218 deletions(-)
+
+commit a656ebc2f31e7d7eaa324e88e6011697d5314a47
+Author: Piotr Drąg <[e-mail]>
+Date:   Sun Aug 12 23:07:10 2018 +0200
+
+    Update Polish translation
+
+ po/pl.po | 266 ++++++++++++++++++++++++++++-----------------------------------
+ 1 file changed, 118 insertions(+), 148 deletions(-)
+
+commit d506620f4f9325ba855707515f23cc5832edc47e
+Author: Guillaume Bernard <[e-mail]>
+Date:   Sun Aug 12 11:09:31 2018 +0000
+
+    Update French translation
+
+ help/fr/fr.po | 2420 ++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 1282 insertions(+), 1138 deletions(-)
+
+commit 20bfa16a3ff656782b87c2f3f606b168c5da0df8
+Author: A S Alam <[e-mail]>
+Date:   Sat Aug 11 14:15:57 2018 +0000
+
+    Update Punjabi translation
+
+ po/pa.po | 2782 ++++++++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 1506 insertions(+), 1276 deletions(-)
+
+commit 97e0b7fa48bfd00c13a584a7b5934f72c37e40a5
+Author: Rodrigo Lledó <[e-mail]>
+Date:   Fri Aug 10 12:02:01 2018 +0000
+
+    Update Spanish translation
+
+ help/es/es.po | 134 +++++++++++++++++++++++-----------------------------------
+ 1 file changed, 52 insertions(+), 82 deletions(-)
+
+commit 8e2bc8bbb9fa573e60d4260f86dbc4bc8918acc2
+Author: Daniel Mustieles <[e-mail]>
+Date:   Thu Aug 9 10:47:58 2018 +0000
+
+    Update Spanish translation
+
+ help/es/es.po | 168 ++++++++++++++--------------------------------------------
+ 1 file changed, 40 insertions(+), 128 deletions(-)
+
+commit 640b99d8e6b82f25ed080d4a1306b85860ad0f22
+Author: Rodrigo Lledó <[e-mail]>
+Date:   Wed Aug 8 12:57:30 2018 +0000
+
+    Update Spanish translation
+
+ help/es/es.po | 127 +++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 69 insertions(+), 58 deletions(-)
+
+commit 4d186fbb496e21a4c3d935bd648677ff088ba0a5
+Author: Daniel Mustieles <[e-mail]>
+Date:   Tue Aug 7 12:39:26 2018 +0000
+
+    Update Spanish translation
+
+ help/es/es.po | 98 ++++++++++++++++++++++-------------------------------------
+ 1 file changed, 37 insertions(+), 61 deletions(-)
+
+commit 641dddffdc33056efe2e52e4fa8e0aefa14fad39
+Author: Rodrigo Lledó <[e-mail]>
+Date:   Mon Aug 6 07:39:50 2018 +0000
+
+    Update Spanish translation
+
+ help/es/es.po | 216 +++++++++++++++++++++++-----------------------------------
+ 1 file changed, 85 insertions(+), 131 deletions(-)
+
+commit c14f7fd2ae382ab54bbd00ab803929e5d281f42a
+Author: Igor Zakharov <[e-mail]>
+Date:   Tue Jul 31 21:00:45 2018 +0200
+
+    screen: Remove redundant NULL checks
+    
+    gs_transfer_out_value() already checks its first argument against NULL.
+    
+    https://gitlab.gnome.org/GNOME/gnome-terminal/issues/19
+
+ src/terminal-screen.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+commit 334b490462be112993fe4eb6a37cc861b29adc44
+Author: Igor Zakharov <[e-mail]>
+Date:   Mon Jul 30 23:55:14 2018 +0200
+
+    client: legacy: Remove unused code
+    
+    It seems the code that had been using this piece was removed as part
+    of commit 2c37f3aeb790d8f0730d38818f1a8a100b4cd195.
+    
+    This also fixes a potential memory leak, as indicated by clang.
+    
+    https://gitlab.gnome.org/GNOME/gnome-terminal/issues/18
+
+ src/terminal.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+commit 05655d2037da0b21a8338584aa071245480ce1c4
+Author: Christian Persch <[e-mail]>
+Date:   Mon Jul 30 23:55:14 2018 +0200
+
+    licensing: Fix licence header
+    
+    No need to have a single LGPL file in g-t.
+
+ src/terminal-pcre2.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit 76539a86f88c3a3b0326e011b6b48cf7dc4d3030
+Author: Debarshi Ray <[e-mail]>
+Date:   Tue Jul 17 13:57:24 2018 +0200
+
+    l10n: Fix Romanian translation
+    
+    https://gitlab.gnome.org/GNOME/gnome-terminal/issues/15
+
+ po/ro.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 735ebb6b170e397e8eaf6c018a429bcf18bcaa95
+Author: Igor Zakharov <[e-mail]>
+Date:   Mon Jul 16 20:15:05 2018 +0200
+
+    encodings: Fix double const warning
+    
+    Introduced by gcc8.
+    
+    https://gitlab.gnome.org/GNOME/gnome-terminal/issues/13
+
+ src/terminal-encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 060e082531d05df084033500206078920420b003
+Author: Igor Zakharov <[e-mail]>
+Date:   Mon Jul 16 18:28:44 2018 +0200
+
+    Resolve several "cast between incompatible function types" warnings
+    
+    These warning have been introduced by gcc8.
+    Resolved by using "g_(s)list_free_full" functions.
+    
+    Fixes #12
+
+ src/terminal-options.c | 9 +++------
+ src/terminal-screen.c  | 3 +--
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+commit 35485658103da87db37f5cedfd923c34f7ac1801
+Author: Christian Persch <[e-mail]>
+Date:   Mon Jul 16 18:28:44 2018 +0200
+
+    build: Make sed rule silent
+
+ src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit e1fe0eb62ca767c3c4029ee2ff6ed6c70a6b95e7
+Author: Cheng-Chia Tseng <[e-mail]>
+Date:   Mon Jul 9 16:13:21 2018 +0000
+
+    Update Chinese (Taiwan) translation
+
+ po/zh_TW.po | 292 +++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 142 insertions(+), 150 deletions(-)
+
+commit deba9472db84087aabda14bba742c3f85b19fc96
+Author: Cédric Valmary <[e-mail]>
+Date:   Fri Jun 22 11:01:45 2018 +0000
+
+    Update Occitan translation
+
+ po/oc.po | 2884 +++++++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 1651 insertions(+), 1233 deletions(-)
+
+commit 8caf4ae73a445625aa35db42892b19fe4cb2d69f
+Author: Egmont Koblinger <[e-mail]>
+Date:   Mon Jun 18 23:05:23 2018 +0200
+
+    app: Fix showing the accels for disunified New Tab/Window menu entries
+    
+    https://gitlab.gnome.org/GNOME/gnome-terminal/issues/8
+
+ src/terminal-app.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d7a5f53332fbba3bd2397589afc40e000aab3081
+Author: Egmont Koblinger <[e-mail]>
+Date:   Sat Jun 16 23:28:47 2018 +0200
+
+    search: Fix "Match case" to always take effect immediately
+    
+    https://gitlab.gnome.org/GNOME/gnome-terminal/issues/4
+
+ src/terminal-search-popover.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit eb8ef198605803a169bd9de8fc756215e2e01c65
+Author: Christian Persch <[e-mail]>
+Date:   Tue May 29 10:47:23 2018 +0200
+
+    doap: Cleanup
+
+ gnome-terminal.doap | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 2f7053f5fa9154437b9397cd204a38e2686107bc
+Author: Christian Persch <[e-mail]>
+Date:   Tue May 29 10:47:22 2018 +0200
+
+    client: legacy: Fix invalid free
+    
+    Use g_free() for memory allocated with g_new().
+    
+    https://gitlab.gnome.org/GNOME/gnome-terminal/issues/1
+
+ src/terminal-options.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit fbaeb201268d85f0172d3fb4d4d5859fd0177ded
+Author: Christian Persch <[e-mail]>
+Date:   Mon May 21 21:00:27 2018 +0200
+
+    build: Bump vte required version
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a114e7587d26aa5612a9b2eb95baaa4cd0a32b77
 Author: Dz Chen <[e-mail]>
 Date:   Mon May 21 16:30:52 2018 +0000
 
@@ -16,7 +420,40 @@ Date:   Mon May 21 16:30:52 2018 +0000
  po/zh_CN.po | 2487 ++++++++++++++++++++++++++++++++---------------------------
  1 file changed, 1339 insertions(+), 1148 deletions(-)
 
-commit 47a949167af299e40b47fb6caf08ec06373b33d5
+commit 3ab67dcc33aeb6a6a42858d3353f544b2b5bb00b
+Author: Christian Persch <[e-mail]>
+Date:   Sat May 5 00:46:13 2018 +0200
+
+    profile: editor: Remove tab scrolling workaround
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=793824
+
+ src/profile-editor.c | 71 ----------------------------------------------------
+ 1 file changed, 71 deletions(-)
+
+commit b1b26a1d3f333171c3a2a0c14d93b14b38054e6d
+Author: Christian Persch <[e-mail]>
+Date:   Sat May 5 00:46:13 2018 +0200
+
+    notebook: Remove tab scrolling workaround
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=793824
+
+ src/terminal-notebook.c | 72 -------------------------------------------------
+ 1 file changed, 72 deletions(-)
+
+commit 887c8128d7c528660afa53fad9ae46e72ca7297c
+Author: Christian Persch <[e-mail]>
+Date:   Wed May 2 19:32:52 2018 +0200
+
+    window: Remove icon title handling
+
+ src/terminal-screen.c | 49 --------------------------------
+ src/terminal-screen.h |  2 --
+ src/terminal-window.c | 78 ---------------------------------------------------
+ 3 files changed, 129 deletions(-)
+
+commit d62c6ee988371cdf2af84a7898cee686c484aff8
 Author: Christian Persch <[e-mail]>
 Date:   Wed May 2 19:32:52 2018 +0200
 
@@ -24,79 +461,78 @@ Date:   Wed May 2 19:32:52 2018 +0200
     
     Make sure each line starts with '#' even if the message
     contains embedded newlines.
-    
-    (cherry picked from commit d62c6ee988371cdf2af84a7898cee686c484aff8)
 
  src/terminal-options.c | 26 ++++++++++++--------------
  1 file changed, 12 insertions(+), 14 deletions(-)
 
-commit 1828cb6d523f80c2aad69b8d452825ab9f737db0
+commit e8ee9f7868dfdbce6bb9607bcd659bb30580cb5f
+Author: Egmont Koblinger <[e-mail]>
+Date:   Wed May 2 11:28:21 2018 +0200
+
+    prefs: editor: Add comments to Solarized colors
+
+ src/profile-editor.c | 40 ++++++++++++++++++++--------------------
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+
+commit 53ba724b184b695af66ced33d95cfde4b6b7df3e
+Author: Matej Urbančič <[e-mail]>
+Date:   Mon Apr 23 22:01:30 2018 +0200
+
+    Updated Slovenian translation
+
+ po/sl.po | 109 ++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 55 insertions(+), 54 deletions(-)
+
+commit 8fe4a989c5a518e16aabf9b5ea310d3b23a37e94
 Author: Egmont Koblinger <[e-mail]>
 Date:   Wed Apr 18 22:02:05 2018 +0200
 
     prefs: editor: Translate encoding names
     
     https://bugzilla.gnome.org/show_bug.cgi?id=795358
-    (cherry picked from commit 8fe4a989c5a518e16aabf9b5ea310d3b23a37e94)
 
  src/terminal-encoding.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 4faa26443bd698e1b4c9349f5996ac042cdde28e
+commit df347ada4a9bc1737116432de60982c2c62ac1ca
 Author: Piotr Drąg <[e-mail]>
 Date:   Fri Apr 13 21:44:34 2018 +0200
 
     Update Polish translation
 
- po/pl.po | 203 +++++++++++++++++++++++++++++++--------------------------------
- 1 file changed, 101 insertions(+), 102 deletions(-)
+ po/pl.po | 205 +++++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 102 insertions(+), 103 deletions(-)
 
-commit 7f6ad2c4e305eec8277acc1a1070261bcd9181c6
-Author: Matej Urbančič <[e-mail]>
-Date:   Thu Apr 12 18:48:35 2018 +0200
+commit 95d18e5c665e616c2adf207f76d7c043b99a2392
+Author: Sebastian Rasmussen <[e-mail]>
+Date:   Fri Apr 13 19:21:37 2018 +0000
 
-    Updated Slovenian translation
+    Update Swedish translation
 
- po/sl.po | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ help/sv/sv.po | 3350 +++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 1945 insertions(+), 1405 deletions(-)
 
-commit 7de21fbfd0f1b08b0539e6608524abc9ed4a591b
+commit 633a58351867b631f103caea8317cd26cfec97ba
 Author: Efstathios Iosifidis <[e-mail]>
 Date:   Wed Apr 11 23:26:43 2018 +0000
 
     Update Greek translation
+    
+    (cherry picked from commit 7de21fbfd0f1b08b0539e6608524abc9ed4a591b)
 
  po/el.po | 2521 +++++++++++++++++++++++++++++++++++---------------------------
  1 file changed, 1407 insertions(+), 1114 deletions(-)
 
-commit ce5a199721c06d6e1d6cde1a083d4db9a916ba08
+commit 266a88772dd8e8e81fc78d2db327f6e58ed21982
 Author: Matej Urbančič <[e-mail]>
-Date:   Tue Apr 10 17:56:56 2018 +0200
+Date:   Tue Apr 10 17:57:12 2018 +0200
 
     Updated Slovenian translation
 
  po/sl.po | 2442 +++++++++++++++++++++++++++++++++-----------------------------
  1 file changed, 1320 insertions(+), 1122 deletions(-)
 
-commit bc18406b41631cb8be6d3020299184cce12a5d1f
-Author: Christian Persch <[e-mail]>
-Date:   Mon Apr 9 21:55:31 2018 +0200
-
-    Post release version bump
-
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-commit 07f2f4fcbe70e8afbd88e7cbe0a08ab9422a1d87
-Author: Christian Persch <[e-mail]>
-Date:   Mon Apr 9 21:51:25 2018 +0200
-
-    Version 3.28.1
-
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-commit 84b94b0dd053f200ff982a87b6ea68e6005b3004
+commit ccd96d9e954f1d7105ee98cb64848c46e0abb7b3
 Author: Christian Persch <[e-mail]>
 Date:   Mon Apr 9 21:39:29 2018 +0200
 
@@ -105,7 +541,7 @@ Date:   Mon Apr 9 21:39:29 2018 +0200
  src/terminal-app.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
-commit 89b974fc6559a1cbe52875464106be4c777dc9f6
+commit d80a8927325b5718b8ca59025099471036cd95d6
 Author: Christian Persch <[e-mail]>
 Date:   Mon Apr 9 21:39:29 2018 +0200
 
@@ -114,7 +550,7 @@ Date:   Mon Apr 9 21:39:29 2018 +0200
  src/terminal-prefs.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-commit 5adcab5f6e3cba58d865e4a4eb7d4802aad37716
+commit 0f2687794302eac762c56a5a9aa3a8c9d2c1eed5
 Author: Christian Persch <[e-mail]>
 Date:   Mon Apr 9 21:39:29 2018 +0200
 
@@ -123,25 +559,63 @@ Date:   Mon Apr 9 21:39:29 2018 +0200
  src/terminal-window.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-commit d5ef4e6ec8a1e83e8f23b15670eaa009731c0ce3
+commit 97cfef6c0ddebaffc4fa185068ff3a7484e21b4d
+Author: Christian Persch <[e-mail]>
+Date:   Mon Apr 9 21:39:29 2018 +0200
+
+    gsettings: schema: Update schema version
+    
+    Now that we don't migrate from gconf anymore, set the default to
+    the migrated version.
+
+ src/org.gnome.Terminal.gschema.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit f2fcf06697131efd460f96580e42428ba941aff3
+Author: Jordi Mas <[e-mail]>
+Date:   Sun Apr 8 18:35:19 2018 +0200
+
+    Update Catalan translation
+
+ po/ca.po | 172 +++++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 86 insertions(+), 86 deletions(-)
+
+commit f1bddeaa11d5d3ab80cfe00a2e64cbf9af8f0a58
+Author: Debarshi Ray <[e-mail]>
+Date:   Fri Apr 6 14:40:29 2018 +0200
+
+    notebook-menu: Add placeholder item for win.set-title
+    
+    ... to match the one in the main menubar.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=795027
+
+ src/terminal-notebook-menu.ui | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit 1ae90f944e251719adac713a20fc39ac766f1031
 Author: Gábor Kelemen <[e-mail]>
 Date:   Thu Apr 5 23:20:24 2018 +0000
 
     Update Hungarian translation
+    
+    (cherry picked from commit d5ef4e6ec8a1e83e8f23b15670eaa009731c0ce3)
 
  help/hu/hu.po | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-commit 90b49fc33d3999fe2237fef360ab5959f7e2e71d
+commit a28380fead45e8f7c02f0a64309b51d31a2cc30c
 Author: Gábor Kelemen <[e-mail]>
 Date:   Thu Apr 5 23:18:40 2018 +0000
 
     Update Hungarian translation
+    
+    (cherry picked from commit 90b49fc33d3999fe2237fef360ab5959f7e2e71d)
 
  help/hu/hu.po | 206 ++++++++++++++++++++++++++++++----------------------------
  1 file changed, 106 insertions(+), 100 deletions(-)
 
-commit 8b0b6cbe219166c28ec8639f8a1e8cdda9122a8d
+commit ea8776e7713221e31c9b62c9157db8bbe7e3c694
 Author: Debarshi Ray <[e-mail]>
 Date:   Tue Apr 3 18:59:11 2018 +0200
 
@@ -156,12 +630,11 @@ Date:   Tue Apr 3 18:59:11 2018 +0200
     Fallout from 0820b3853a3b7c629a93fa820d5372eac1760686
     
     https://bugzilla.gnome.org/show_bug.cgi?id=794935
-    (cherry picked from commit ea8776e7713221e31c9b62c9157db8bbe7e3c694)
 
  src/terminal-window.c | 1 -
  1 file changed, 1 deletion(-)
 
-commit e3540e59942bb600eb4913636096e792327677b4
+commit ebc2db30526c9a033c7d1de6292044cac1105b1c
 Author: Debarshi Ray <[e-mail]>
 Date:   Tue Apr 3 18:51:30 2018 +0200
 
@@ -170,39 +643,22 @@ Date:   Tue Apr 3 18:51:30 2018 +0200
     Fallout from 0820b3853a3b7c629a93fa820d5372eac1760686
     
     https://bugzilla.gnome.org/show_bug.cgi?id=794935
-    (cherry picked from commit ebc2db30526c9a033c7d1de6292044cac1105b1c)
 
  src/terminal-window.c | 65 +--------------------------------------------------
  1 file changed, 1 insertion(+), 64 deletions(-)
 
-commit 746a066098a67bc7c92a6fdcc9fffd0b1cec0553
-Author: Anders Jonsson <[e-mail]>
-Date:   Thu Mar 29 20:36:48 2018 +0000
-
-    Update Swedish translation
-
- help/sv/sv.po | 3350 +++++++++++++++++++++++++++++++++------------------------
- 1 file changed, 1945 insertions(+), 1405 deletions(-)
-
-commit 2ec43ee2f1ef70e88e7b491334fe032747bc26af
-Author: Daniel Mustieles <[e-mail]>
-Date:   Tue Mar 27 11:57:04 2018 +0200
-
-    Updated Spanish translation
-
- help/es/es.po | 111 +++++++++++++++++++++-------------------------------------
- 1 file changed, 39 insertions(+), 72 deletions(-)
-
-commit 5e3be7126bf69205ca5efcd7e3f110234bf0db09
+commit 8aedb2713a9ffebefc44c5745eaed0385f3730cf
 Author: Stas Solovey <[e-mail]>
 Date:   Mon Mar 26 20:38:40 2018 +0000
 
     Update Russian translation
+    
+    (cherry picked from commit 5e3be7126bf69205ca5efcd7e3f110234bf0db09)
 
  po/ru.po | 2399 ++++++++++++++++++++++++++++++++++----------------------------
  1 file changed, 1317 insertions(+), 1082 deletions(-)
 
-commit 3e0b0d477c109952626c9f4ddf573c1e94a38507
+commit 51c10ff15d2d5f2a926d697e7591f40e7ff88c16
 Author: Piotr Drąg <[e-mail]>
 Date:   Mon Mar 26 05:58:57 2018 +0200
 
@@ -211,89 +667,133 @@ Date:   Mon Mar 26 05:58:57 2018 +0200
  help/pl/figures/gnome-terminal.png | Bin 10086 -> 10700 bytes
  1 file changed, 0 insertions(+), 0 deletions(-)
 
-commit d363b7a572e83c4740ef70a2141588bd25cfed68
+commit 46693b9e6f698f12cc8847d920d15c0b87eabf17
 Author: Khaled Hosny <[e-mail]>
 Date:   Sun Mar 25 23:10:01 2018 +0200
 
     Update Arabic translation
 
- po/ar.po | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ po/ar.po | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
-commit 9e0cf22bc04645b21aedae913f53d79808714269
+commit 5337a17f309acf96b21552f5dff404bc7b6a5718
 Author: Khaled Hosny <[e-mail]>
 Date:   Sun Mar 25 22:57:49 2018 +0200
 
     Update Arabic translation
 
- po/ar.po | 2440 +++++++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 1301 insertions(+), 1139 deletions(-)
+ po/ar.po | 2469 +++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 1313 insertions(+), 1156 deletions(-)
+
+commit 69c1e9a7ec4123b636023ef18618c1dc82c10828
+Author: Jordi Mas <[e-mail]>
+Date:   Sun Mar 25 14:46:17 2018 +0200
+
+    Update Catalan translation
+
+ po/ca.po | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 98c05f4328f29d2b7ea1c174dd46313aff9925b6
+Author: Piotr Drąg <[e-mail]>
+Date:   Wed Mar 21 23:01:36 2018 +0100
+
+    Update POTFILES.in
+
+ po/POTFILES.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 2fba61fbf0cc609a4a41c0c22786e6740662ac9a
+Author: Egmont Koblinger <[e-mail]>
+Date:   Wed Mar 21 21:40:19 2018 +0100
+
+    nautilus: Clean up some unused code
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=794565
+
+ src/terminal-nautilus.c | 203 ++++++++++--------------------------------------
+ 1 file changed, 41 insertions(+), 162 deletions(-)
+
+commit 5a32c045fa61fcd65dfbccd45bbd16cd341a6820
+Author: Egmont Koblinger <[e-mail]>
+Date:   Wed Mar 21 21:30:45 2018 +0100
+
+    migration: Remove this feature
+    
+    No longer migrate gconf settings, used by gnome-terminal up to
+    version 3.6.x.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=794565
+    https://bugzilla.gnome.org/show_bug.cgi?id=792990
 
-commit 0e515476e9040e9b9cfc3ded59fbdd84d525ccb8
+ configure.ac            |  25 --
+ src/Makefile.am         |  37 ---
+ src/migration.c         | 686 ------------------------------------------------
+ src/terminal-accels.c   |   2 +-
+ src/terminal-app.c      |  60 -----
+ src/terminal-nautilus.c |  10 -
+ 6 files changed, 1 insertion(+), 819 deletions(-)
+
+commit 3242320715a38ef7e817c65d8341aae474271018
 Author: Cheng-Chia Tseng <[e-mail]>
 Date:   Tue Mar 20 14:42:21 2018 +0000
 
     Update Chinese (Taiwan) translation
+    
+    (cherry picked from commit 0e515476e9040e9b9cfc3ded59fbdd84d525ccb8)
 
  po/zh_TW.po | 134 ++++++++++++++++++++++++++++++------------------------------
  1 file changed, 67 insertions(+), 67 deletions(-)
 
-commit 1223ec2a2c7154f249a2cadc972c9d5ab52d9582
+commit ecc4fd3aae68180151d4117460aafdf3c25238c9
 Author: Dušan Kazik <[e-mail]>
 Date:   Sat Mar 17 22:09:09 2018 +0000
 
     Update Slovak translation
+    
+    (cherry picked from commit 1223ec2a2c7154f249a2cadc972c9d5ab52d9582)
 
  po/sk.po | 79 +++++++++++++++++++++++++++++-----------------------------------
  1 file changed, 36 insertions(+), 43 deletions(-)
 
-commit 10291e23bb7e483f8d7b7368cba5c605c0f37cf2
+commit 0bee0d96140116eade848c23922d0920b612c787
 Author: Christian Persch <[e-mail]>
 Date:   Sat Mar 17 19:55:20 2018 +0100
 
     client: legacy: Fix prgname
     
     https://bugzilla.gnome.org/show_bug.cgi?id=793775
-    (cherry picked from commit 0bee0d96140116eade848c23922d0920b612c787)
 
  src/terminal.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 0f3bf6fe4bf72f00e9da78c3b9d85a620b087fc0
+commit 110a77136f3bc766c3042aa0f1dfd0a285974f03
 Author: Dušan Kazik <[e-mail]>
 Date:   Sat Mar 17 10:45:08 2018 +0000
 
     Update Slovak translation
+    
+    (cherry picked from commit 0f3bf6fe4bf72f00e9da78c3b9d85a620b087fc0)
 
  po/sk.po | 231 +++++++++++++++++++++++----------------------------------------
  1 file changed, 82 insertions(+), 149 deletions(-)
 
-commit 276e6ef6935075da1c906bca32ad8619bc7a047e
+commit d6885c2a77eb48ba8c0d410139a7b49120b15bb8
 Author: Egmont Koblinger <[e-mail]>
 Date:   Fri Mar 16 21:16:19 2018 +0100
 
     window: Do not change New Terminal's behavior on right click
     
     https://bugzilla.gnome.org/show_bug.cgi?id=794402
-    (cherry picked from commit d6885c2a77eb48ba8c0d410139a7b49120b15bb8)
 
  src/terminal-window.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
-commit db6a2e85b157e6ec11f8f13ed97132a8e65633df
-Author: Nathan Follens <[e-mail]>
-Date:   Tue Mar 13 19:21:29 2018 +0000
-
-    Update Dutch translation
-
- po/nl.po | 128 +++++++++++++++++++++++++++++++--------------------------------
- 1 file changed, 63 insertions(+), 65 deletions(-)
-
-commit d1b6f18eb6128d0a49b72d03fb42a07cec5de8ec
+commit 21d16a40cc310cd6295f40e96e0d31d9ff287246
 Author: Christian Persch <[e-mail]>
-Date:   Mon Mar 12 21:53:44 2018 +0100
+Date:   Mon Mar 12 21:54:32 2018 +0100
 
-    Post release version bump
+    Post branch version bump
 
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index df3173c..d7fa062 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -312,8 +312,6 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
-MIGRATOR_CFLAGS = @MIGRATOR_CFLAGS@
-MIGRATOR_LIBS = @MIGRATOR_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/aclocal.m4 b/aclocal.m4
index b577a6b..89cec79 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -570,7 +570,10 @@ m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])
 #
 # Modified to require ngettext
 # Matthias Clasen <[e-mail]> 08/06/2004
-#
+
+# Increment this whenever this file is changed.
+#serial 1
+
 # We need this here as well, since someone might use autoconf-2.5x
 # to configure GLib then an older version to configure a package
 # using AM_GLIB_GNU_GETTEXT
@@ -1027,6 +1030,9 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
 fi])
 
 
+# Increment this whenever this file is changed.
+#serial 1
+
 dnl GLIB_GSETTINGS
 dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
 dnl the schema should be compiled
diff --git a/config.h.in b/config.h.in
index 4a3135d..7f45f65 100644
--- a/config.h.in
+++ b/config.h.in
@@ -3,9 +3,6 @@
 /* Define to 1 to enable special debug support */
 #undef ENABLE_DEBUG
 
-/* Define to 1 to enable prefs migration from GConf to GSettings */
-#undef ENABLE_MIGRATION
-
 /* always defined to indicate that i18n is enabled */
 #undef ENABLE_NLS
 
diff --git a/configure b/configure
index 733fa5c..6fcbf8a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNOME Terminal 3.28.2.
+# Generated by GNU Autoconf 2.69 for GNOME Terminal 3.30.0.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-terminal>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNOME Terminal'
 PACKAGE_TARNAME='gnome-terminal'
-PACKAGE_VERSION='3.28.2'
-PACKAGE_STRING='GNOME Terminal 3.28.2'
+PACKAGE_VERSION='3.30.0'
+PACKAGE_STRING='GNOME Terminal 3.30.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-terminal'
 PACKAGE_URL=''
 
@@ -664,10 +664,6 @@ GDBUS_CODEGEN
 GLIB_COMPILE_RESOURCES
 GLIB_MKENUMS
 GLIB_GENMARSHAL
-ENABLE_MIGRATION_FALSE
-ENABLE_MIGRATION_TRUE
-MIGRATOR_LIBS
-MIGRATOR_CFLAGS
 GSETTINGS_RULES
 GLIB_COMPILE_SCHEMAS
 gsettingsschemadir
@@ -867,7 +863,6 @@ with_gtk
 with_dbus_interface_dir
 with_dbus_service_dir
 enable_schemas_compile
-enable_migration
 enable_search_provider
 with_nautilus_extension
 with_nautilus_dir
@@ -889,8 +884,6 @@ PKG_CONFIG_LIBDIR
 LT_SYS_LIBRARY_PATH
 TERM_CFLAGS
 TERM_LIBS
-MIGRATOR_CFLAGS
-MIGRATOR_LIBS
 GLIB_GENMARSHAL
 GLIB_MKENUMS
 GLIB_COMPILE_RESOURCES
@@ -1440,7 +1433,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNOME Terminal 3.28.2 to adapt to many kinds of systems.
+\`configure' configures GNOME Terminal 3.30.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1510,7 +1503,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNOME Terminal 3.28.2:";;
+     short | recursive ) echo "Configuration of GNOME Terminal 3.30.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1535,7 +1528,6 @@ Optional Features:
   --disable-nls           do not use Native Language Support
   --disable-schemas-compile
                           Disable regeneration of gschemas.compiled on install
-  --disable-migration     Disable prefs migration from GConf to GSettings
   --disable-search-provider
                           Disable gnome-shell search provider
   --enable-debug          Enable special debug support
@@ -1580,10 +1572,6 @@ Some influential environment variables:
               User-defined run-time library search path.
   TERM_CFLAGS C compiler flags for TERM, overriding pkg-config
   TERM_LIBS   linker flags for TERM, overriding pkg-config
-  MIGRATOR_CFLAGS
-              C compiler flags for MIGRATOR, overriding pkg-config
-  MIGRATOR_LIBS
-              linker flags for MIGRATOR, overriding pkg-config
   GLIB_GENMARSHAL
               the glib-genmarschal programme
   GLIB_MKENUMS
@@ -1667,7 +1655,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNOME Terminal configure 3.28.2
+GNOME Terminal configure 3.30.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2036,7 +2024,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNOME Terminal $as_me 3.28.2, which was
+It was created by GNOME Terminal $as_me 3.30.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2904,7 +2892,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gnome-terminal'
- VERSION='3.28.2'
+ VERSION='3.30.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14713,7 +14701,7 @@ case "$with_gtk" in
        GTK_MIN_REQUIRED=3.8
        GTK_MAX_ALLOWED=3.22
        VTE_API_VERSION=2.91
-       VTE_REQUIRED=0.52.2
+       VTE_REQUIRED=0.54.0
        ;;
 esac
 
@@ -15159,175 +15147,6 @@ endif
 
 
 
-# *************************
-# GConf-GSettings Migration
-# *************************
-
-GCONF_REQUIRED=2.31.3
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the GConf to GSettings migrator" >&5
-$as_echo_n "checking whether to build the GConf to GSettings migrator... " >&6; }
-# Check whether --enable-migration was given.
-if test "${enable_migration+set}" = set; then :
-  enableval=$enable_migration;
-else
-  enable_migration=yes
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_migration" >&5
-$as_echo "$enable_migration" >&6; }
-
-if test "$enable_migration" = "yes"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MIGRATOR" >&5
-$as_echo_n "checking for MIGRATOR... " >&6; }
-
-if test -n "$MIGRATOR_CFLAGS"; then
-    pkg_cv_MIGRATOR_CFLAGS="$MIGRATOR_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-   gio-2.0 >= \$GIO_REQUIRED
-   vte-\$VTE_API_VERSION >= \$VTE_REQUIRED
-   gconf-2.0 >= \$GCONF_REQUIRED
-   dconf >= \$DCONF_REQUIRED
-   uuid\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "
-   gio-2.0 >= $GIO_REQUIRED
-   vte-$VTE_API_VERSION >= $VTE_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
-   dconf >= $DCONF_REQUIRED
-   uuid") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_MIGRATOR_CFLAGS=`$PKG_CONFIG --cflags "
-   gio-2.0 >= $GIO_REQUIRED
-   vte-$VTE_API_VERSION >= $VTE_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
-   dconf >= $DCONF_REQUIRED
-   uuid" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$MIGRATOR_LIBS"; then
-    pkg_cv_MIGRATOR_LIBS="$MIGRATOR_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-   gio-2.0 >= \$GIO_REQUIRED
-   vte-\$VTE_API_VERSION >= \$VTE_REQUIRED
-   gconf-2.0 >= \$GCONF_REQUIRED
-   dconf >= \$DCONF_REQUIRED
-   uuid\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "
-   gio-2.0 >= $GIO_REQUIRED
-   vte-$VTE_API_VERSION >= $VTE_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
-   dconf >= $DCONF_REQUIRED
-   uuid") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_MIGRATOR_LIBS=`$PKG_CONFIG --libs "
-   gio-2.0 >= $GIO_REQUIRED
-   vte-$VTE_API_VERSION >= $VTE_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
-   dconf >= $DCONF_REQUIRED
-   uuid" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        MIGRATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
-   gio-2.0 >= $GIO_REQUIRED
-   vte-$VTE_API_VERSION >= $VTE_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
-   dconf >= $DCONF_REQUIRED
-   uuid" 2>&1`
-        else
-	        MIGRATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
-   gio-2.0 >= $GIO_REQUIRED
-   vte-$VTE_API_VERSION >= $VTE_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
-   dconf >= $DCONF_REQUIRED
-   uuid" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$MIGRATOR_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (
-   gio-2.0 >= $GIO_REQUIRED
-   vte-$VTE_API_VERSION >= $VTE_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
-   dconf >= $DCONF_REQUIRED
-   uuid) were not met:
-
-$MIGRATOR_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables MIGRATOR_CFLAGS
-and MIGRATOR_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables MIGRATOR_CFLAGS
-and MIGRATOR_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	MIGRATOR_CFLAGS=$pkg_cv_MIGRATOR_CFLAGS
-	MIGRATOR_LIBS=$pkg_cv_MIGRATOR_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-$as_echo "#define ENABLE_MIGRATION 1" >>confdefs.h
-
-fi
-
- if test "$enable_migration" = "yes"; then
-  ENABLE_MIGRATION_TRUE=
-  ENABLE_MIGRATION_FALSE='#'
-else
-  ENABLE_MIGRATION_TRUE='#'
-  ENABLE_MIGRATION_FALSE=
-fi
-
-
 # ***********
 # Build tools
 # ***********
@@ -16224,9 +16043,9 @@ uninstall-help:
 
 TERMINAL_MAJOR_VERSION=3
 
-TERMINAL_MINOR_VERSION=28
+TERMINAL_MINOR_VERSION=30
 
-TERMINAL_MICRO_VERSION=2
+TERMINAL_MICRO_VERSION=0
 
 TERMINAL_API_VERSION=0
 
@@ -16401,10 +16220,6 @@ fi
   ac_config_commands="$ac_config_commands po/stamp-it"
 
 
-if test -z "${ENABLE_MIGRATION_TRUE}" && test -z "${ENABLE_MIGRATION_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_MIGRATION\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${ENABLE_SEARCH_PROVIDER_TRUE}" && test -z "${ENABLE_SEARCH_PROVIDER_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_SEARCH_PROVIDER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16810,7 +16625,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNOME Terminal $as_me 3.28.2, which was
+This file was extended by GNOME Terminal $as_me 3.30.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16876,7 +16691,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNOME Terminal config.status 3.28.2
+GNOME Terminal config.status 3.30.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -18605,7 +18420,6 @@ gnome-terminal-$VERSION:
       DBus interface dir:     ${dbusinterfacedir}
       DBus service dir:       ${dbusservicedir}
       Debug:                  ${enable_debug}
-      Prefs migration:        ${enable_migration}
       Search provider:        ${enable_search_provider}
       Nautilus extension:     ${with_nautilus_extension}
       Nautilus extension dir: ${nautilusextensiondir}
diff --git a/configure.ac b/configure.ac
index e8b10de..d51740e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([gt_version_major],[3])
-m4_define([gt_version_minor],[28])
-m4_define([gt_version_micro],[2])
+m4_define([gt_version_minor],[30])
+m4_define([gt_version_micro],[0])
 m4_define([gt_version_extra],[])
 m4_define([gt_version],[gt_version_major().gt_version_minor().gt_version_micro()gt_version_extra])
 
@@ -64,7 +64,7 @@ case "$with_gtk" in
        GTK_MIN_REQUIRED=3.8
        GTK_MAX_ALLOWED=3.22
        VTE_API_VERSION=2.91
-       VTE_REQUIRED=0.52.2
+       VTE_REQUIRED=0.54.0
        ;;
 esac
 
@@ -116,30 +116,6 @@ AC_SUBST([dbusservicedir])
 
 GLIB_GSETTINGS
 
-# *************************
-# GConf-GSettings Migration
-# *************************
-
-GCONF_REQUIRED=2.31.3
-
-AC_MSG_CHECKING([whether to build the GConf to GSettings migrator])
-AC_ARG_ENABLE([migration],
-        [AS_HELP_STRING([--disable-migration],[Disable prefs migration from GConf to GSettings])],
-        [],[enable_migration=yes])
-AC_MSG_RESULT([$enable_migration])
-
-if test "$enable_migration" = "yes"; then
- PKG_CHECK_MODULES([MIGRATOR],[
-   gio-2.0 >= $GIO_REQUIRED
-   vte-$VTE_API_VERSION >= $VTE_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
-   dconf >= $DCONF_REQUIRED
-   uuid])
-  AC_DEFINE([ENABLE_MIGRATION],[1],[Define to 1 to enable prefs migration from GConf to GSettings])
-fi
-
-AM_CONDITIONAL([ENABLE_MIGRATION],[test "$enable_migration" = "yes"])
-
 # ***********
 # Build tools
 # ***********
@@ -346,7 +322,6 @@ gnome-terminal-$VERSION:
       DBus interface dir:     ${dbusinterfacedir}
       DBus service dir:       ${dbusservicedir}
       Debug:                  ${enable_debug}
-      Prefs migration:        ${enable_migration}
       Search provider:        ${enable_search_provider}
       Nautilus extension:     ${with_nautilus_extension}
       Nautilus extension dir: ${nautilusextensiondir}
diff --git a/debian/changelog b/debian/changelog
index 6a5234d..39812f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,58 @@
+gnome-terminal (3.30.0-1ubuntu1) cosmic; urgency=medium
+
+  * Merge with debian, remaining changes:
+    + gnome-terminal.wrap, debian/rules:
+      - Add a wrapper script to restore command line compatibility.
+    + debian/control.in:
+      - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for
+        the wrapper script.
+      - Don't Build-Depend on PCRE2
+    + Add 0001-Restore-transparency.patch:
+      - Restore transparency support
+    + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch:
+      - Add CSS names and style classes so we can theme things more easily.
+    + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch:
+      - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @
+        Fedora (LP: #1650395)
+    + Add 52_support_apturl.patch:
+      - Support apt: urls.
+    + Add 60_add_lp_handler.patch:
+      - Add a handler for launchpad bug URLs.
+    + Add scrollbar-background-theming.patch:
+      - Draw background under the scrollbar that matches the actual terminal
+        background color. This allows proper theming.
+    + Add debian/patches/revert-pcre2.patch:
+      - Revert changes that require PCRE2 since it's not in main
+        (see MIR #163666)
+  * Keep 006-fix-invalid-appstream-metadata.patch:
+    - Ubuntu's AppStream versions and http://appstream.ubuntu.com/
+      don't support gnome-terminal's syntax yet
+  * Refreshed Patches:
+    + debian/patches/50_add_unity_quicklist.patch:
+      - Dropped as upstream includes this feature now
+  * debian/rules:
+    - Stop installing compatibility version of gnome-terminal.desktop
+      (LP: #1739263)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Mon, 10 Sep 2018 11:35:47 -0500
+
+gnome-terminal (3.30.0-1) unstable; urgency=medium
+
+  [ Marco Trevisan (Treviño) ]
+  * New upstream release 3.30 (LP: #1791373)
+  * Refresh patches
+
+  [ Jeremy Bicha ]
+  * Bump minimum libvte-2.91-dev to 0.54.0
+  * Cherry-pick app-Make-new-terminal-menu-a-hidden-pref.patch
+    - unified New Terminal menu item can be set via gsettings (LP: #1747171)
+  * Add debian/gnome-shell.gsettings-override to disable unified New Terminal
+  * debian/rules: Drop obsolete build option to disable unified New Terminal
+  * debian/rules: Drop obsolete --disable-migration configure flag
+  * Update debian/gbp.conf
+
+ -- Jeremy Bicha <[e-mail]>  Sat, 08 Sep 2018 11:20:13 -0400
+
 gnome-terminal (3.28.2-1ubuntu1) cosmic; urgency=medium
 
   * Merge with Debian. Remaining changes:
@@ -526,7 +581,7 @@ gnome-terminal (3.18.0-1) unstable; urgency=medium
   * Remove Debian menu entry.
 
   [ Pedro Beja ]
-  * Remove obsolete flags --disable-factory, --title and --usage from manpage. 
+  * Remove obsolete flags --disable-factory, --title and --usage from manpage.
 
   [ Andreas Henriksson ]
   * New upstream release.
@@ -741,7 +796,7 @@ gnome-terminal (3.8.2-1) unstable; urgency=low
 gnome-terminal (3.8.0.1-1) experimental; urgency=low
 
   [ Jeremy Bicha ]
-  * 01_onlyshowin.patch: Show in Unity too 
+  * 01_onlyshowin.patch: Show in Unity too
 
   [ Emilio Pozuelo Monfort ]
   * New upstream release.
@@ -811,7 +866,7 @@ gnome-terminal (3.4.0.1-1) unstable; urgency=low
 
 gnome-terminal (3.2.1-2) unstable; urgency=low
 
-  * Reintroduce gtk2 build-dependency, it’s required for 
+  * Reintroduce gtk2 build-dependency, it’s required for
     gtk-builder-convert.
 
  -- Josselin Mouette <[e-mail]>  Sun, 20 Nov 2011 00:25:02 +0100
@@ -963,9 +1018,9 @@ gnome-terminal (2.26.2-3) UNRELEASED; urgency=low
 
 gnome-terminal (2.26.2-2) unstable; urgency=low
 
-  * 02_let_gconf_autostart.patch: Don’t exit if there is no GConf daemon 
-    running. Instead, let dbus-daemon and gconfd be autostarted as they 
-    should be if this is needed. Thanks to Sean Finney for the 
+  * 02_let_gconf_autostart.patch: Don’t exit if there is no GConf daemon
+    running. Instead, let dbus-daemon and gconfd be autostarted as they
+    should be if this is needed. Thanks to Sean Finney for the
     suggestion. Closes: #531734 and some duplicates.
 
  -- Josselin Mouette <[e-mail]>  Sat, 27 Jun 2009 14:53:33 +0200
@@ -991,8 +1046,8 @@ gnome-terminal (2.26.2-1) unstable; urgency=low
 
   [ Josselin Mouette ]
   * Drop unnecessary build-deps, add libsm-dev.
-  * 01_onlyshowin.patch: new patch. Only show gnome-terminal in GNOME 
-    menus, other desktop environments already have their terminal 
+  * 01_onlyshowin.patch: new patch. Only show gnome-terminal in GNOME
+    menus, other desktop environments already have their terminal
     emulators.
 
  -- Josselin Mouette <[e-mail]>  Mon, 01 Jun 2009 11:28:01 +0200
@@ -1000,9 +1055,9 @@ gnome-terminal (2.26.2-1) unstable; urgency=low
 gnome-terminal (2.24.3-3) unstable; urgency=low
 
   * Recommend gvfs. Closes: #519159.
-  * 01_tabs_shortcuts.patch: restore the ability to set shortcuts to 
+  * 01_tabs_shortcuts.patch: restore the ability to set shortcuts to
     each tab. Closes: #519523.
-  * 02_tabs_shortcuts_translations.patch: restore translations from 
+  * 02_tabs_shortcuts_translations.patch: restore translations from
     version 2.22 for this functionality.
     + Thanks to Mart Raudsepp for preparing the patches.
 
@@ -1040,14 +1095,14 @@ gnome-terminal (2.24.1.1-1) experimental; urgency=low
 
 gnome-terminal (2.22.3-3) unstable; urgency=low
 
-  * 01_error_crash.patch: stolen from upstream (r2948). Fixes crash when 
+  * 01_error_crash.patch: stolen from upstream (r2948). Fixes crash when
     passing incorrect arguments to the command line. Closes: #477259.
 
  -- Josselin Mouette <[e-mail]>  Thu, 18 Sep 2008 16:17:00 +0200
 
 gnome-terminal (2.22.3-2) unstable; urgency=low
 
-  * gnome-terminal.wrapper: correctly emulate the completely brain-dead 
+  * gnome-terminal.wrapper: correctly emulate the completely brain-dead
     argument parsing of the -e option in xterm. Closes: #488974.
 
  -- Josselin Mouette <[e-mail]>  Fri, 18 Jul 2008 11:57:11 +0200
@@ -1190,7 +1245,7 @@ gnome-terminal (2.16.1-3) experimental; urgency=low
 
 gnome-terminal (2.16.1-2) experimental; urgency=low
 
-  * 01_terminal-window_resize.patch: stolen from upstream CVS. Avoid 
+  * 01_terminal-window_resize.patch: stolen from upstream CVS. Avoid
     spurious window resizing when opening new tabs.
 
  -- Josselin Mouette <[e-mail]>  Tue, 26 Dec 2006 20:58:36 +0100
@@ -1272,7 +1327,7 @@ gnome-terminal (2.13.93-1) experimental; urgency=low
     - translation_warning.patch: dropped; fixed upstream.
   * debian/gnome-terminal-data.install:
     - do not install /usr/share/application-registry, it has been
-      dropped and deprecated upstream.  
+      dropped and deprecated upstream.
 
  -- Guilherme de S. Pastore <[e-mail]>  Sat,  4 Mar 2006 15:46:20 -0300
 
@@ -1345,7 +1400,7 @@ gnome-terminal (2.8.2-1) unstable; urgency=medium
 
   * New upstream release (translation updates).
   * [debian/patches/update-config-guess-sub.patch] Dropped; upstream now
-    includes a newer config.guess and config.sub than are available in 
+    includes a newer config.guess and config.sub than are available in
     autotools-dev.
   * [debian/rules] Have binary-post-install clean up scrollkeeper's droppings.
 
@@ -1382,7 +1437,7 @@ gnome-terminal (2.7.3-1) experimental; urgency=low
     - new patch to not display obnoxious characters on next/previous tab
       (Closes: #256207).
   * debian/postinst:
-    - set an higher priority (40) on the x-terminal-emulator alternative, so 
+    - set an higher priority (40) on the x-terminal-emulator alternative, so
       gnome-terminal has the priority over xterm and uxterm (Closes: #252345).
 
  -- Sebastien Bacher <[e-mail]>  Wed, 30 Jun 2004 16:23:21 +0200
@@ -2349,7 +2404,7 @@ gnome-core (1.0.53-2) unstable; urgency=low
 
 gnome-core (1.0.53-1) unstable; urgency=low
 
-  * New upstream version. 
+  * New upstream version.
   * gnome-session does now depend on gnome-panel and recommends
     gmc (both are needed for a full Gnome desktop).
   * gnome-terminal does not have a border. Closes: #38972
@@ -2361,7 +2416,7 @@ gnome-core (1.0.52-1) unstable; urgency=low
   * New maintainer. Steve said that he wanted to give away some of
     his packages. I've asked to take gnome-core, he never replied, so
     I'm taking it but I will give it back to him if he wanted to
-    keep it. In the meantime I can better manage bugs with my name 
+    keep it. In the meantime I can better manage bugs with my name
     in the Maintainer field.
   * New upstream version.
 
@@ -2402,11 +2457,11 @@ gnome-core (1.0.9-0.1) unstable; urgency=low
   * cdplayer_applet works again. Closes: #42192
   * gnome pager works well: Closes: #42499, #42610
   * modem_lights draws itself correctly. Closes: #43861, #45055
-  * The dialer applets doesn't exit when stopping while 
+  * The dialer applets doesn't exit when stopping while
     not yet connected. Closes: #45287
   * No more Debian menu in the panel. Closes: #41040
   * GnomeICU works with this panel. Closes: #39626, #39515
-  * gnome-panel-data conflicts with asclock. 
+  * gnome-panel-data conflicts with asclock.
     Closes: #40712, #40715, #40808, #41430
     A better solution will be needed. Maybe put asclock in his own
     package or create a asclock-data package that will be shared.
@@ -2427,7 +2482,7 @@ gnome-core (1.0.9-0.1) unstable; urgency=low
   * The terminal keeps its size when dragging the manu bar in and out.
     Closes: #44762
   * The menu section of gnome-terminal corrected. Closes: #37635
-    
+
  -- Raphael Hertzog <[e-mail]>  Wed, 22 Sep 1999 13:24:34 +0200
 
 gnome-core (1.0.7-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f7b5021..140c8f2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Iain Lane <[e-mail]>, Jeremy Bicha <[e-mail]>, Michael Biebl <[e-mail]>
+Uploaders: Iain Lane <[e-mail]>, Jeremy Bicha <[e-mail]>
 Build-Depends: debhelper (>= 11),
                dh-exec,
                gnome-common,
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 11),
                libgtk-3-dev (>= 3.20),
                libglib2.0-dev (>= 2.42.0),
 #               libpcre2-dev (>= 10.00),
-               libvte-2.91-dev (>= 0.52.2),
+               libvte-2.91-dev (>= 0.54.0),
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
                docbook-to-man,
diff --git a/debian/control.in b/debian/control.in
index 043511e..00f3b2d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 11),
                libgtk-3-dev (>= 3.20),
                libglib2.0-dev (>= 2.42.0),
 #               libpcre2-dev (>= 10.00),
-               libvte-2.91-dev (>= 0.52.2),
+               libvte-2.91-dev (>= 0.54.0),
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
                docbook-to-man,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 724f036..49ac889 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,15 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch=ubuntu/master
-upstream-branch=upstream/latest
+debian-branch = ubuntu/master
+upstream-branch = upstream/latest
 upstream-vcs-tag = %(version)s
 debian-tag = ubuntu/%(version)s
+
+[buildpackage]
+sign-tags = True
+
+[import-orig]
+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+
+[pq]
+patch-numbers = False
diff --git a/debian/gnome-terminal.gsettings-override b/debian/gnome-terminal.gsettings-override
new file mode 100644
index 0000000..65d39a4
--- /dev/null
+++ b/debian/gnome-terminal.gsettings-override
@@ -0,0 +1,2 @@
+[org.gnome.Terminal.Legacy.Settings]
+unified-menu=false
diff --git a/debian/patches/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch b/debian/patches/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch
index 69cfaa5..e562b70 100644
--- a/debian/patches/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch
+++ b/debian/patches/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Add style classes and CSS names to some of our widgets
  2 files changed, 13 insertions(+)
 
 diff --git a/src/terminal-notebook.c b/src/terminal-notebook.c
-index 4e7d56a..490a29a 100644
+index 006922f..3823329 100644
 --- a/src/terminal-notebook.c
 +++ b/src/terminal-notebook.c
 @@ -32,6 +32,8 @@
@@ -20,7 +20,7 @@ index 4e7d56a..490a29a 100644
  #define TERMINAL_NOTEBOOK_GET_PRIVATE(notebook)(G_TYPE_INSTANCE_GET_PRIVATE ((notebook), TERMINAL_TYPE_NOTEBOOK, TerminalNotebookPrivate))
  
  struct _TerminalNotebookPrivate
-@@ -460,11 +462,15 @@ static void
+@@ -389,11 +391,15 @@ static void
  terminal_notebook_init (TerminalNotebook *notebook)
  {
    TerminalNotebookPrivate *priv;
@@ -37,10 +37,10 @@ index 4e7d56a..490a29a 100644
  
  static void
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index e3bce1a..c36f3d9 100644
+index 76a7c06..a7082ab 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -124,6 +124,8 @@ enum
+@@ -122,6 +122,8 @@ enum
    TARGET_TAB
  };
  
@@ -49,7 +49,7 @@ index e3bce1a..c36f3d9 100644
  static void terminal_screen_constructed (GObject             *object);
  static void terminal_screen_dispose     (GObject             *object);
  static void terminal_screen_finalize    (GObject             *object);
-@@ -422,9 +424,14 @@ terminal_screen_init (TerminalScreen *screen)
+@@ -404,9 +406,14 @@ terminal_screen_init (TerminalScreen *screen)
    guint i;
    uuid_t u;
    char uuidstr[37];
diff --git a/debian/patches/0001-Restore-transparency.patch b/debian/patches/0001-Restore-transparency.patch
index 0d37e06..3e2db66 100644
--- a/debian/patches/0001-Restore-transparency.patch
+++ b/debian/patches/0001-Restore-transparency.patch
@@ -27,107 +27,16 @@ can avoid this by ensuring that the window always renders a background.
 
 https://bugzilla.gnome.org/show_bug.cgi?id=730016
 ---
- src/migration.c                    |  43 ++++++++++++-
  src/org.gnome.Terminal.gschema.xml |  14 +++++
  src/preferences.ui                 | 121 +++++++++++++++++++++++++++++++++++++
  src/profile-editor.c               |  19 ++++++
  src/terminal-schemas.h             |   4 ++
  src/terminal-screen.c              |  42 ++++++++++++-
  src/terminal-window.c              |  28 +++++++++
- 7 files changed, 268 insertions(+), 3 deletions(-)
+ 6 files changed, 227 insertions(+), 1 deletion(-)
 
-diff --git a/src/migration.c b/src/migration.c
-index e3ae04b..31064b1 100644
---- a/src/migration.c
-+++ b/src/migration.c
-@@ -331,6 +331,9 @@ migrate_global_prefs (GSettings *settings,
-                 settings, TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY,
-                 FALSE);
- 
-+  if (verbose)
-+      g_printerr("Migrating global\n");
-+
-   g_object_unref (client);
- 
-   return TRUE;
-@@ -378,6 +381,8 @@ migrate_profile (TerminalSettingsList *list,
- {
-   GSettings *settings;
-   char *child_name, *path;
-+  gchar *background_type = NULL, *bg_type_key, *bg_darkness_key;
-+  gdouble background_darkness;
-   gs_free char *name;
-   gboolean is_default;
- 
-@@ -394,6 +399,31 @@ migrate_profile (TerminalSettingsList *list,
- 
-   path = gconf_concat_dir_and_key (GCONF_PROFILES_PREFIX, gconf_id);
- 
-+  bg_type_key = gconf_concat_dir_and_key (path, KEY_BACKGROUND_TYPE);
-+  background_type = gconf_client_get_string (client, bg_type_key, NULL);
-+  g_free (bg_type_key);
-+  if (background_type)
-+      g_settings_set_boolean (settings, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
-+                              g_strcmp0(background_type, "transparent") == 0);
-+  g_free (background_type);
-+
-+  // If we're migrating, set the 'use theme transparency' key to false, this
-+  // will be copied from the old profile into transparency.
-+  g_settings_set_boolean (settings, TERMINAL_PROFILE_USE_THEME_TRANSPARENCY,
-+                          FALSE);
-+
-+  bg_darkness_key = gconf_concat_dir_and_key (path, KEY_BACKGROUND_DARKNESS);
-+  background_darkness = gconf_client_get_float (client,
-+                                                bg_darkness_key, NULL);
-+
-+  g_free (bg_darkness_key);
-+  if (background_darkness) {
-+      // Need to invert, the key has changed sense
-+      g_settings_set_int (settings,
-+                          TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT,
-+                          1 - (int) (background_darkness * 100));
-+  }
-+
-   migrate_string (client, path, KEY_VISIBLE_NAME,
-                   settings, TERMINAL_PROFILE_VISIBLE_NAME_KEY);
- 
-@@ -481,7 +511,7 @@ migrate_profiles (GSettings *global_settings,
-   TerminalSettingsList *list;
-   GConfClient *client;
-   GConfValue *value, *dvalue;
--  GSList *l;
-+  GSList *l, *def = NULL;
-   const char *default_profile;
- 
-   client = gconf_client_get_default ();
-@@ -491,15 +521,24 @@ migrate_profiles (GSettings *global_settings,
-       dvalue->type == GCONF_VALUE_STRING)
-     default_profile = gconf_value_get_string (dvalue);
-   else
--    default_profile = NULL;
-+    default_profile = "Default";
- 
-   list = terminal_profiles_list_new ();
- 
-   value = gconf_client_get (client, GCONF_GLOBAL_PREFIX "/profile_list", NULL);
-+  if (value == NULL) {
-+      value = gconf_value_new (GCONF_VALUE_LIST);
-+      gconf_value_set_list_type (value, GCONF_VALUE_STRING);
-+      def = g_slist_append(def, gconf_value_new_from_string(GCONF_VALUE_STRING,
-+                                                            "Default", NULL));
-+      gconf_value_set_list_nocopy (value, def);
-+  }
-   if (value != NULL &&
-       value->type == GCONF_VALUE_LIST &&
-       gconf_value_get_list_type (value) == GCONF_VALUE_STRING) {
-     for (l = gconf_value_get_list (value); l != NULL; l = l->next) {
-+      if (verbose)
-+          g_printerr ("Migrating %s\n", gconf_value_get_string (l->data));
-       migrate_profile (list, client,
-                        gconf_value_get_string (l->data),
-                        default_profile);
 diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
-index 2edecea..c8cac4b 100644
+index a4adc66..fef54da 100644
 --- a/src/org.gnome.Terminal.gschema.xml
 +++ b/src/org.gnome.Terminal.gschema.xml
 @@ -400,6 +400,20 @@
@@ -291,10 +200,10 @@ index 6259aac..95aeb84 100644
                                      </child>
                                    </object>
 diff --git a/src/profile-editor.c b/src/profile-editor.c
-index c93a191..6229cb0 100644
+index eaad918..72759a1 100644
 --- a/src/profile-editor.c
 +++ b/src/profile-editor.c
-@@ -1325,6 +1325,25 @@ profile_prefs_load (const char *uuid, GSettings *profile)
+@@ -1254,6 +1254,25 @@ profile_prefs_load (const char *uuid, GSettings *profile)
                                 w,
                                 "active-id",
                                 G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
@@ -336,10 +245,10 @@ index 46ed321..24cf4ab 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 d104e30..e3bce1a 100644
+index 7f99718..76a7c06 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -642,6 +642,11 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -599,6 +599,11 @@ terminal_screen_class_init (TerminalScreenClass *klass)
  
    g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate));
  
@@ -351,7 +260,7 @@ index d104e30..e3bce1a 100644
    n_url_regexes = G_N_ELEMENTS (url_regex_patterns);
    precompile_regexes (url_regex_patterns, n_url_regexes, &url_regexes, &url_regex_flavors);
    n_extra_regexes = G_N_ELEMENTS (extra_regex_patterns);
-@@ -903,7 +908,10 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -857,7 +862,10 @@ 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) ||
@@ -363,7 +272,7 @@ index d104e30..e3bce1a 100644
      update_color_scheme (screen);
  
    if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
-@@ -981,6 +989,9 @@ update_color_scheme (TerminalScreen *screen)
+@@ -935,6 +943,9 @@ update_color_scheme (TerminalScreen *screen)
    GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL;
    GtkStyleContext *context;
    gboolean use_theme_colors;
@@ -373,7 +282,7 @@ index d104e30..e3bce1a 100644
  
    context = gtk_widget_get_style_context (widget);
    gtk_style_context_get_color (context, gtk_style_context_get_state (context), &theme_fg);
-@@ -1032,6 +1043,31 @@ update_color_scheme (TerminalScreen *screen)
+@@ -986,6 +997,31 @@ update_color_scheme (TerminalScreen *screen)
      }
  
    colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors);
@@ -405,7 +314,7 @@ index d104e30..e3bce1a 100644
    vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg,
                             colors, n_colors);
    vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp);
-@@ -1039,6 +1075,10 @@ update_color_scheme (TerminalScreen *screen)
+@@ -993,6 +1029,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);
@@ -417,10 +326,10 @@ index d104e30..e3bce1a 100644
  
  static void
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 461ceb5..3caccb6 100644
+index 91fa09d..ea4b667 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -2013,6 +2013,26 @@ terminal_window_realize (GtkWidget *widget)
+@@ -1944,6 +1944,26 @@ terminal_window_realize (GtkWidget *widget)
    terminal_window_update_size (window);
  }
  
@@ -447,7 +356,7 @@ index 461ceb5..3caccb6 100644
  static gboolean
  terminal_window_state_event (GtkWidget            *widget,
                               GdkEventWindowState  *event)
-@@ -2157,6 +2177,8 @@ terminal_window_init (TerminalWindow *window)
+@@ -2088,6 +2108,8 @@ terminal_window_init (TerminalWindow *window)
    };
    TerminalWindowPrivate *priv;
    TerminalApp *app;
@@ -456,7 +365,7 @@ index 461ceb5..3caccb6 100644
    GSettings *gtk_debug_settings;
    GtkWindowGroup *window_group;
    //  GtkAccelGroup *accel_group;
-@@ -2171,6 +2193,11 @@ terminal_window_init (TerminalWindow *window)
+@@ -2102,6 +2124,11 @@ terminal_window_init (TerminalWindow *window)
  
    gtk_widget_init_template (GTK_WIDGET (window));
  
@@ -468,7 +377,7 @@ index 461ceb5..3caccb6 100644
    uuid_generate (u);
    uuid_unparse (u, uuidstr);
    priv->uuid = g_strdup (uuidstr);
-@@ -2317,6 +2344,7 @@ terminal_window_class_init (TerminalWindowClass *klass)
+@@ -2248,6 +2275,7 @@ terminal_window_class_init (TerminalWindowClass *klass)
  
    widget_class->show = terminal_window_show;
    widget_class->realize = terminal_window_realize;
diff --git a/debian/patches/0001-screen-window-Extra-padding-around-transparent-termi.patch b/debian/patches/0001-screen-window-Extra-padding-around-transparent-termi.patch
index 298a46e..db53927 100644
--- a/debian/patches/0001-screen-window-Extra-padding-around-transparent-termi.patch
+++ b/debian/patches/0001-screen-window-Extra-padding-around-transparent-termi.patch
@@ -10,10 +10,10 @@ 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 c36f3d9..b5ae0da 100644
+index a7082ab..bc5e36e 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -143,6 +143,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *,
+@@ -141,6 +141,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *,
  static gboolean terminal_screen_popup_menu (GtkWidget *widget);
  static gboolean terminal_screen_button_press (GtkWidget *widget,
                                                GdkEventButton *event);
@@ -22,7 +22,7 @@ index c36f3d9..b5ae0da 100644
  static gboolean terminal_screen_do_exec (TerminalScreen *screen,
                                           FDSetupData    *data,
                                           GError **error);
-@@ -568,6 +570,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -539,6 +541,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;
@@ -30,7 +30,7 @@ index c36f3d9..b5ae0da 100644
  
    terminal_class->child_exited = terminal_screen_child_exited;
  
-@@ -980,6 +983,32 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
+@@ -934,6 +937,32 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
    g_object_thaw_notify (object);
  }
  
@@ -63,7 +63,7 @@ index c36f3d9..b5ae0da 100644
  static void
  update_color_scheme (TerminalScreen *screen)
  {
-@@ -1083,9 +1112,7 @@ update_color_scheme (TerminalScreen *screen)
+@@ -1037,9 +1066,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);
  
@@ -74,7 +74,7 @@ index c36f3d9..b5ae0da 100644
  }
  
  static void
-@@ -1690,6 +1717,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
+@@ -1644,6 +1671,13 @@ terminal_screen_do_popup (TerminalScreen *screen,
    terminal_screen_popup_info_unref (info);
  }
  
@@ -89,10 +89,10 @@ index c36f3d9..b5ae0da 100644
  terminal_screen_button_press (GtkWidget      *widget,
                                GdkEventButton *event)
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 3caccb6..a9de5d5 100644
+index ea4b667..ae60543 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -2019,15 +2019,21 @@ terminal_window_draw (GtkWidget *widget,
+@@ -1950,15 +1950,21 @@ terminal_window_draw (GtkWidget *widget,
  {
    if (gtk_widget_get_app_paintable (widget))
      {
diff --git a/debian/patches/01_onlyshowin.patch b/debian/patches/01_onlyshowin.patch
index d66d689..d900a0b 100644
--- a/debian/patches/01_onlyshowin.patch
+++ b/debian/patches/01_onlyshowin.patch
@@ -7,11 +7,14 @@ Subject: Only show gnome-terminal in GNOME menus
  1 file changed, 1 insertion(+)
 
 diff --git a/org.gnome.Terminal.desktop.in.in b/org.gnome.Terminal.desktop.in.in
-index 98ad8f9..5904afa 100644
+index da5c9be..8070405 100644
 --- a/org.gnome.Terminal.desktop.in.in
 +++ b/org.gnome.Terminal.desktop.in.in
-@@ -14,3 +14,4 @@ X-GNOME-Bugzilla-Version=@VERSION@
+@@ -14,6 +14,7 @@ X-GNOME-Bugzilla-Version=@VERSION@
  Categories=GNOME;GTK;System;TerminalEmulator;
  StartupNotify=true
  X-GNOME-SingleWindow=false
 +OnlyShowIn=GNOME;Unity;
+ Actions=new-window;preferences;
+ 
+ [Desktop Action new-window]
diff --git a/debian/patches/50_add_unity_quicklist.patch b/debian/patches/50_add_unity_quicklist.patch
deleted file mode 100644
index 40c5928..0000000
--- a/debian/patches/50_add_unity_quicklist.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Didier Roche <[e-mail]>
-Date: Sat, 20 Jan 2018 18:48:39 -0500
-Subject: Add Unity static quicklist support to gnome-terminal
-
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=651531
----
- org.gnome.Terminal.desktop.in.in | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/org.gnome.Terminal.desktop.in.in b/org.gnome.Terminal.desktop.in.in
-index 5904afa..1b739bd 100644
---- a/org.gnome.Terminal.desktop.in.in
-+++ b/org.gnome.Terminal.desktop.in.in
-@@ -15,3 +15,8 @@ Categories=GNOME;GTK;System;TerminalEmulator;
- StartupNotify=true
- X-GNOME-SingleWindow=false
- OnlyShowIn=GNOME;Unity;
-+Actions=new-window
-+
-+[Desktop Action new-window]
-+_Name=New Terminal
-+Exec=gnome-terminal
diff --git a/debian/patches/60_add_lp_handler.patch b/debian/patches/60_add_lp_handler.patch
index 78449ba..fe8ad4c 100644
--- a/debian/patches/60_add_lp_handler.patch
+++ b/debian/patches/60_add_lp_handler.patch
@@ -25,10 +25,10 @@ index 83ad417..f0ee427 100644
  
  #endif /* !TERMINAL_REGEX_H */
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index b5ae0da..9d9bc83 100644
+index bc5e36e..e42c401 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -185,6 +185,7 @@ static const TerminalRegexPattern url_regex_patterns[] = {
+@@ -181,6 +181,7 @@ static const TerminalRegexPattern url_regex_patterns[] = {
    { REGEX_URL_VOIP,  FLAVOR_VOIP_CALL },
    { REGEX_EMAIL,     FLAVOR_EMAIL },
    { REGEX_NEWS_MAN,  FLAVOR_AS_IS },
@@ -37,7 +37,7 @@ index b5ae0da..9d9bc83 100644
  
  static const TerminalRegexPattern extra_regex_patterns[] = {
 diff --git a/src/terminal-screen.h b/src/terminal-screen.h
-index 743071d..ff19f7e 100644
+index ff77fcf..501d2ce 100644
 --- a/src/terminal-screen.h
 +++ b/src/terminal-screen.h
 @@ -32,6 +32,7 @@ typedef enum {
@@ -97,10 +97,10 @@ index abd34fd..a7de59f 100644
  
  char *terminal_util_concat_uris (char **uris,
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index a9de5d5..6470347 100644
+index ae60543..f09227d 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -1020,7 +1020,17 @@ action_copy_match_cb (GSimpleAction *action,
+@@ -1009,7 +1009,17 @@ action_copy_match_cb (GSimpleAction *action,
    if (info->url == NULL)
      return;
  
@@ -119,7 +119,7 @@ index a9de5d5..6470347 100644
  }
  
  static void
-@@ -1785,6 +1795,7 @@ screen_show_popup_menu_cb (TerminalScreen *screen,
+@@ -1720,6 +1730,7 @@ screen_show_popup_menu_cb (TerminalScreen *screen,
        break;
      case FLAVOR_AS_IS:
      case FLAVOR_DEFAULT_TO_HTTP:
diff --git a/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch b/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch
index 9d4773c..fabfca1 100644
--- a/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch
+++ b/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch
@@ -24,10 +24,10 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683744
  1 file changed, 11 insertions(+)
 
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 2b1f825..9965171 100644
+index a85fcef..a4da042 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -929,6 +929,17 @@ update_color_scheme (TerminalScreen *screen)
+@@ -883,6 +883,17 @@ update_color_scheme (TerminalScreen *screen)
    gtk_style_context_get_color (context, gtk_style_context_get_state (context), &theme_fg);
    gtk_style_context_get_background_color (context, gtk_style_context_get_state (context), &theme_bg);
  
diff --git a/debian/patches/Provide-fallback-for-reading-current-directory-if-OS.patch b/debian/patches/Provide-fallback-for-reading-current-directory-if-OS.patch
index e0fcf7c..0291883 100644
--- a/debian/patches/Provide-fallback-for-reading-current-directory-if-OS.patch
+++ b/debian/patches/Provide-fallback-for-reading-current-directory-if-OS.patch
@@ -10,10 +10,10 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=712628
  1 file changed, 66 insertions(+)
 
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 9965171..d104e30 100644
+index a4da042..7f99718 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -226,6 +226,63 @@ fake_dup3 (int fd, int fd2, int flags)
+@@ -208,6 +208,63 @@ fake_dup3 (int fd, int fd2, int flags)
  
  G_DEFINE_TYPE (TerminalScreen, terminal_screen, VTE_TYPE_TERMINAL)
  
@@ -77,7 +77,7 @@ index 9965171..d104e30 100644
  static void
  free_tag_data (TagData *tagdata)
  {
-@@ -1682,12 +1739,21 @@ terminal_screen_button_press (GtkWidget      *widget,
+@@ -1636,12 +1693,21 @@ terminal_screen_button_press (GtkWidget      *widget,
  char *
  terminal_screen_get_current_dir (TerminalScreen *screen)
  {
diff --git a/debian/patches/app-Make-new-terminal-menu-a-hidden-pref.patch b/debian/patches/app-Make-new-terminal-menu-a-hidden-pref.patch
new file mode 100644
index 0000000..44c28a6
--- /dev/null
+++ b/debian/patches/app-Make-new-terminal-menu-a-hidden-pref.patch
@@ -0,0 +1,195 @@
+From: Christian Persch <[e-mail]>
+Date: Fri, 7 Sep 2018 21:10:37 +0200
+Subject: app: Make new-terminal menu a hidden pref
+
+Some distributions ship a gnome-terminal that changes the
+new-terminal menu via conditionally compiled code. That makes
+it impossible for the user to change back to the upstream
+behaviour.
+
+Instead, add a hidden pref that distributions can set
+via a gsettings override, and users can change back to
+the default.
+
+https://gitlab.gnome.org/GNOME/gnome-terminal/issues/30
+(cherry picked from commit 30efce621ad04276771aa311f52731b468c4adfd)
+---
+ src/org.gnome.Terminal.gschema.xml |  4 ++++
+ src/terminal-app.c                 | 38 +++++++++++++++++++++++++++++---------
+ src/terminal-app.h                 |  2 ++
+ src/terminal-schemas.h             |  1 +
+ src/terminal-window.c              | 30 +++++++++++++++---------------
+ 5 files changed, 51 insertions(+), 24 deletions(-)
+
+diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
+index a4adc66..945b0bd 100644
+--- a/src/org.gnome.Terminal.gschema.xml
++++ b/src/org.gnome.Terminal.gschema.xml
+@@ -741,6 +741,10 @@
+       <summary>Which theme variant to use</summary>
+     </key>
+ 
++    <key name="unified-menu" type="b">
++      <default>true</default>
++    </key>
++
+    <!-- <child name="profiles" schema="org.gnome.Terminal.ProfilesList" /> -->
+ 
+    <child name="keybindings" schema="org.gnome.Terminal.Legacy.Keybindings" />
+diff --git a/src/terminal-app.c b/src/terminal-app.c
+index 1c251f5..f8e290d 100644
+--- a/src/terminal-app.c
++++ b/src/terminal-app.c
+@@ -65,6 +65,10 @@
+ #define GTK_DEBUG_ENABLE_INSPECTOR_KEY          "enable-inspector-keybinding"
+ #define GTK_DEBUG_ENABLE_INSPECTOR_TYPE         G_VARIANT_TYPE_BOOLEAN
+ 
++#ifdef DISUNIFY_NEW_TERMINAL_SECTION
++#error Use a gsettings override instead
++#endif
++
+ /*
+  * Session state is stored entirely in the RestartCommand command line.
+  *
+@@ -109,6 +113,8 @@ struct _TerminalApp
+   GtkClipboard *clipboard;
+   GdkAtom *clipboard_targets;
+   int n_clipboard_targets;
++
++  gboolean unified_menu;
+ };
+ 
+ enum
+@@ -426,16 +432,17 @@ append_new_terminal_item (GMenu *section,
+ }
+ 
+ static void
+-fill_new_terminal_section (GMenu *section,
++fill_new_terminal_section (TerminalApp *app,
++                           GMenu *section,
+                            ProfileData *profiles,
+                            guint n_profiles)
+ {
+-#ifndef DISUNIFY_NEW_TERMINAL_SECTION
+-  append_new_terminal_item (section, _("New _Terminal"), "default", profiles, n_profiles);
+-#else
+-  append_new_terminal_item (section, _("New _Tab"), "tab", profiles, n_profiles);
+-  append_new_terminal_item (section, _("New _Window"), "window", profiles, n_profiles);
+-#endif
++  if (terminal_app_get_menu_unified (app)) {
++    append_new_terminal_item (section, _("New _Terminal"), "default", profiles, n_profiles);
++  } else {
++    append_new_terminal_item (section, _("New _Tab"), "tab", profiles, n_profiles);
++    append_new_terminal_item (section, _("New _Window"), "window", profiles, n_profiles);
++  }
+ }
+ 
+ static GMenu *
+@@ -477,7 +484,7 @@ terminal_app_update_profile_menus (TerminalApp *app)
+   ProfileData *profiles = (ProfileData*) array->data;
+   guint n_profiles = array->len;
+ 
+-  fill_new_terminal_section (app->menubar_new_terminal_section, profiles, n_profiles);
++  fill_new_terminal_section (app, app->menubar_new_terminal_section, profiles, n_profiles);
+ 
+   app->set_profile_menu = set_profile_submenu_new (profiles, n_profiles);
+ 
+@@ -641,7 +648,7 @@ terminal_app_startup (GApplication *application)
+   /* App menu */
+   GMenu *appmenu_new_terminal_section = gtk_application_get_menu_by_id (gtk_application,
+                                                                         "new-terminal-section");
+-  fill_new_terminal_section (appmenu_new_terminal_section, NULL, 0); /* no submenu */
++  fill_new_terminal_section (app, appmenu_new_terminal_section, NULL, 0); /* no submenu */
+ 
+   /* Menubar */
+   /* If the menubar is shown by the shell, omit mnemonics for the submenus. This is because Alt+F etc.
+@@ -703,6 +710,11 @@ terminal_app_init (TerminalApp *app)
+                                                      GTK_DEBUG_ENABLE_INSPECTOR_KEY,
+                                                      GTK_DEBUG_ENABLE_INSPECTOR_TYPE);
+ 
++  /* This is an internal setting that exists only for distributions
++   * to override, so we cache it on startup and don't react to changes.
++   */
++  app->unified_menu = g_settings_get_boolean (app->global_settings, TERMINAL_SETTING_UNIFIED_MENU);
++
+ #if GTK_CHECK_VERSION (3, 19, 0)
+   GtkSettings *gtk_settings = gtk_settings_get_default ();
+   terminal_app_theme_variant_changed_cb (app->global_settings,
+@@ -1152,3 +1164,11 @@ terminal_app_get_object_manager (TerminalApp *app)
+   g_warn_if_fail (app->object_manager != NULL);
+   return app->object_manager;
+ }
++
++gboolean
++terminal_app_get_menu_unified (TerminalApp *app)
++{
++  g_return_val_if_fail (TERMINAL_IS_APP (app), TRUE);
++
++  return app->unified_menu;
++}
+diff --git a/src/terminal-app.h b/src/terminal-app.h
+index f29d766..efceda9 100644
+--- a/src/terminal-app.h
++++ b/src/terminal-app.h
+@@ -103,6 +103,8 @@ GMenuModel *terminal_app_get_menubar (TerminalApp *app);
+ 
+ GMenuModel *terminal_app_get_profile_section (TerminalApp *app);
+ 
++gboolean terminal_app_get_menu_unified (TerminalApp *app);
++
+ /* GSettings */
+ 
+ GSettings *terminal_app_get_global_settings (TerminalApp *app);
+diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
+index 46ed321..5b0d8c3 100644
+--- a/src/terminal-schemas.h
++++ b/src/terminal-schemas.h
+@@ -84,6 +84,7 @@ G_BEGIN_DECLS
+ #define TERMINAL_SETTING_TAB_POLICY_KEY                 "tab-policy"
+ #define TERMINAL_SETTING_TAB_POSITION_KEY               "tab-position"
+ #define TERMINAL_SETTING_THEME_VARIANT_KEY              "theme-variant"
++#define TERMINAL_SETTING_UNIFIED_MENU                   "unified-menu"
+ 
+ #define TERMINAL_SETTINGS_LIST_LIST_KEY                 "list"
+ #define TERMINAL_SETTINGS_LIST_DEFAULT_KEY              "default"
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index 91fa09d..4ed3647 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -1771,21 +1771,21 @@ screen_show_popup_menu_cb (TerminalScreen *screen,
+ 
+   /* New Terminal section */
+   gs_unref_object GMenu *section6 = g_menu_new ();
+-#ifndef DISUNIFY_NEW_TERMINAL_SECTION
+-  gs_unref_object GMenuItem *item6 = g_menu_item_new (_("New _Terminal"), NULL);
+-  g_menu_item_set_action_and_target (item6, "win.new-terminal",
+-                                     "(ss)", "default", "current");
+-  g_menu_append_item (section6, item6);
+-#else
+-  gs_unref_object GMenuItem *item61 = g_menu_item_new (_("New _Window"), NULL);
+-  g_menu_item_set_action_and_target (item61, "win.new-terminal",
+-                                     "(ss)", "window", "current");
+-  g_menu_append_item (section6, item61);
+-  gs_unref_object GMenuItem *item62 = g_menu_item_new (_("New _Tab"), NULL);
+-  g_menu_item_set_action_and_target (item62, "win.new-terminal",
+-                                     "(ss)", "tab", "current");
+-  g_menu_append_item (section6, item62);
+-#endif
++  if (terminal_app_get_menu_unified (app)) {
++    gs_unref_object GMenuItem *item6 = g_menu_item_new (_("New _Terminal"), NULL);
++    g_menu_item_set_action_and_target (item6, "win.new-terminal",
++                                       "(ss)", "default", "current");
++    g_menu_append_item (section6, item6);
++  } else {
++    gs_unref_object GMenuItem *item61 = g_menu_item_new (_("New _Window"), NULL);
++    g_menu_item_set_action_and_target (item61, "win.new-terminal",
++                                       "(ss)", "window", "current");
++    g_menu_append_item (section6, item61);
++    gs_unref_object GMenuItem *item62 = g_menu_item_new (_("New _Tab"), NULL);
++    g_menu_item_set_action_and_target (item62, "win.new-terminal",
++                                       "(ss)", "tab", "current");
++    g_menu_append_item (section6, item62);
++  }
+   g_menu_append_section (menu, NULL, G_MENU_MODEL (section6));
+ 
+   /* Window section */
diff --git a/debian/patches/nautilus-x11.patch b/debian/patches/nautilus-x11.patch
index a433fa1..dcd92c0 100644
--- a/debian/patches/nautilus-x11.patch
+++ b/debian/patches/nautilus-x11.patch
@@ -16,10 +16,10 @@ collect2: error: ld returned 1 exit status
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 696c757..081857f 100644
+index d51740e..0751868 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -226,7 +226,8 @@ if test "$with_nautilus_extension" = "yes"; then
+@@ -202,7 +202,8 @@ if test "$with_nautilus_extension" = "yes"; then
    PKG_CHECK_MODULES([NAUTILUS],[
      libnautilus-extension >= $NAUTILUS_REQUIRED
      gio-2.0
diff --git a/debian/patches/revert-pcre2.patch b/debian/patches/revert-pcre2.patch
index 0543e1f..db8c34e 100644
--- a/debian/patches/revert-pcre2.patch
+++ b/debian/patches/revert-pcre2.patch
@@ -10,14 +10,14 @@ https://git.gnome.org/browse/gnome-terminal/commit/?id=ef7a345f
 https://git.gnome.org/browse/gnome-terminal/commit/?id=45bcfb8d
 ---
  configure.ac                  | 26 +++++++++++++++++++++++--
- src/terminal-screen.c         | 35 ++++++++++++++++++++++++++++++++-
- src/terminal-search-popover.c | 45 ++++++++++++++++++++++++++++++++++++++++---
+ src/terminal-screen.c         | 35 +++++++++++++++++++++++++++++++++-
+ src/terminal-search-popover.c | 44 +++++++++++++++++++++++++++++++++++++++++--
  src/terminal-search-popover.h |  4 ++++
- src/terminal-window.c         | 16 +++++++++++++++
- 5 files changed, 120 insertions(+), 6 deletions(-)
+ src/terminal-window.c         | 16 ++++++++++++++++
+ 5 files changed, 120 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 081857f..3bd58f9 100644
+index 0751868..29491da 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -81,6 +81,27 @@ for target in $($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION); do
@@ -59,7 +59,7 @@ index 081857f..3bd58f9 100644
  
  # ****
  # DBus
-@@ -343,6 +364,7 @@ gnome-terminal-$VERSION:
+@@ -319,6 +340,7 @@ gnome-terminal-$VERSION:
        prefix:                 ${prefix}
        source code location:   ${srcdir}
        compiler:               ${CC}
@@ -68,7 +68,7 @@ index 081857f..3bd58f9 100644
        DBus interface dir:     ${dbusinterfacedir}
        DBus service dir:       ${dbusservicedir}
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 1c677a0..71ef761 100644
+index 2cbc4c2..4a99678 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
 @@ -18,7 +18,10 @@
@@ -82,7 +82,7 @@ index 1c677a0..71ef761 100644
  #include "terminal-regex.h"
  #include "terminal-screen.h"
  
-@@ -196,8 +199,13 @@ static const TerminalRegexPattern extra_regex_patterns[] = {
+@@ -192,8 +195,13 @@ static const TerminalRegexPattern extra_regex_patterns[] = {
    { "(0[Xx][[:xdigit:]]+|[[:digit:]]+)", FLAVOR_NUMBER },
  };
  
@@ -96,7 +96,7 @@ index 1c677a0..71ef761 100644
  static TerminalURLFlavor *url_regex_flavors;
  static TerminalURLFlavor *extra_regex_flavors;
  static guint n_url_regexes;
-@@ -301,18 +309,27 @@ free_tag_data (TagData *tagdata)
+@@ -283,18 +291,27 @@ free_tag_data (TagData *tagdata)
  static void
  precompile_regexes (const TerminalRegexPattern *regex_patterns,
                      guint n_regexes,
@@ -124,7 +124,7 @@ index 1c677a0..71ef761 100644
        (*regexes)[i] = vte_regex_new_for_match (regex_patterns[i].pattern, -1,
                                                 PCRE2_UTF | PCRE2_NO_UTF_CHECK | PCRE2_MULTILINE,
                                                 &error);
-@@ -323,6 +340,13 @@ precompile_regexes (const TerminalRegexPattern *regex_patterns,
+@@ -305,6 +322,13 @@ precompile_regexes (const TerminalRegexPattern *regex_patterns,
          g_printerr ("Failed to JIT regex '%s': %s\n", regex_patterns[i].pattern, error->message);
          g_clear_error (&error);
        }
@@ -138,7 +138,7 @@ index 1c677a0..71ef761 100644
  
        (*regex_flavors)[i] = regex_patterns[i].flavor;
      }
-@@ -455,7 +479,11 @@ terminal_screen_init (TerminalScreen *screen)
+@@ -437,7 +461,11 @@ terminal_screen_init (TerminalScreen *screen)
  
        tag_data = g_slice_new (TagData);
        tag_data->flavor = url_regex_flavors[i];
@@ -150,7 +150,7 @@ index 1c677a0..71ef761 100644
        vte_terminal_match_set_cursor_type (terminal, tag_data->tag, URL_MATCH_CURSOR);
  
        priv->match_tags = g_slist_prepend (priv->match_tags, tag_data);
-@@ -2241,7 +2269,12 @@ terminal_screen_check_extra (TerminalScreen *screen,
+@@ -2191,7 +2219,12 @@ terminal_screen_check_extra (TerminalScreen *screen,
    memset(matches, 0, sizeof(char*) * n_extra_regexes);
  
    if (
@@ -165,7 +165,7 @@ index 1c677a0..71ef761 100644
                                               extra_regexes,
                                               n_extra_regexes,
 diff --git a/src/terminal-search-popover.c b/src/terminal-search-popover.c
-index 81979b2..ea57e2c 100644
+index 8d814cf..05e36b4 100644
 --- a/src/terminal-search-popover.c
 +++ b/src/terminal-search-popover.c
 @@ -23,7 +23,10 @@
@@ -259,16 +259,15 @@ index 81979b2..ea57e2c 100644
      if (priv->regex != NULL)
        gs_transfer_out_value (&priv->regex_pattern, &pattern);
    } else {
-@@ -350,7 +377,7 @@ terminal_search_popover_init (TerminalSearchPopover *popover)
-   GtkWidget *widget = GTK_WIDGET (popover);
+@@ -353,6 +380,7 @@ terminal_search_popover_init (TerminalSearchPopover *popover)
  
    priv->regex_pattern = 0;
--  priv->regex_caseless = FALSE;
-+  priv->regex_caseless = priv->regex_multiline = FALSE;
+   priv->regex_caseless = TRUE;
++  priv->regex_multiline = FALSE;
  
    gtk_widget_init_template (widget);
  
-@@ -418,7 +445,11 @@ terminal_search_popover_finalize (GObject *object)
+@@ -420,7 +448,11 @@ terminal_search_popover_finalize (GObject *object)
    TerminalSearchPopoverPrivate *priv = PRIV (popover);
  
    if (priv->regex) {
@@ -280,7 +279,7 @@ index 81979b2..ea57e2c 100644
    }
  
    g_free (priv->regex_pattern);
-@@ -487,7 +518,11 @@ terminal_search_popover_class_init (TerminalSearchPopoverClass *klass)
+@@ -489,7 +521,11 @@ terminal_search_popover_class_init (TerminalSearchPopoverClass *klass)
  
    pspecs[PROP_REGEX] =
      g_param_spec_boxed ("regex", NULL, NULL,
@@ -292,7 +291,7 @@ index 81979b2..ea57e2c 100644
                          G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
  
    pspecs[PROP_WRAP_AROUND] =
-@@ -535,7 +570,11 @@ terminal_search_popover_new (GtkWidget *relative_to_widget)
+@@ -537,7 +573,11 @@ terminal_search_popover_new (GtkWidget *relative_to_widget)
   *
   * Returns: (transfer none): the search regex, or %NULL
   */
@@ -321,10 +320,10 @@ index 10771d9..813f0f3 100644
  
  gboolean terminal_search_popover_get_wrap_around (TerminalSearchPopover *popover);
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 6470347..e15dfa7 100644
+index f09227d..d89b3ae 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
-@@ -1109,13 +1109,21 @@ search_popover_notify_regex_cb (TerminalSearchPopover *popover,
+@@ -1098,13 +1098,21 @@ search_popover_notify_regex_cb (TerminalSearchPopover *popover,
                                  TerminalWindow *window)
  {
    TerminalWindowPrivate *priv = window->priv;
@@ -346,7 +345,7 @@ index 6470347..e15dfa7 100644
  
    terminal_window_update_search_sensitivity (priv->active_screen, window);
  }
-@@ -1211,7 +1219,11 @@ action_find_clear_cb (GSimpleAction *action,
+@@ -1200,7 +1208,11 @@ action_find_clear_cb (GSimpleAction *action,
    if (priv->active_screen == NULL)
      return;
  
@@ -358,7 +357,7 @@ index 6470347..e15dfa7 100644
    vte_terminal_unselect_all (VTE_TERMINAL (priv->active_screen));
  }
  
-@@ -1606,7 +1618,11 @@ terminal_window_update_search_sensitivity (TerminalScreen *screen,
+@@ -1541,7 +1553,11 @@ terminal_window_update_search_sensitivity (TerminalScreen *screen,
    if (screen != priv->active_screen)
      return;
  
diff --git a/debian/patches/scrollbar-background-theming.patch b/debian/patches/scrollbar-background-theming.patch
index 8c902c8..ea138f2 100644
--- a/debian/patches/scrollbar-background-theming.patch
+++ b/debian/patches/scrollbar-background-theming.patch
@@ -68,7 +68,7 @@ index 73d9b06..5a9b8de 100644
  
  static void
 diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index 9d9bc83..1c677a0 100644
+index e42c401..2cbc4c2 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
 @@ -94,6 +94,8 @@ struct _TerminalScreenPrivate
@@ -80,9 +80,9 @@ index 9d9bc83..1c677a0 100644
  };
  
  enum
-@@ -111,7 +113,9 @@ enum {
-   PROP_ICON_TITLE,
-   PROP_ICON_TITLE_SET,
+@@ -109,7 +111,9 @@ enum {
+   PROP_0,
+   PROP_PROFILE,
    PROP_TITLE,
 -  PROP_INITIAL_ENVIRONMENT
 +  PROP_INITIAL_ENVIRONMENT,
@@ -91,7 +91,7 @@ index 9d9bc83..1c677a0 100644
  };
  
  enum
-@@ -520,6 +524,12 @@ terminal_screen_get_property (GObject *object,
+@@ -493,6 +497,12 @@ terminal_screen_get_property (GObject *object,
        case PROP_TITLE:
          g_value_set_string (value, terminal_screen_get_title (screen));
          break;
@@ -104,16 +104,16 @@ index 9d9bc83..1c677a0 100644
        default:
          G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
          break;
-@@ -545,6 +555,8 @@ terminal_screen_set_property (GObject *object,
-       case PROP_ICON_TITLE:
-       case PROP_ICON_TITLE_SET:
+@@ -516,6 +526,8 @@ terminal_screen_set_property (GObject *object,
+         terminal_screen_set_initial_environment (screen, g_value_get_boxed (value));
+         break;
        case PROP_TITLE:
 +      case PROP_FG_COLOR:
 +      case PROP_BG_COLOR:
          /* not writable */
        default:
          G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-@@ -651,6 +663,20 @@ terminal_screen_class_init (TerminalScreenClass *klass)
+@@ -608,6 +620,20 @@ terminal_screen_class_init (TerminalScreenClass *klass)
                           G_TYPE_STRV,
                           G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
  
@@ -134,8 +134,8 @@ index 9d9bc83..1c677a0 100644
    g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate));
  
    gtk_widget_class_install_style_property (widget_class,
-@@ -861,6 +887,22 @@ terminal_screen_get_icon_title_set (TerminalScreen *screen)
-   return vte_terminal_get_icon_title (VTE_TERMINAL (screen)) != NULL;
+@@ -815,6 +841,22 @@ terminal_screen_get_title (TerminalScreen *screen)
+   return vte_terminal_get_window_title (VTE_TERMINAL (screen));
  }
  
 +GdkRGBA*
@@ -157,7 +157,7 @@ index 9d9bc83..1c677a0 100644
  static void
  terminal_screen_profile_changed_cb (GSettings     *profile,
                                      const char    *prop_name,
-@@ -1113,6 +1155,18 @@ update_color_scheme (TerminalScreen *screen)
+@@ -1067,6 +1109,18 @@ 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);
  
@@ -177,13 +177,13 @@ index 9d9bc83..1c677a0 100644
  }
  
 diff --git a/src/terminal-screen.h b/src/terminal-screen.h
-index ff19f7e..ae45e76 100644
+index 501d2ce..0ee07b1 100644
 --- a/src/terminal-screen.h
 +++ b/src/terminal-screen.h
-@@ -107,6 +107,8 @@ char **      terminal_screen_get_initial_environment (TerminalScreen  *screen);
+@@ -105,6 +105,8 @@ void         terminal_screen_set_initial_environment (TerminalScreen  *screen,
+ char **      terminal_screen_get_initial_environment (TerminalScreen  *screen);
+ 
  const char* terminal_screen_get_title          (TerminalScreen *screen);
- const char* terminal_screen_get_icon_title     (TerminalScreen *screen);
- gboolean    terminal_screen_get_icon_title_set (TerminalScreen *screen);
 +GdkRGBA*    terminal_screen_get_bg_color       (TerminalScreen *screen);
 +GdkRGBA*    terminal_screen_get_fg_color       (TerminalScreen *screen);
  
diff --git a/debian/patches/series b/debian/patches/series
index 8052e68..1c3a32a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,8 +6,8 @@ Provide-fallback-for-reading-current-directory-if-OS.patch
 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch
 0001-screen-window-Extra-padding-around-transparent-termi.patch
 0006-fix-invalid-appstream-metadata.patch
-50_add_unity_quicklist.patch
 52_support_apturl.patch
 60_add_lp_handler.patch
 scrollbar-background-theming.patch
 revert-pcre2.patch
+app-Make-new-terminal-menu-a-hidden-pref.patch
diff --git a/debian/rules b/debian/rules
index 8c2a3da..ee377d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,6 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
 
-# Needed for File > New Tab menu item https://launchpad.net/bugs/1747171
-export DEB_CFLAGS_MAINT_APPEND = -DDISUNIFY_NEW_TERMINAL_SECTION
-
 %:
 	dh $@ --with gnome
 
@@ -19,7 +16,6 @@ endif
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--libexecdir=\$${prefix}/lib/gnome-terminal \
-		--disable-migration \
 		$(CONFFLAGS)
 
 override_dh_auto_build:
@@ -38,9 +34,6 @@ override_dh_install:
 		$(CURDIR)/debian/gnome-terminal/usr/bin/gnome-terminal.real
 	install -m0755 $(CURDIR)/debian/gnome-terminal.wrap \
 		$(CURDIR)/debian/gnome-terminal/usr/bin/gnome-terminal
-	pkg-gnome-compat-desktop-file \
-                $(CURDIR)/debian/gnome-terminal/usr/share/applications/org.gnome.Terminal.desktop \
-		$(CURDIR)/debian/gnome-terminal/usr/share/applications/gnome-terminal.desktop
 
 override_dh_missing:
 	dh_missing --fail-missing
diff --git a/help/Makefile.in b/help/Makefile.in
index 467b0ad..fa948a7 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -197,8 +197,6 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
-MIGRATOR_CFLAGS = @MIGRATOR_CFLAGS@
-MIGRATOR_LIBS = @MIGRATOR_LIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
diff --git a/help/es/es.po b/help/es/es.po
index 784821f..99b476f 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -1,28 +1,30 @@
 # translation of gnome-terminal-help.master.po to Español
 # spanish translation for gnome-terminal manual
 # Jorge González <[e-mail]>, 2007, 2008, 2009, 2010.
+# Rodrigo <[e-mail]>, 2018.
 # Daniel Mustieles <[e-mail]>, 2011, 2012, 2013, 2014, 2015, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-terminal-help\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-12 20:58+0000\n"
-"PO-Revision-Date: 2018-03-13 09:45+0100\n"
+"POT-Creation-Date: 2018-08-09 10:49+0000\n"
+"PO-Revision-Date: 2018-08-10 13:53+0200\n"
 "Last-Translator: Daniel Mustieles <[e-mail]>\n"
 "Language-Team: es <[e-mail]>\n"
-"Language: \n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
-"Daniel Mustieles <[e-mail]>, 2012 - 2017\n"
+"Rodrigo Lledó <[e-mail]>, 2018\n"
+"Daniel Mustieles <[e-mail]>, 2012 - 2018\n"
 "Jorge González <[e-mail]>, 2007-2010\n"
 "Francisco Javier F. Serrador <[e-mail]>, 2001-2006\n"
 "Pablo Gonzalo del Campo, 2000"
@@ -31,13 +33,13 @@ msgstr ""
 #: C/adv-keyboard-shortcuts.page:13 C/app-colors.page:11 C/app-cursor.page:12
 #: C/app-fonts.page:11 C/app-fullscreen.page:11 C/app-terminal-sizes.page:11
 #: C/app-zoom.page:10 C/gs-execute-commands.page:14 C/gs-tabs.page:12
-#: C/index.page:12 C/introduction.page:12 C/overview.page:9
-#: C/pref-bell.page:11 C/pref-custom-exit.page:13
-#: C/pref-custom-command.page:14 C/pref-encoding.page:9
-#: C/pref-keyboard-access.page:12 C/pref-login-shell.page:12
-#: C/pref-menubar.page:13 C/pref-profiles.page:12 C/pref-scrolling.page:12
-#: C/prob-reset.page:11 C/txt-copy-paste.page:11 C/txt-links.page:10
-#: C/txt-save-text.page:10 C/txt-search.page:10 C/txt-select-text.page:13
+#: C/index.page:12 C/introduction.page:12 C/overview.page:9 C/pref-bell.page:11
+#: C/pref-custom-exit.page:13 C/pref-custom-command.page:14
+#: C/pref-encoding.page:9 C/pref-keyboard-access.page:12
+#: C/pref-login-shell.page:12 C/pref-menubar.page:13 C/pref-profiles.page:12
+#: C/pref-scrolling.page:12 C/prob-reset.page:11 C/txt-copy-paste.page:11
+#: C/txt-links.page:10 C/txt-save-text.page:10 C/txt-search.page:10
+#: C/txt-select-text.page:13
 msgid "Sindhu S"
 msgstr "Sindhu S"
 
@@ -48,14 +50,13 @@ msgstr "Sindhu S"
 #: C/app-cursor.page:24 C/app-fonts.page:13 C/app-fonts.page:18
 #: C/app-fonts.page:23 C/app-fullscreen.page:13 C/app-fullscreen.page:18
 #: C/app-fullscreen.page:23 C/app-terminal-sizes.page:13
-#: C/app-terminal-sizes.page:18 C/app-terminal-sizes.page:23
-#: C/app-zoom.page:12 C/app-zoom.page:17 C/app-zoom.page:22
-#: C/gs-execute-commands.page:16 C/gs-execute-commands.page:26
-#: C/gs-tabs.page:14 C/gs-tabs.page:24 C/index.page:14 C/index.page:19
-#: C/index.page:24 C/introduction.page:14 C/introduction.page:19
-#: C/introduction.page:24 C/overview.page:11 C/overview.page:16
-#: C/pref-bell.page:13 C/pref-bell.page:18 C/pref-bell.page:23
-#: C/pref-custom-exit.page:15 C/pref-custom-exit.page:25
+#: C/app-terminal-sizes.page:18 C/app-terminal-sizes.page:23 C/app-zoom.page:12
+#: C/app-zoom.page:17 C/app-zoom.page:22 C/gs-execute-commands.page:16
+#: C/gs-execute-commands.page:26 C/gs-tabs.page:14 C/gs-tabs.page:24
+#: C/index.page:14 C/index.page:19 C/index.page:24 C/introduction.page:14
+#: C/introduction.page:19 C/introduction.page:24 C/overview.page:11
+#: C/overview.page:16 C/pref-bell.page:13 C/pref-bell.page:18
+#: C/pref-bell.page:23 C/pref-custom-exit.page:15 C/pref-custom-exit.page:25
 #: C/pref-custom-command.page:16 C/pref-custom-command.page:26
 #: C/pref-encoding.page:11 C/pref-encoding.page:16 C/pref-encoding.page:21
 #: C/pref-keyboard-access.page:14 C/pref-keyboard-access.page:19
@@ -76,15 +77,13 @@ msgstr "2013"
 #: C/app-fonts.page:16 C/app-fullscreen.page:16 C/app-terminal-sizes.page:16
 #: C/app-zoom.page:15 C/gs-execute-commands.page:19 C/gs-tabs.page:17
 #: C/index.page:17 C/introduction.page:17 C/overview.page:14 C/pref.page:9
-#: C/pref-bell.page:16 C/pref-custom-exit.page:18
-#: C/pref-custom-command.page:19 C/pref-encoding.page:14
-#: C/pref-keyboard-access.page:17 C/pref-login-shell.page:17
-#: C/pref-menubar.page:18 C/pref-profiles.page:17
+#: C/pref-bell.page:16 C/pref-custom-exit.page:18 C/pref-custom-command.page:19
+#: C/pref-encoding.page:14 C/pref-keyboard-access.page:17
+#: C/pref-login-shell.page:17 C/pref-menubar.page:18 C/pref-profiles.page:17
 #: C/pref-profile-char-width.page:11 C/pref-profile-encoding.page:11
-#: C/pref-scrolling.page:17 C/pref-tab-window.page:13
-#: C/pref-user-input.page:10 C/prob-reset.page:16 C/txt-copy-paste.page:16
-#: C/txt-links.page:15 C/txt-save-text.page:15 C/txt-search.page:15
-#: C/txt-select-text.page:18
+#: C/pref-scrolling.page:17 C/pref-tab-window.page:13 C/pref-user-input.page:10
+#: C/prob-reset.page:16 C/txt-copy-paste.page:16 C/txt-links.page:15
+#: C/txt-save-text.page:15 C/txt-search.page:15 C/txt-select-text.page:18
 msgid "Ekaterina Gerasimova"
 msgstr "Ekaterina Gerasimova"
 
@@ -139,10 +138,10 @@ msgstr ""
 
 #. (itstool) path: item/p
 #: C/adv-keyboard-shortcuts.page:48 C/adv-keyboard-shortcuts.page:51
-#, fuzzy
-#| msgid "Check <gui style=\"checkbox\">Enable mnemonics</gui>."
 msgid "Make sure <gui style=\"checkbox\">Enable shortcuts</gui> is selected."
-msgstr "Marque <gui style=\"checkbox\">Activar los mnemónicos</gui>."
+msgstr ""
+"Asegúrese de que <gui style=\"checkbox\">Activar atajos</gui> está "
+"seleccionado."
 
 #. (itstool) path: item/p
 #: C/adv-keyboard-shortcuts.page:54
@@ -160,19 +159,14 @@ msgstr ""
 
 #. (itstool) path: item/p
 #: C/adv-keyboard-shortcuts.page:61
-#, fuzzy
-#| msgid ""
-#| "Press your desired shortcut key combination as you would enter it to use "
-#| "it. The keys that you can use include <key>Alt</key>, <key>Alt Gr</key>, "
-#| "<key>Ctrl</key>, <key>Shift</key>, number and letter keys."
 msgid ""
 "Press your desired shortcut key combination as you would enter it to use it. "
 "The keys that you can use include <key>Alt</key>, <key>Alt Gr</key>, "
 "<key>Ctrl</key>, <key>Shift</key>, <key>Super</key>, number and letter keys."
 msgstr ""
-"Escriba la combinación de teclas tal como lo haría para usarla. Las teclas "
-"que use pueden ser <key>Alt</key>, <key>Alt Gr</key>, <key>Ctrl</key>, "
-"<key>Mayús</key>, números y letras."
+"Escriba la combinación de teclas tal como lo haría al usarla. Puede usar las "
+"teclas <key>Alt</key>, <key>Alt Gr</key>, <key>Ctrl</key>, <key>Mayús</key>, "
+"<key>Súper</key>, números y letras."
 
 #. (itstool) path: note/p
 #: C/adv-keyboard-shortcuts.page:66
@@ -365,16 +359,12 @@ msgstr "<gui style=\"menu\">Buscar</gui> atajos"
 
 #. (itstool) path: section/p
 #: C/adv-keyboard-shortcuts.page:179
-#, fuzzy
-#| msgid ""
-#| "The default shortcuts for options under <gui style=\"menu\">File</gui> "
-#| "menu are:"
 msgid ""
 "The default shortcuts for options under <gui style=\"menu\">Find</gui> menu "
 "are:"
 msgstr ""
 "Los atajos predeterminados para las opciones del menú <gui style=\"menu"
-"\">Archivo</gui> son:"
+"\">Buscar</gui> son:"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:191
@@ -618,10 +608,8 @@ msgstr "<keyseq><key>Mayús</key><key>Av Pág</key></keyseq>"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:313
-#, fuzzy
-#| msgid "Scroll on output"
 msgid "Scroll to the top"
-msgstr "Desplazar en salida"
+msgstr "Desplazar hasta arriba"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:314
@@ -630,10 +618,8 @@ msgstr "<keyseq><key>Mayús</key><key>Inicio</key></keyseq>"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:317
-#, fuzzy
-#| msgid "Scroll on output"
 msgid "Scroll to the bottom"
-msgstr "Desplazar en salida"
+msgstr "Desplazar hasta abajo"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:318
@@ -746,10 +732,8 @@ msgstr "<keyseq><key>Alt</key><key>F</key></keyseq>"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:378
-#, fuzzy
-#| msgid "Delete from the cursor to the beginning of the line."
 msgid "Delete from the cursor to the beginning of the line"
-msgstr "Borrar desde el cursor hasta el principio de la línea."
+msgstr "Borrar desde el cursor hasta el principio de la línea"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:379
@@ -758,10 +742,8 @@ msgstr "<keyseq><key>Ctrl</key><key>u</key></keyseq>"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:382
-#, fuzzy
-#| msgid "Delete from the cursor to the end of the line."
 msgid "Delete from the cursor to the end of the line"
-msgstr "Borrar desde el cursor al final de la línea."
+msgstr "Borrar desde el cursor al final de la línea"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:383
@@ -770,10 +752,8 @@ msgstr "<keyseq><key>Ctrl</key><key>K</key></keyseq>"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:386
-#, fuzzy
-#| msgid "Delete from the cursor to the start of the word."
 msgid "Delete from the cursor to the start of the word"
-msgstr "Borrar desde el cursor al principio de la palabra."
+msgstr "Borrar desde el cursor al principio de la palabra"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:390
@@ -797,12 +777,10 @@ msgstr "<keyseq><key>Ctrl</key><key>Y</key></keyseq>"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:398
-#, fuzzy
-#| msgid "Clear the screen leaving the current line at the top of the screen."
 msgid "Clear the screen leaving the current line at the top of the screen"
 msgstr ""
 "Limpiar la pantalla dejando la línea actual en la parte superior de la "
-"pantalla."
+"pantalla"
 
 #. (itstool) path: td/p
 #: C/adv-keyboard-shortcuts.page:400
@@ -890,6 +868,8 @@ msgid ""
 "Your current profile is selected in the sidebar. If you wish to edit a "
 "different profile, click on its name."
 msgstr ""
+"Su perfil actual está seleccionado en la barra lateral. Si quiere editar un "
+"perfil diferente, pulse en su nombre."
 
 #. (itstool) path: item/p
 #: C/app-colors.page:53 C/app-colors.page:82 C/app-colors.page:114
@@ -912,13 +892,6 @@ msgstr "Esquemas incluidos"
 
 #. (itstool) path: section/p
 #: C/app-colors.page:66
-#, fuzzy
-#| msgid ""
-#| "You can choose one of the built-in color schemes: <gui>Black on light "
-#| "yellow</gui>, <gui>Black on white</gui>, <gui>Gray on black</gui>, "
-#| "<gui>Green on black</gui>, <gui>White on black</gui>, <gui>Solarized "
-#| "light</gui>, <gui>Solarized dark</gui>. To set any of the built-in "
-#| "schemes:"
 msgid ""
 "You can choose one of the built-in color schemes: <gui>Black on light "
 "yellow</gui>, <gui>Black on white</gui>, <gui>Gray on black</gui>, "
@@ -929,8 +902,9 @@ msgstr ""
 "Puede elegir uno de los esquemas de color incluidos: <gui>Negro sobre "
 "amarillo suave</gui>, <gui>Negro sobre blanco</gui>, <gui>Gris sobre negro</"
 "gui>, <gui>Verde sobre negro</gui>, <gui>Blanco sobre negro</gui>, "
-"<gui>Solar claro</gui>, <gui>Solar oscuro</gui>. Para establecer cualquiera "
-"de estos esquemas incluidos:"
+"<gui>Tango claro</gui>, <gui>Tango oscuro</gui>, <gui>Solar claro</gui>, "
+"<gui>Solar oscuro</gui>. Para establecer cualquiera de estos esquemas "
+"incluidos:"
 
 #. (itstool) path: item/p
 #: C/app-colors.page:85
@@ -979,12 +953,8 @@ msgstr ""
 
 #. (itstool) path: item/p
 #: C/app-colors.page:122
-#, fuzzy
-#| msgid ""
-#| "Click on the color sample next to the component you would like to change."
 msgid "Click on the color you would like to change."
-msgstr ""
-"Pulse sobre la muestra de color junto al componente que quiere cambiar."
+msgstr "Pulse sobre el color que le gustaría cambiar."
 
 #. (itstool) path: item/p
 #: C/app-colors.page:125
@@ -997,10 +967,8 @@ msgstr ""
 
 #. (itstool) path: item/p
 #: C/app-colors.page:127
-#, fuzzy
-#| msgid "You can select text in any of the following ways:"
 msgid "You can choose the desired color in the following ways:"
-msgstr "Puede seleccionar texto de cualquiera de las siguientes formas:"
+msgstr "Puede seleccionar el color que quiera de las siguientes formas:"
 
 #. (itstool) path: item/p
 #: C/app-colors.page:130
@@ -1040,6 +1008,10 @@ msgid ""
 "you can alter here. <app>Terminal</app> supports an extended set of 256 "
 "colors, but the additional 240 colors cannot be edited here."
 msgstr ""
+"Los emuladores tradicionales de terminal ofrecían una paleta de 16 colores, "
+"esto es lo que puede modificar aquí. <app>Terminal</app> admite un conjunto "
+"extendido de 256 colores, pero los 240 colores adicionales no se pueden "
+"editar aquí."
 
 #. (itstool) path: note/p
 #: C/app-colors.page:152
@@ -1047,6 +1019,8 @@ msgid ""
 "<app>Terminal</app> even offers direct access to over 16 million colors, "
 "this is called “true color” mode."
 msgstr ""
+"<app>Terminal</app> incluso ofrece acceso directo a más de 16 millones de "
+"colores, esto se llama modo de «color verdadero»."
 
 #. (itstool) path: note/p
 #: C/app-colors.page:155
@@ -1055,13 +1029,14 @@ msgid ""
 "presumably the contents you see consist of such extended palette colors or "
 "true colors, rather than the 16 base colors."
 msgstr ""
+"Si los cambios que realiza en la paleta no parecen tener efecto, es de "
+"suponer que los contenidos que ve consisten en colores de paleta extendidos "
+"o colores verdaderos, en lugar de los 16 colores básicos."
 
 #. (itstool) path: info/desc
 #: C/app-cursor.page:29
-#, fuzzy
-#| msgid "Select different cursor style"
 msgid "Select different cursor style."
-msgstr "Seleccionar un estilo de cursos diferente"
+msgstr "Seleccionar un estilo de cursor diferente."
 
 #. (itstool) path: page/title
 #: C/app-cursor.page:33
@@ -1146,10 +1121,8 @@ msgstr "Para usar las tipografías predeterminadas del sistema:"
 
 #. (itstool) path: item/p
 #: C/app-fonts.page:56
-#, fuzzy
-#| msgid "Select <gui style=\"checkbox\">Allow bold text</gui>."
 msgid "Unselect <gui style=\"checkbox\">Custom font</gui>."
-msgstr "Seleccione <guilabel>Permitir texto resaltado</guilabel>."
+msgstr "Deseleccione <guilabel>Tipografía personalizada</guilabel>."
 
 #. (itstool) path: section/title
 #: C/app-fonts.page:63
@@ -1163,17 +1136,13 @@ msgstr "Para establecer una tipografía personalizada y un tamaño:"
 
 #. (itstool) path: item/p
 #: C/app-fonts.page:80
-#, fuzzy
-#| msgid "Select <gui style=\"checkbox\">Allow bold text</gui>."
 msgid "Select <gui style=\"checkbox\">Custom font</gui>."
-msgstr "Seleccione <guilabel>Permitir texto resaltado</guilabel>."
+msgstr "Seleccione <guilabel>Tipografía personalizada</guilabel>."
 
 #. (itstool) path: item/p
 #: C/app-fonts.page:83
-#, fuzzy
-#| msgid "Click on the button next to <gui>Font</gui>."
 msgid "Click on the button next to <gui style=\"checkbox\">Custom font</gui>."
-msgstr "Pulse el botón que está junto a <gui>Tipografía</gui>."
+msgstr "Pulse el botón que está junto a <gui>Tipografía personalizada</gui>."
 
 #. (itstool) path: item/p
 #: C/app-fonts.page:86
@@ -1212,7 +1181,7 @@ msgstr ""
 #. (itstool) path: section/title
 #: C/app-fonts.page:105
 msgid "Line spacing and character spacing"
-msgstr ""
+msgstr "Espaciado de línea y espaciado de carácter"
 
 #. (itstool) path: section/p
 #: C/app-fonts.page:107
@@ -1222,6 +1191,10 @@ msgid ""
 "(the regular look) to 2.0 (“double spacing”), including fractional values in "
 "between."
 msgstr ""
+"<app>Terminal</app> le permite separar sus caracteres para una mejor "
+"legibilidad. El espaciado entre líneas y el espaciado de caracteres se puede "
+"ajustar desde 1.0 (el aspecto normal) a 2.0 («espaciado doble»), incluidos "
+"los valores fraccionarios intermedios."
 
 #. (itstool) path: item/p
 #: C/app-fonts.page:125
@@ -1229,6 +1202,8 @@ msgid ""
 "To set the horizontal character spacing, adjust the multiplier number in "
 "front of <gui>width</gui>."
 msgstr ""
+"Para establecer el espaciado de caracteres horizontal, ajuste el número de "
+"multiplicador delante de <gui>ancho</gui>."
 
 #. (itstool) path: item/p
 #: C/app-fonts.page:129
@@ -1236,6 +1211,8 @@ msgid ""
 "To set the line spacing, adjust the multiplier number in front of "
 "<gui>height</gui>."
 msgstr ""
+"Para establecer el espaciado entre líneas, ajuste el número del "
+"multiplicador frente a <gui>altura</gui>."
 
 #. (itstool) path: info/desc
 #: C/app-fullscreen.page:28
@@ -1321,10 +1298,8 @@ msgstr ""
 
 #. (itstool) path: info/desc
 #: C/app-terminal-sizes.page:28
-#, fuzzy
-#| msgid "Change the <app>Terminal</app> window size"
 msgid "Change the <app>Terminal</app> window size."
-msgstr "Cambiar el tamaño de la ventana de la <app>Terminal</app>"
+msgstr "Cambiar el tamaño de la ventana de la <app>Terminal</app>."
 
 #. (itstool) path: page/title
 #: C/app-terminal-sizes.page:32
@@ -1385,12 +1360,6 @@ msgstr "<gui style=\"menuitem\">132×43</gui>"
 
 #. (itstool) path: note/p
 #: C/app-terminal-sizes.page:67
-#, fuzzy
-#| msgid ""
-#| "If you have enabled <link xref=\"pref-keyboard-access\"><gui>Menu access "
-#| "keys</gui></link>, you can access this menu by pressing <keyseq><key>Alt</"
-#| "key><key>T</key></keyseq> and then pressing <key>1</key> to open a "
-#| "<app>Terminal</app> window of size <gui>80×24</gui> and so on."
 msgid ""
 "If you have enabled <link xref=\"pref-keyboard-access\"><gui>Menu access "
 "keys</gui></link>, you can access this menu by pressing <keyseq><key>Alt</"
@@ -1400,41 +1369,32 @@ msgstr ""
 "Si tiene activadas las <link xref=\"pref-keyboard-access\"><gui>Teclas de "
 "acceso a menús</gui></link>, puede acceder a este menú pulsando "
 "<keyseq><key>Alt</key><key>T</key></keyseq> y luego pulsando <key>1</key> "
-"para abrir una ventana de la terminal <app>Terminal</app> de <gui>80×24</"
-"gui> y así sucesivamente."
+"para cambiar el tamaño de la ventana de la <app>Terminal</app> de "
+"<gui>80×24</gui> y así sucesivamente."
 
 #. (itstool) path: page/p
 #: C/app-terminal-sizes.page:74
-#, fuzzy
-#| msgid ""
-#| "If you require custom size <app>Terminal</app> windows, you can also set "
-#| "the window size according to your requirements:"
 msgid ""
 "If you require custom size <app>Terminal</app> windows, you can also set the "
 "default window size according to your requirements:"
 msgstr ""
 "Si necesita que la ventana de la <app>Terminal</app> tenga un tamaño "
-"personalizado, puede establecer el tamaño de la ventana para que se ajuste a "
-"sus necesidades;:"
+"personalizado, puede establecer el tamaño predeterminado de la ventana para "
+"que se ajuste a sus necesidades:"
 
+# No encontré la traducción oficial de «Initial terminal size» en la gui
 #. (itstool) path: item/p
 #: C/app-terminal-sizes.page:90
-#, fuzzy
-#| msgid ""
-#| "Set <gui>Default size</gui> by typing the desired number of columns and "
-#| "rows in the corresponding input boxes. You can also click <gui style="
-#| "\"button\">+</gui> to increase or <gui style=\"button\">-</gui> to "
-#| "decrease the size."
 msgid ""
 "Set <gui>Initial terminal size</gui> by typing the desired number of columns "
 "and rows in the corresponding input boxes. You can also click <gui style="
 "\"button\">+</gui> to increase or <gui style=\"button\">-</gui> to decrease "
 "the size."
 msgstr ""
-"Establezca el <gui>Tamaño predeterminado</gui> escribiendo el número de "
-"filas y de columnas que quiere en las cajas correspondientes. También puede "
-"usar los botones <gui style=\"button\">+</gui> o <gui style=\"button\">-</"
-"gui> para aumentar o disminuir el tamaño."
+"Establezca el <gui>Tamaño inicial de la terminal</gui> escribiendo el número "
+"de filas y de columnas que quiere en los cuadros de entrada "
+"correspondientes. También puede usar los botones <gui style=\"button\">+</"
+"gui> o <gui style=\"button\">-</gui> para aumentar o disminuir el tamaño."
 
 #. (itstool) path: info/desc
 #: C/app-zoom.page:27
@@ -1500,10 +1460,8 @@ msgstr "2013–2014"
 
 #. (itstool) path: info/desc
 #: C/gs-execute-commands.page:31
-#, fuzzy
-#| msgid "Launch programs or run commands using <app>Terminal</app>"
 msgid "Launch programs or run commands using <app>Terminal</app>."
-msgstr "Lanzar programas o ejecutar comandos usando la <app>Terminal</app>"
+msgstr "Lanzar programas o ejecutar comandos usando la <app>Terminal</app>."
 
 #. (itstool) path: page/title
 #: C/gs-execute-commands.page:34
@@ -1622,16 +1580,12 @@ msgstr ""
 
 #. (itstool) path: item/p
 #: C/gs-tabs.page:91
-#, fuzzy
-#| msgid ""
-#| "Select <guiseq><gui style=\"menu\">File</gui><gui style=\"menuitem"
-#| "\">Close Terminal</gui></guiseq>."
 msgid ""
 "Select <guiseq><gui style=\"menu\">File</gui><gui style=\"menuitem\">Close "
 "Tab</gui></guiseq>."
 msgstr ""
 "Seleccione <guiseq><gui style=\"menu\">Archivo</gui> <gui style=\"menuitem"
-"\">Cerrar terminal</gui></guiseq>."
+"\">Cerrar pestaña</gui></guiseq>."
 
 #. (itstool) path: section/p
 #: C/gs-tabs.page:97
@@ -1778,8 +1732,6 @@ msgstr "Cómo empezar"
 
 #. (itstool) path: section/title
 #: C/index.page:44
-#, fuzzy
-#| msgid "Working with text"
 msgid "Working With Text"
 msgstr "Trabajar con texto"
 
@@ -1940,18 +1892,15 @@ msgstr ""
 msgid "A terminal"
 msgstr "Una terminal"
 
+# Uso equipo porque en latinoamérica es computador y en España ordenador.
 #. (itstool) path: item/p
 #: C/overview.page:33
-#, fuzzy
-#| msgid ""
-#| "A terminal is a text input point in a computer also called the Command "
-#| "Line Interface (CLI)."
 msgid ""
 "A terminal is a text input point in a computer that is also called the "
 "Command Line Interface (CLI)."
 msgstr ""
-"Una terminal es un punto de entrada de texto, también llamado interfaz de "
-"línea de comandos (CLI)."
+"Una terminal es un punto de entrada de texto en un equipo, también llamado "
+"interfaz de línea de comandos (CLI)."
 
 #. (itstool) path: item/title
 #: C/overview.page:37
@@ -1985,14 +1934,6 @@ msgstr ""
 
 #. (itstool) path: item/p
 #: C/overview.page:47
-#, fuzzy
-#| msgid ""
-#| "A terminal emulator also called tty is a software program that emulates a "
-#| "video terminal in modern computers that use graphical user interfaces and "
-#| "provide interactive access to applications that run only in the command "
-#| "line environments. These applications may be running either on the same "
-#| "machine or on a different one via <app>telnet</app>, <app>ssh</app>, or "
-#| "<app>dial-up</app>."
 msgid ""
 "A terminal emulator, also called tty, is a software program that emulates a "
 "video terminal in modern computers that use graphical user interfaces and "
@@ -2001,12 +1942,12 @@ msgid ""
 "or on a different one via <app>telnet</app>, <app>ssh</app>, or <app>dial-"
 "up</app>."
 msgstr ""
-"Un emulador de terminal, también llamado tty, es un programa que emula una "
-"terminal de vídeo en un equipo actual que usa interfaces gráficas de usuario "
-"y proporciona acceso interactivo a las aplicaciones que sólo se ejecutan en "
-"entornos de línea de comandos. Estas aplicaciones se pueden ejecutar en la "
-"misma máquina o en una diferente mediante <app>telnet</app>, <app>ssh</app>, "
-"o <app>dial-up</app>."
+"Un emulador de terminal, también llamado tty, es un programa de software que "
+"emula una terminal de vídeo en un equipo actual que usa interfaces gráficas "
+"de usuario y proporciona acceso interactivo a las aplicaciones que sólo se "
+"ejecutan en entornos de línea de comandos. Estas aplicaciones se pueden "
+"ejecutar en la misma máquina o en una diferente mediante <app>telnet</app>, "
+"<app>ssh</app> o <app>dial-up</app>."
 
 #. (itstool) path: item/title
 #: C/overview.page:55
@@ -2032,24 +1973,19 @@ msgstr ""
 msgid "Shell"
 msgstr "Shell"
 
+# rip csh
 #. (itstool) path: item/p
 #: C/overview.page:64
-#, fuzzy
-#| msgid ""
-#| "A <em>shell</em> is a program that provides an interface to invoke or "
-#| "\"launch\" commands or another program inside a terminal. It also allows "
-#| "you to view and browse the contents of directories. Popular shells are "
-#| "<app>bash</app>, <app>zsh</app>, <app>csh</app>."
 msgid ""
 "A <em>shell</em> is a program that provides an interface to invoke or "
 "“launch” commands or another program inside a terminal. It also allows you "
 "to view and browse the contents of directories. Popular shells include "
 "<app>bash</app>, <app>zsh</app>, <app>fish</app>."
 msgstr ""
-"Una <app>shell</app> es un programa que proporciona una interfaz para "
-"ejecutar comandos u otros programas dentro de una terminal. También permite "
-"ver y examinar el contenido de las carpetas. Las shells más populares son "
-"<app>bash</app>, <app>zsh</app> y <app>csh</app>."
+"Una <em>shell</em> es un programa que proporciona una interfaz para invocar "
+"o «ejecutar» comandos u otros programas dentro de una terminal. También "
+"permite ver y examinar el contenido de las carpetas. Las shells más "
+"populares son <app>bash</app>, <app>zsh</app> y <app>fish</app>."
 
 #. (itstool) path: item/title
 #: C/overview.page:70
@@ -2079,11 +2015,6 @@ msgstr "Símbolo del sistema"
 
 #. (itstool) path: item/p
 #: C/overview.page:80
-#, fuzzy
-#| msgid ""
-#| "A prompt also called a <em>command prompt</em>. It is a sequence of "
-#| "characters used in the command line environment to indicate the readiness "
-#| "of the shell to accept commands."
 msgid ""
 "A prompt is also called a <em>command prompt</em>. It is a sequence of "
 "characters used in the command line environment to indicate the readiness of "
@@ -2091,18 +2022,10 @@ msgid ""
 msgstr ""
 "Un símbolo del sistema, también llamado <em>símbolo de línea de comandos</"
 "em>. Es una secuencia de caracteres usada en el entorno de la línea de "
-"comandos para indicar si la shell está preparada para aceptar comandos"
+"comandos para indicar si la shell está preparada para aceptar comandos."
 
 #. (itstool) path: item/p
 #: C/overview.page:84
-#, fuzzy
-#| msgid ""
-#| "A prompt usually ends with characters <sys>$</sys>, <sys>%</sys>, <sys>#</"
-#| "sys> or <sys>&gt;</sys> and include information about path of present "
-#| "working directory. On Unix based systems, it is common for the prompt to "
-#| "end in a <sys>$</sys> or <sys>%</sys> character depending on the user "
-#| "role such as <sys>$</sys> for user and <sys>#</sys> for superuser (also "
-#| "called <sys>root</sys>)."
 msgid ""
 "A prompt usually ends with the characters <sys>$</sys>, <sys>%</sys>, "
 "<sys>#</sys> or <sys>&gt;</sys> and includes information about the path of "
@@ -2111,11 +2034,11 @@ msgid ""
 "user role such as <sys>$</sys> for user and <sys>#</sys> for superuser (also "
 "called <sys>root</sys>)."
 msgstr ""
-"Generalmente, un símbolo del sistema termina con los caracteres , <sys>$</"
+"Generalmente, un símbolo del sistema termina con los caracteres <sys>$</"
 "sys>, <sys>%</sys>, <sys>#</sys> o <sys>&gt;</sys> e incluye información "
 "sobre la ruta de la carpeta de trabajo actual. En los sistemas basados en "
 "UNIX es habitual que el símbolo del sistema termine con los caracteres <sys>"
-"$</sys> o <sys>%</sys>, dependiendo del rol del usuario, siendo <sys>$</sys> "
+"$</sys> o <sys>#</sys>, dependiendo del rol del usuario, siendo <sys>$</sys> "
 "para el usuario normal y <sys>#</sys> para el superusuario (también llamado "
 "<sys>root</sys>)."
 
@@ -2158,10 +2081,8 @@ msgstr "Preferencias del perfil"
 
 #. (itstool) path: info/desc
 #: C/pref-bell.page:28
-#, fuzzy
-#| msgid "Enable audible notification in <app>Terminal</app>"
 msgid "Enable audible notification in <app>Terminal</app>."
-msgstr "Activar la notificación sonora en la <app>Terminal</app>"
+msgstr "Activar la notificación sonora en la <app>Terminal</app>."
 
 #. (itstool) path: page/title
 #: C/pref-bell.page:32
@@ -2174,6 +2095,8 @@ msgid ""
 "<app>Terminal</app> can sound an audible bell to indicate events in "
 "<app>Terminal</app> windows and tabs."
 msgstr ""
+"La <app>Terminal</app> puede hacer sonar una campana audible para indicar "
+"eventos en las ventanas y pestañas de la <app>Terminal</app>."
 
 #. (itstool) path: page/p
 #: C/pref-bell.page:37
@@ -2443,22 +2366,16 @@ msgstr ""
 
 #. (itstool) path: page/p
 #: C/pref-keyboard-access.page:39
-#, fuzzy
-#| msgid ""
-#| "You can navigate the <app>Terminal</app> menu using a combination of keys "
-#| "that are called <em>mnemonics</em> or a special key that takes you "
-#| "directly to the first menu in the menubar which is called a <em>menu "
-#| "accelerator key</em>."
 msgid ""
 "You can navigate the <app>Terminal</app> menu using a combination of keys "
 "that are called <em>mnemonics</em> or a special key that takes you directly "
 "to the first menu in the menubar which is called the <em>menu accelerator "
 "key</em>."
 msgstr ""
-"Puede navegar por la <app>Terminal</app> usando una combinación de teclas "
-"llamados <em>mnemónicos</em> o una tecla especial que le lleva directamente "
-"al primer menú de la barra de menú que se llama <em>tecla de acceso rápido "
-"al menú</em>."
+"Puede navegar por el menú de la <app>Terminal</app> usando una combinación "
+"de teclas llamadas <em>mnemónicos</em> o una tecla especial que le lleva "
+"directamente al primer menú de la barra de menú que se llama <em>tecla de "
+"acceso rápido al menú</em>."
 
 #. (itstool) path: section/title
 #: C/pref-keyboard-access.page:45
@@ -2515,10 +2432,6 @@ msgstr "Tecla de acceso rápido al menú"
 
 #. (itstool) path: section/p
 #: C/pref-keyboard-access.page:74
-#, fuzzy
-#| msgid ""
-#| "This setting brings up the <gui style=\"menu\">File</gui> menu the menu "
-#| "accelerator key is pressed. This key is usually <key>F10</key> by default."
 msgid ""
 "This setting brings up the <gui style=\"menu\">File</gui> menu when the menu "
 "accelerator key is pressed. This key is usually <key>F10</key> by default."
@@ -2529,10 +2442,6 @@ msgstr ""
 
 #. (itstool) path: item/p
 #: C/pref-keyboard-access.page:80
-#, fuzzy
-#| msgid ""
-#| "Select <guiseq><gui style=\"menu\">Edit</gui> <gui style=\"menuitem\"> "
-#| "Preferences</gui> <gui style=\"tab\">General</gui></guiseq>."
 msgid ""
 "Select <guiseq><gui style=\"menu\">Edit</gui> <gui style=\"menuitem"
 "\">Preferences</gui> <gui style=\"tab\">General</gui></guiseq>."
@@ -2549,26 +2458,26 @@ msgstr ""
 
 #. (itstool) path: info/desc
 #: C/pref-login-shell.page:29
-#, fuzzy
-#| msgid "Right click on the link in <app>Terminal</app>."
 msgid "Start a login shell in <app>Terminal</app>."
-msgstr "Pulse con el botón derecho sobre el enlace en la <app>Terminal</app>."
+msgstr "Inicie una shell con inicio de sesión en la <app>Terminal</app>."
 
 #. (itstool) path: page/title
 #: C/pref-login-shell.page:32
 msgid "Login shells"
-msgstr ""
+msgstr "Shells con inicio de sesión"
 
 #. (itstool) path: page/p
 #: C/pref-login-shell.page:34
 msgid ""
 "Shells in UNIX based systems can be started up in login and non-login modes:"
 msgstr ""
+"Las shells en sistemas basados en UNIX se pueden iniciar en modos con inicio "
+"de sesión y sin inicio de sesión:"
 
 #. (itstool) path: item/title
 #: C/pref-login-shell.page:39
 msgid "Login shell"
-msgstr ""
+msgstr "Shell con inicio de sesión"
 
 #. (itstool) path: item/p
 #: C/pref-login-shell.page:40
@@ -2578,13 +2487,16 @@ msgid ""
 "or placing a dash as the initial character of the command name, for example "
 "invoking <cmd>bash</cmd> as <cmd>-bash</cmd>."
 msgstr ""
+"Una shell con inicio de sesión es una shell que se le da al usuario al "
+"iniciar sesión en su cuenta. Esto se inicia usando las opciones <cmd>-l</"
+"cmd> o <cmd>--login</cmd>, o colocando un guión como el carácter inicial en "
+"el nombre del comando, por ejemplo invocando <cmd>bash</cmd> como <cmd>-"
+"bash</cmd>."
 
 #. (itstool) path: item/title
 #: C/pref-login-shell.page:47
-#, fuzzy
-#| msgid "Shell"
 msgid "Sub shell"
-msgstr "Shell"
+msgstr "Sub shell"
 
 #. (itstool) path: item/p
 #: C/pref-login-shell.page:48
@@ -2593,16 +2505,21 @@ msgid ""
 "process without the <cmd>-l</cmd> or <cmd>--login</cmd> option and without "
 "an extra dash before the command name."
 msgstr ""
+"Una sub shell, también llamada una shell sin inicio de sesión es una shell "
+"que se inicia después del proceso de inicio de sesión sin las opciones <cmd>-"
+"l</cmd> o <cmd>--login</cmd> y sin un guión adicional antes del nombre de "
+"comando."
 
 #. (itstool) path: page/p
 #: C/pref-login-shell.page:54
 msgid "The general cases for having a login shell include:"
 msgstr ""
+"Los casos generales en los que se tiene una shell con inicio de sesión son:"
 
 #. (itstool) path: item/p
 #: C/pref-login-shell.page:57
 msgid "Accessing your computer remotely using <app>ssh</app>."
-msgstr ""
+msgstr "Acceder a su equipo de forma remota usando <app>ssh</app>."
 
 #. (itstool) path: item/p
 #: C/pref-login-shell.page:60
@@ -2610,16 +2527,20 @@ msgid ""
 "Simulating an initial login shell with <cmd>bash -l</cmd> or <cmd>sh -l</"
 "cmd>."
 msgstr ""
+"Simular una shell con inicio de sesión inicial con <cmd>bash -l</cmd> o "
+"<cmd>sh -l</cmd>."
 
 #. (itstool) path: item/p
 #: C/pref-login-shell.page:64
 msgid "Simulating an initial root login shell with <cmd>sudo -i</cmd>."
 msgstr ""
+"Simular una shell con inicio de sesión como superusuario inicial con "
+"<cmd>sudo -i</cmd>."
 
 #. (itstool) path: section/title
 #: C/pref-login-shell.page:69
 msgid "Start a login shell"
-msgstr ""
+msgstr "Iniciar una shell con inicio de sesión"
 
 #. (itstool) path: section/p
 #: C/pref-login-shell.page:71
@@ -2627,6 +2548,9 @@ msgid ""
 "You can allow <app>Terminal</app> to start a login shell. Your default shell "
 "will be started with a dash character prepended to its name."
 msgstr ""
+"Puede permitir que la <app>Terminal</app> inicie una shell con inicio de "
+"sesión. Su shell predeterminada comenzará con un carácter de guión "
+"antepuesto a su nombre."
 
 #. (itstool) path: item/p
 #: C/pref-login-shell.page:91
@@ -2634,6 +2558,8 @@ msgid ""
 "Under the <gui>Command</gui> label, select <gui style=\"checkbox\">Run "
 "command as a login shell</gui>."
 msgstr ""
+"Bajo la etiqueta <gui>Comando</gui>, seleccione <gui style=\"checkbox"
+"\">Ejecutar comando como una shell con inicio de sesión</gui>."
 
 #. (itstool) path: info/desc
 #: C/pref-menubar.page:30
@@ -2679,25 +2605,19 @@ msgstr ""
 
 #. (itstool) path: page/p
 #: C/pref-menubar.page:55
-#, fuzzy
-#| msgid ""
-#| "To enable the menubar by default in all <app>Terminal</app> windows that "
-#| "you open:"
 msgid ""
 "To enable or disable the menubar by default in all <app>Terminal</app> "
 "windows that you open:"
 msgstr ""
-"Para activar la barra de menú de manera predeterminada en todas las ventanas "
-"de la <app>Terminal</app> que abra:"
+"Para activar o desactivar la barra de menú de manera predeterminada en todas "
+"las ventanas de la <app>Terminal</app> que abra:"
 
 #. (itstool) path: item/p
 #: C/pref-menubar.page:64
-#, fuzzy
-#| msgid "Select <gui>Show menubar by default in new terminals</gui>."
 msgid "Select or deselect <gui>Show menubar by default in new terminals</gui>."
 msgstr ""
-"Seleccione <guilabel>Mostrar la barra de menú en las terminales nuevas de "
-"manera predeterminada</guilabel>."
+"Seleccione o deseleccione <gui>Mostrar la barra de menú en las terminales "
+"nuevas de manera predeterminada</gui>."
 
 #. (itstool) path: note/p
 #: C/pref-menubar.page:69
@@ -2770,20 +2690,16 @@ msgstr "Seleccionar un perfil"
 
 #. (itstool) path: section/p
 #: C/pref-profiles.page:68
-#, fuzzy
-#| msgid ""
-#| "You can change the profile in your current <app>Terminal</app> tab or "
-#| "window by selecting a profile from <guiseq><gui style=\"menu\">Terminal</"
-#| "gui> <gui style=\"menuitem\">Change Profile</gui></guiseq>."
 msgid ""
 "If you have two or more profiles defined, you can change the profile in your "
 "current <app>Terminal</app> tab or window by selecting a profile from "
 "<guiseq><gui style=\"menu\">Terminal</gui> <gui style=\"menuitem\">Change "
 "Profile</gui></guiseq>."
 msgstr ""
-"Puede cambiar en la pestaña o la ventana actual de la <app>Terminal</app> "
-"seleccionando un perfil en <guiseq><gui style=\"menu\">Terminal</gui> <gui "
-"style=\"menuitem\">Cambiar perfil</gui></guiseq>."
+"Si tiene dos o más perfiles definidos, puede cambiar en la pestaña o la "
+"ventana actual de la <app>Terminal</app> seleccionando un perfil en "
+"<guiseq><gui style=\"menu\">Terminal</gui> <gui style=\"menuitem\">Cambiar "
+"perfil</gui></guiseq>."
 
 #. (itstool) path: section/title
 #: C/pref-profiles.page:76
@@ -2795,67 +2711,47 @@ msgstr "Crear un perfil nuevo"
 msgid ""
 "To create a new profile with the default settings of <app>Terminal</app>:"
 msgstr ""
+"Para crear un perfil nuevo con las configuraciones predeterminadas de la "
+"<app>Terminal</app>:"
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:83 C/pref-profiles.page:112 C/pref-profiles.page:162
 #: C/pref-profiles.page:204 C/pref-profiles.page:233 C/pref-profiles.page:273
-#, fuzzy
-#| msgid ""
-#| "Select <guiseq><gui style=\"menu\">File</gui> <gui style=\"menuitem\">New "
-#| "Profile</gui></guiseq>."
 msgid ""
 "Select <guiseq><gui style=\"menu\">Edit</gui> <gui style=\"menuitem"
 "\">Preferences</gui></guiseq>."
 msgstr ""
-"Seleccione <guiseq><gui style=\"menu\">Archivo</gui> <gui style=\"menuitem"
-"\">Perfil nuevo</gui></guiseq>."
+"Seleccione <guiseq><gui style=\"menu\">Editar</gui> <gui style=\"menuitem"
+"\">Preferencias</gui></guiseq>."
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:87
-#, fuzzy
-#| msgid ""
-#| "Click <guibutton>Close</guibutton> to close the <guilabel>Edit Profiles</"
-#| "guilabel> dialog."
 msgid ""
 "In the sidebar, click on the <gui style=\"button\">+</gui> button next to "
 "the <gui>Profiles</gui> label."
 msgstr ""
-"Pulse <guibutton>Cerrar</guibutton> para cerrar el diálogo <guilabel>Editar "
-"perfiles</guilabel>."
+"En la barra lateral, pulse en el botón <gui style=\"button\">+</gui> que "
+"está al lado de la etiqueta <gui>Perfiles</gui>."
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:91 C/pref-profiles.page:126
-#, fuzzy
-#| msgid ""
-#| "Enter a name for the new profile next to <gui style=\"input\">Profile "
-#| "name</gui>."
 msgid "Enter a name for the new profile. You can change this name later."
 msgstr ""
-"Introduzca un nombre para el nuevo perfil en <gui style=\"input\">Nombre del "
-"perfil</gui>."
+"Introduzca un nombre para el nuevo perfil. Puede cambiarlo más adelante."
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:94
-#, fuzzy
-#| msgid "Click <gui style=\"button\">Close</gui> to return."
 msgid "Click <gui style=\"button\">Create</gui> to create the new profile."
-msgstr "Pulse <gui style=\"button\">Cerrar</gui> para volver."
+msgstr "Pulse <gui style=\"button\">Crear</gui> para crear el perfil nuevo."
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:97 C/pref-profiles.page:132
-#, fuzzy
-#| msgid ""
-#| "Set your desired <link xref=\"#edit-profile\">profile preferences</link>. "
-#| "These will be saved automatically. If you do not update the profile name, "
-#| "the new profile will not overwrite the profile that it is based on."
 msgid ""
 "Set your desired <link xref=\"#edit-profile\">profile preferences</link>. "
 "These will be saved automatically."
 msgstr ""
 "Configure las <link xref=\"#edit-profile\">preferencias del perfil</link> "
-"que quiera. Estas preferencias se guardarán automáticamente. Si no actualiza "
-"el nombre del perfil, el perfil nuevo no sobrescribirá el perfil en el que "
-"se basa."
+"que quiera. Estas se guardarán automáticamente."
 
 #. (itstool) path: section/title
 #: C/pref-profiles.page:105
@@ -2875,12 +2771,13 @@ msgstr ""
 msgid ""
 "In the sidebar select the profile on which your new profile should be based."
 msgstr ""
+"En la barra lateral seleccione el perfil en el que se basará su perfil nuevo."
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:120 C/pref-profiles.page:211 C/pref-profiles.page:240
 #: C/pref-profiles.page:280
 msgid "Click on the arrow next to the profile name."
-msgstr ""
+msgstr "Pulse en la flecha que está al lado del nombre de perfil."
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:123
@@ -2889,10 +2786,8 @@ msgstr "Seleccione <gui style=\"menuitem\">Clonar…</gui>."
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:129
-#, fuzzy
-#| msgid "Click <gui style=\"button\">Close</gui> to return."
 msgid "Click <gui style=\"button\">Clone</gui> to create the new profile."
-msgstr "Pulse <gui style=\"button\">Cerrar</gui> para volver."
+msgstr "Pulse <gui style=\"button\">Clonar</gui> para crear el perfil nuevo."
 
 #. (itstool) path: note/p
 #: C/pref-profiles.page:138
@@ -2931,15 +2826,13 @@ msgstr ""
 
 #. (itstool) path: section/p
 #: C/pref-profiles.page:158
-#, fuzzy
-#| msgid "You can rename existing profiles, including the default profile:"
 msgid "You can make changes to existing profiles. To edit a profile:"
-msgstr "Puede renombrar los perfiles existentes, incluyendo el predeterminado:"
+msgstr "Puede modificar los perfiles existentes. Para editar un perfil:"
 
 #. (itstool) path: section/p
 #: C/pref-profiles.page:171
 msgid "Once the desired profile is selected, you can:"
-msgstr ""
+msgstr "Una vez que haya seleccionado el perfil que quiere, puede:"
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:175
@@ -3007,10 +2900,8 @@ msgstr "Seleccione <gui style=\"menuitem\">Renombrar…</gui>."
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:217
-#, fuzzy
-#| msgid "Create a new profile"
 msgid "Enter the new profile name."
-msgstr "Crear un perfil nuevo"
+msgstr "Introduzca el nombre del perfil nuevo."
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:220
@@ -3048,22 +2939,20 @@ msgid ""
 "The default profile cannot be deleted. If you wish to delete that profile, "
 "first set another profile as <link xref=\"#set-default\">default</link>."
 msgstr ""
+"El perfil predeterminado no se puede eliminar. Si quiere eliminar ese "
+"perfil, primero establezca otro perfil como <link xref=\"#set-default"
+"\">predeterminado</link>."
 
 #. (itstool) path: page/p
 #: C/pref-profiles.page:258
-#, fuzzy
-#| msgid ""
-#| "The default profile is loaded when a new terminal is opened unless you "
-#| "have selected another profile. Any changes that you make to the settings "
-#| "will be stored in the currently used profile."
 msgid ""
 "The default profile is loaded when a new terminal is opened unless you have "
 "selected another profile. Any changes that you make to the settings will be "
 "stored in the currently selected profile."
 msgstr ""
 "El perfil predeterminado se carga cuando se abre una terminal nueva, a menos "
-"que haya seleccionado otro perfil. Cualquier cambio que que haga se guardará "
-"en la configuración del perfil usado actualmente."
+"que haya seleccionado otro perfil. Cualquier cambio que haga en la "
+"configuración se guardará en el perfil que se encuentre seleccionado."
 
 #. (itstool) path: section/title
 #: C/pref-profiles.page:263
@@ -3079,25 +2968,30 @@ msgid ""
 "menu entry or keyboard shortcut of <app>Terminal</app> to open a new "
 "terminal, the profile of the existing terminal is used."
 msgstr ""
+"El perfil predeterminado se usa cuando la <app>Terminal</app> no podría "
+"decidir qué perfil usar. Por ejemplo, la <app>Terminal</app> se inicia "
+"recientemente y abre su primera ventana de terminal. Por el contrario, "
+"cuando utiliza una entrada de menú o un atajo de teclado de la "
+"<app>Terminal</app> para abrir una nueva terminal, se utiliza el perfil de "
+"la terminal existente."
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:277
-#, fuzzy
-#| msgid "Select the profile you wish to delete."
 msgid "Select the profile you wish to set as the default."
-msgstr "Seleccione el perfil que quiere eliminar."
+msgstr "Seleccione el perfil que quiere establecer como predeterminado."
 
 #. (itstool) path: item/p
 #: C/pref-profiles.page:283
-#, fuzzy
-#| msgid "Select <gui style=\"menuitem\">Sent Mail To…</gui>."
 msgid "Select <gui style=\"menuitem\">Set as default</gui>."
-msgstr "Seleccione <gui style=\"menuitem\">Enviar correo a…</gui>."
+msgstr ""
+"Seleccione <gui style=\"menuitem\">Establecer como predeterminado</gui>."
 
+# símbolo de visto bueno
 #. (itstool) path: note/p
 #: C/pref-profiles.page:288
 msgid "The default profile is marked with a check mark symbol."
 msgstr ""
+"El perfil predeterminado se marca con un símbolo de marca de verificación."
 
 #. (itstool) path: credit/years
 #: C/pref-profile-char-width.page:13 C/pref-profile-encoding.page:13
@@ -3158,13 +3052,6 @@ msgstr "Cambiar la codificación de caracteres del perfil"
 
 #. (itstool) path: page/p
 #: C/pref-profile-encoding.page:29
-#, fuzzy
-#| msgid ""
-#| "You should normally be able to use the default, UTF-8, encoding for all "
-#| "of your terminal needs. If you do find that you regularly need to use a "
-#| "different character encoding for a specific task, you can <link xref="
-#| "\"pref-profiles#new-profile\">create a new profile</link> with a "
-#| "different encoding."
 msgid ""
 "You should normally be able to use the default, UTF-8 encoding for all of "
 "your terminal needs. If you do find that you regularly need to use a "
@@ -3172,10 +3059,10 @@ msgid ""
 "profiles#new-profile\">create a new profile</link> with a different encoding."
 msgstr ""
 "Normalmente debería poder usarla codificación predeterminada, la UTF-8, para "
-"todo lo que necesite en la terminal. Si habitualmente necesita usar una "
-"codificación de caracteres diferente para una tarea en concreto, puede <link "
-"xref=\"pref-profiles#new-profile\">crear un perfil nuevo</link> con otra "
-"codificación."
+"todo lo que necesite en la terminal. Si se da cuenta de que habitualmente "
+"necesita usar una codificación de caracteres diferente para una tarea en "
+"concreto, puede <link xref=\"pref-profiles#new-profile\">crear un perfil "
+"nuevo</link> con otra codificación."
 
 #. (itstool) path: item/p
 #: C/pref-profile-encoding.page:45
@@ -3251,16 +3138,12 @@ msgstr "Desplazar en salida"
 
 #. (itstool) path: section/p
 #: C/pref-scrolling.page:62
-#, fuzzy
-#| msgid ""
-#| "You can lock scrolling so that it always shows the newest output while a "
-#| "command executes."
 msgid ""
 "You can lock scrolling so that it always shows the newest output while a "
 "command executes and produces output."
 msgstr ""
-"Puede bloquear el desplazamiento para que siempre se muestre la salida nueva "
-"cuando se ejecute un comando."
+"Puede bloquear el desplazamiento para que siempre se muestre la salida más "
+"reciente cuando se ejecute un comando y este produzca una salida."
 
 #. (itstool) path: item/p
 #: C/pref-scrolling.page:78
@@ -3296,19 +3179,16 @@ msgstr "Líneas de desplazamiento hacia atrás"
 msgid ""
 "You can limit the number of lines of terminal output which are remembered."
 msgstr ""
+"Puede limitar el número de lineas de salida de la terminal que se recuerdan."
 
 #. (itstool) path: item/p
 #: C/pref-scrolling.page:127
-#, fuzzy
-#| msgid ""
-#| "Check <gui>Limit scrollback to</gui> and enter a number of lines which is "
-#| "greater than 0 to limit scrollback."
 msgid ""
 "Check <gui>Limit scrollback to</gui> and enter a number of lines to limit "
 "scrollback."
 msgstr ""
-"Marque la opción <gui>Limitar desplazamiento a</gui> e introduzca el número "
-"de líneas superior a 0 para limitar el desplazamiento."
+"Marque la opción <gui>Limitar desplazamiento hacia atrás a</gui> e "
+"introduzca el número de líneas para limitar el desplazamiento hacia atrás."
 
 #. (itstool) path: item/p
 #: C/pref-scrolling.page:131
@@ -3321,7 +3201,6 @@ msgstr ""
 
 #. (itstool) path: section/p
 #: C/pref-scrolling.page:136
-#| msgid "You can disable the scrollbar:"
 msgid "You can choose to have unlimited scrollback."
 msgstr "Puede elegir tener desplazamiento hacia atrás ilimitado."
 
@@ -3339,6 +3218,12 @@ msgid ""
 "such, do not show up in the directory listing. The occupied disk space is "
 "freed up as soon as the corresponding terminal closes."
 msgstr ""
+"Los datos del desplazamiento hacia atrás se almacenan en archivos "
+"comprimidos y cifrados en el disco, en la ubicación predeterminada del "
+"sistema para los archivos temporales (generalmente <file>/tmp</file>). Estos "
+"archivos se desvinculan inmediatamente después de su creación y como tales, "
+"no aparecen en la lista del directorio. El espacio en disco ocupado se "
+"libera tan pronto como se cierra la terminal correspondiente."
 
 #. (itstool) path: note/p
 #: C/pref-scrolling.page:165
@@ -3347,6 +3232,9 @@ msgid ""
 "files. If in doubt, monitor disk usage for example with the command <cmd>du /"
 "tmp</cmd>."
 msgstr ""
+"Asegúrese de tener suficiente espacio en disco disponible para estos "
+"archivos temporales. En caso de duda, monitorice el uso del disco por "
+"ejemplo con el comando <cmd>du /tmp</cmd>."
 
 #. (itstool) path: note/p
 #: C/pref-scrolling.page:171
@@ -3354,6 +3242,10 @@ msgid ""
 "A giant scrollback buffer makes resizing the terminal window slower. As a "
 "rule of thumb, resizing gets noticeably slow at around 1 million lines."
 msgstr ""
+"Un búfer de desplazamiento hacia atrás enorme hace que el cambio de tamaño "
+"de la ventana de la terminal sea más lento. Como regla general, el "
+"redimensionamiento se vuelve notablemente lento en alrededor de 1 millón de "
+"líneas."
 
 #. (itstool) path: credit/years
 #: C/pref-tab-window.page:15
@@ -3374,16 +3266,12 @@ msgstr "Ventanas y pestañas"
 
 #. (itstool) path: page/p
 #: C/pref-tab-window.page:30
-#, fuzzy
-#| msgid ""
-#| "You can chose whether to open a new tab or a new <app>Terminal</app> "
-#| "window when you use <gui style=\"menuitem\">Open Terminal</gui>."
 msgid ""
 "You can choose whether to open a new tab or a new <app>Terminal</app> window "
 "when you use <gui style=\"menuitem\">New Terminal</gui>."
 msgstr ""
 "Puede elegir abrir una pestaña nueva o una ventana nueva de la "
-"<app>Terminal</app> cuando use la opción <gui style=\"menuitem\">Abrir "
+"<app>Terminal</app> al usar la opción <gui style=\"menuitem\">Nueva "
 "terminal</gui>."
 
 #. (itstool) path: item/p
@@ -3490,9 +3378,8 @@ msgstr ""
 
 #. (itstool) path: page/title
 #: C/prob-reset.page:27
-#| msgid "Reset your <app>Terminal</app> output"
 msgid "Reset your <app>Terminal</app> state"
-msgstr "Reiniciar el estado de la <app>Terminal</app>"
+msgstr "Reiniciar el estado de su <app>Terminal</app>"
 
 #. (itstool) path: page/p
 #: C/prob-reset.page:29
@@ -3538,12 +3425,6 @@ msgstr "Reiniciar y limpiar"
 
 #. (itstool) path: section/p
 #: C/prob-reset.page:54
-#, fuzzy
-#| msgid ""
-#| "In addition to resetting your <app>Terminal</app>, <gui style=\"menuitem"
-#| "\">Reset and Clear</gui> clears the visible <app>Terminal</app> screen "
-#| "space of all terminal output. To <gui style=\"menuitem\">Reset and Clear</"
-#| "gui> your <app>Terminal</app>:"
 msgid ""
 "In addition to resetting your <app>Terminal</app>, <gui style=\"menuitem"
 "\">Reset and Clear</gui> clears the visible <app>Terminal</app> screen space "
@@ -3551,9 +3432,10 @@ msgid ""
 "gui> your <app>Terminal</app>:"
 msgstr ""
 "Además de reiniciar su <app>Terminal</app>, <gui style=\"menuitem"
-"\">Reiniciar y limpiar</gui> limpia la salida de la parte visible del "
-"espacio de la <app>Terminal</app>. Para <gui style=\"menuitem\">Reiniciar y "
-"limpiar</gui> su <app>Terminal</app>:"
+"\">Reiniciar y limpiar</gui> limpia la parte visible del espacio de la "
+"pantalla de la <app>Terminal</app> y el contenido del desplazamiento hacia "
+"atrás. Para <gui style=\"menuitem\">Reiniciar y limpiar</gui> su "
+"<app>Terminal</app>:"
 
 #. (itstool) path: item/p
 #: C/prob-reset.page:61
@@ -3566,16 +3448,12 @@ msgstr ""
 
 #. (itstool) path: note/p
 #: C/prob-reset.page:69
-#, fuzzy
-#| msgid ""
-#| "<gui>Reset and clear</gui> provides the similar functionality than the "
-#| "terminal command <cmd>reset</cmd>."
 msgid ""
 "<gui>Reset and Clear</gui> provides similar functionality as the terminal "
 "command <cmd>reset</cmd>."
 msgstr ""
 "<gui>Reiniciar y limpiar</gui> proporciona una funcionalidad similar a la "
-"del comando <cmd>reset</cmd>."
+"del comando de la terminal <cmd>reset</cmd>."
 
 #. (itstool) path: info/desc
 #: C/txt-copy-paste.page:28
@@ -3603,21 +3481,16 @@ msgstr "<gui>Copiar</gui>"
 
 #. (itstool) path: item/p
 #: C/txt-copy-paste.page:40
-#| msgid ""
-#| "Highlight the text portions you wish to copy, then select <guiseq><gui "
-#| "style=\"menu\">Edit</gui> <gui style=\"menuitem\">Copy</gui></guiseq>. "
-#| "Alternatively, you can press <keyseq><key>Ctrl</key><key>Shift</"
-#| "key><key>C</key></keyseq>."
 msgid ""
 "Highlight the text portions you wish to copy, then select <guiseq><gui style="
 "\"menu\">Edit</gui> <gui style=\"menuitem\">Copy</gui></guiseq>. "
 "Alternatively, you can press <keyseq><key>Shift</key><key>Ctrl</key><key>C</"
 "key></keyseq>."
 msgstr ""
-"Resalte los fragmentos de texto que quiere copiar y seleccione <guiseq><gui "
-"style=\"menu\">Editar</gui> <gui style=\"menuitem\">Copiar</gui></guiseq>. "
-"Alternativamente, puede pulsar <keyseq><key>Ctrl</key><key>Mayús</"
-"key><key>C</key></keyseq>."
+"Resalte los fragmentos de texto que quiere copiar y luego seleccione "
+"<guiseq><gui style=\"menu\">Editar</gui> <gui style=\"menuitem\">Copiar</"
+"gui></guiseq>. Alternativamente, puede pulsar <keyseq><key>Mayús</"
+"key><key>Ctrl</key><key>C</key></keyseq>."
 
 #. (itstool) path: item/title
 #: C/txt-copy-paste.page:46
@@ -3626,21 +3499,14 @@ msgstr "<gui>Copiar como HTML</gui>"
 
 #. (itstool) path: item/p
 #: C/txt-copy-paste.page:47
-#, fuzzy
-#| msgid ""
-#| "Highlight the text portions you wish to copy, then select <guiseq><gui "
-#| "style=\"menu\">Edit</gui> <gui style=\"menuitem\">Copy</gui></guiseq>. "
-#| "Alternatively, you can press <keyseq><key>Ctrl</key><key>Shift</"
-#| "key><key>C</key></keyseq>."
 msgid ""
 "Highlight the text portions you wish to copy with color and font attributes, "
 "then select <guiseq><gui style=\"menu\">Edit</gui> <gui style=\"menuitem"
 "\">Copy as HTML</gui></guiseq>."
 msgstr ""
-"Resalte los fragmentos de texto que quiere copiar y seleccione <guiseq><gui "
-"style=\"menu\">Editar</gui> <gui style=\"menuitem\">Copiar</gui></guiseq>. "
-"Alternativamente, puede pulsar <keyseq><key>Ctrl</key><key>Mayús</"
-"key><key>C</key></keyseq>."
+"Resalte los fragmentos de texto que quiere copiar con atributos de color y "
+"tipografía y luego seleccione <guiseq><gui style=\"menu\">Editar</gui> <gui "
+"style=\"menuitem\">Copiar como HTML</gui></guiseq>."
 
 #. (itstool) path: item/title
 #: C/txt-copy-paste.page:52
@@ -3649,19 +3515,14 @@ msgstr "<gui>Pegar</gui>"
 
 #. (itstool) path: item/p
 #: C/txt-copy-paste.page:53
-#, fuzzy
-#| msgid ""
-#| "Right click in the <app>Terminal</app> and select <gui style=\"menuitem"
-#| "\">Paste</gui>. Alternatively, you can press <keyseq><key>Ctrl</"
-#| "key><key>Shift</key><key>V</key></keyseq>."
 msgid ""
 "Right click in the <app>Terminal</app> and select <gui style=\"menuitem"
 "\">Paste</gui>. Alternatively, you can press <keyseq><key>Shift</"
 "key><key>Ctrl</key><key>V</key></keyseq>."
 msgstr ""
 "Pulse con el botón derecho en la <app>Terminal</app> y seleccione <gui style="
-"\"menuitem\">Pegar</gui>. Alternativamente, puede pulsar <keyseq><key>Ctrl</"
-"key><key>Mayús</key><key>V</key></keyseq>."
+"\"menuitem\">Pegar</gui>. Alternativamente, puede pulsar <keyseq><key>Mayús</"
+"key><key>Ctrl</key><key>V</key></keyseq>."
 
 #. (itstool) path: note/p
 #: C/txt-copy-paste.page:61
@@ -3797,10 +3658,8 @@ msgstr "Seleccione <gui style=\"menuitem\">Enviar correo a…</gui>."
 
 #. (itstool) path: info/desc
 #: C/txt-save-text.page:27
-#, fuzzy
-#| msgid "Search the <app>Terminal</app> output."
 msgid "Save <app>Terminal</app> output to a file."
-msgstr "Buscar en la salida de la <app>Terminal</app>."
+msgstr "Guarde la salida de la <app>Terminal</app> en un archivo."
 
 #. (itstool) path: page/title
 #: C/txt-save-text.page:31
@@ -3814,6 +3673,9 @@ msgid ""
 "text file. This may be useful if you have to submit the terminal output as "
 "debugging information."
 msgstr ""
+"Puede guardar toda la salida de una pestaña o ventana de la <app>Terminal</"
+"app> en un archivo de texto. Esto puede ser útil si tiene que enviar la "
+"salida del terminal como información de depuración."
 
 #. (itstool) path: item/p
 #: C/txt-save-text.page:39
@@ -3828,7 +3690,7 @@ msgstr "Seleccione <gui style=\"menuitem\">Guardar contenido…</gui>."
 #. (itstool) path: item/p
 #: C/txt-save-text.page:45
 msgid "Choose your desired directory and enter a filename."
-msgstr ""
+msgstr "Elija la carpeta que quiera e introduzca el nombre de archivo."
 
 #. (itstool) path: item/p
 #: C/txt-save-text.page:48
@@ -3842,6 +3704,9 @@ msgid ""
 "example <input>.txt</input>. This may be useful if you plan to view the file "
 "when using another operating system."
 msgstr ""
+"Opcionalmente, puede introducir una extensión de archivo junto con el nombre "
+"del archivo, por ejemplo <input>.txt</input>. Esto puede ser útil si planea "
+"ver el archivo usando otro sistema operativo."
 
 #. (itstool) path: info/desc
 #: C/txt-search.page:27
@@ -3873,6 +3738,9 @@ msgid ""
 "Type in the search keyword and press <key>Enter</key> to search backwards. "
 "Alternatively, click on the arrows according to the desired search direction."
 msgstr ""
+"Escriba la palabra clave de búsqueda y pulse <key>Intro</key> para buscar "
+"hacia atrás. Alternativamente, pulse en las flechas según la dirección de "
+"búsqueda que quiera."
 
 #. (itstool) path: page/p
 #: C/txt-search.page:47
@@ -3902,13 +3770,6 @@ msgstr "<gui style=\"checkbox\">Coincidir sólo con la palabra entera</gui>"
 
 #. (itstool) path: item/p
 #: C/txt-search.page:58
-#, fuzzy
-#| msgid ""
-#| "<app>Terminal</app> will look for the entire keyword and will ignore "
-#| "results that partially match your search keyword. For example, if you "
-#| "have searched for \"gnome\", <app>Terminal</app> will show only results "
-#| "that match this keyword exactly and omit results such as \"gnome-terminal"
-#| "\"."
 msgid ""
 "<app>Terminal</app> will look for the entire keyword and will ignore results "
 "that partially match your search keyword. For example, if you have searched "
@@ -3916,9 +3777,9 @@ msgid ""
 "keyword exactly and omit results such as “bobcat”."
 msgstr ""
 "La <app>Terminal</app> buscará la palabra completa e ignorará los resultados "
-"que coincidan con ella parcialmente. Por ejemplo, si busca la palabra "
-"«gnome», la <app>Terminal</app> sólo mostrará los resultados que coincidan "
-"con esta palabra exactamente y omitirá los resultados como «gnome-terminal»."
+"que coincidan con ella parcialmente. Por ejemplo, si busca la palabra «cat», "
+"la <app>Terminal</app> sólo mostrará los resultados que coincidan con esta "
+"palabra exactamente y omitirá resultados como «bobcat»."
 
 #. (itstool) path: item/title
 #: C/txt-search.page:65
@@ -3943,18 +3804,13 @@ msgstr "<gui style=\"checkbox\">Volver al principio</gui>"
 
 #. (itstool) path: item/p
 #: C/txt-search.page:72
-#, fuzzy
-#| msgid ""
-#| "<app>Terminal</app> searches from your current location in the scrollback "
-#| "to the end of available terminal output and then restarts the search from "
-#| "the top."
 msgid ""
 "<app>Terminal</app> searches from your current location in the scrollback to "
 "the end of available terminal output and then restarts the search."
 msgstr ""
-"La <app>Terminal</app> busca desde su ubicación actual en el desplazamiento "
-"hacia atrás hasta el final de la salida de la terminal disponible y luego "
-"vuelve a buscar desde el principio."
+"La <app>Terminal</app> busca desde su ubicación actual, en el desplazamiento "
+"hacia atrás, hasta el final de la salida disponible de la terminal y luego "
+"reinicia la búsqueda."
 
 #. (itstool) path: note/p
 #: C/txt-search.page:79
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 1d8666b..1ba1a4b 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -6,20 +6,21 @@
 # Julien Hardelin <[e-mail]>, 2013.
 # Alexandre Franke <[e-mail]>, 2014 - 2015.
 # Alain Lojewski <[e-mail]>, 2014.
-# Guillaume Bernard <[e-mail]>, 2015.
+# Guillaume Bernard Guillaume Bernard <[e-mail]>, 2015-2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-terminal gnome-3-10\n"
-"POT-Creation-Date: 2015-03-13 21:58+0000\n"
-"PO-Revision-Date: 2015-03-13 23:59+0100\n"
-"Last-Translator: Guillaume Bernard <[e-mail]>\n"
+"POT-Creation-Date: 2018-03-11 09:27+0000\n"
+"PO-Revision-Date: 2018-03-12 18:32+0100\n"
+"Last-Translator: Guillaume Bernard <[e-mail]>\n"
 "Language-Team: français <[e-mail]>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -30,82 +31,82 @@ msgstr ""
 "Alexandre Franke <[e-mail]>, 2014\n"
 "Alain Lojewski <[e-mail]>, 2014\n"
 "Jérôme Sirgue <[e-mail]>, 2014\n"
-"Guillaume Bernard <[e-mail]>, 2015"
+"Guillaume Bernard <[e-mail]>, 2015-2018"
 
 #. (itstool) path: credit/name
-#: C/adv-keyboard-shortcuts.page:13 C/app-colors.page:11 C/app-cursor.page:11
+#: C/adv-keyboard-shortcuts.page:13 C/app-colors.page:11 C/app-cursor.page:12
 #: C/app-fonts.page:11 C/app-fullscreen.page:11 C/app-terminal-sizes.page:11
 #: C/app-zoom.page:10 C/gs-execute-commands.page:14 C/gs-tabs.page:12
-#: C/index.page:12 C/introduction.page:12 C/overview.page:9
-#: C/pref-bell.page:11 C/pref-custom-exit.page:13
-#: C/pref-custom-command.page:14 C/pref-encoding.page:10
-#: C/pref-keyboard-access.page:12 C/pref-menubar.page:13
-#: C/pref-profiles.page:12 C/pref-scrolling.page:12 C/prob-reset.page:11
-#: C/txt-copy-paste.page:11 C/txt-links.page:10 C/txt-search.page:10
-#: C/txt-select-text.page:14
+#: C/index.page:12 C/introduction.page:12 C/overview.page:9 C/pref-bell.page:11
+#: C/pref-custom-exit.page:13 C/pref-custom-command.page:14
+#: C/pref-encoding.page:9 C/pref-keyboard-access.page:12
+#: C/pref-login-shell.page:12 C/pref-menubar.page:13 C/pref-profiles.page:12
+#: C/pref-scrolling.page:12 C/prob-reset.page:11 C/txt-copy-paste.page:11
+#: C/txt-links.page:10 C/txt-save-text.page:10 C/txt-search.page:10
+#: C/txt-select-text.page:13
 msgid "Sindhu S"
 msgstr "Sindhu S"
 
 #. (itstool) path: credit/years
 #: C/adv-keyboard-shortcuts.page:15 C/adv-keyboard-shortcuts.page:20
 #: C/adv-keyboard-shortcuts.page:25 C/app-colors.page:13 C/app-colors.page:18
-#: C/app-colors.page:23 C/app-cursor.page:13 C/app-cursor.page:18
-#: C/app-cursor.page:23 C/app-fonts.page:13 C/app-fonts.page:18
+#: C/app-colors.page:23 C/app-cursor.page:14 C/app-cursor.page:19
+#: C/app-cursor.page:24 C/app-fonts.page:13 C/app-fonts.page:18
 #: C/app-fonts.page:23 C/app-fullscreen.page:13 C/app-fullscreen.page:18
 #: C/app-fullscreen.page:23 C/app-terminal-sizes.page:13
-#: C/app-terminal-sizes.page:18 C/app-terminal-sizes.page:23
-#: C/app-zoom.page:12 C/app-zoom.page:17 C/app-zoom.page:22
-#: C/gs-execute-commands.page:16 C/gs-execute-commands.page:26
-#: C/gs-tabs.page:14 C/gs-tabs.page:24 C/index.page:14 C/index.page:19
-#: C/index.page:24 C/introduction.page:14 C/introduction.page:19
-#: C/introduction.page:24 C/overview.page:11 C/overview.page:16
-#: C/pref-bell.page:13 C/pref-bell.page:18 C/pref-bell.page:23
-#: C/pref-custom-exit.page:15 C/pref-custom-exit.page:25
+#: C/app-terminal-sizes.page:18 C/app-terminal-sizes.page:23 C/app-zoom.page:12
+#: C/app-zoom.page:17 C/app-zoom.page:22 C/gs-execute-commands.page:16
+#: C/gs-execute-commands.page:26 C/gs-tabs.page:14 C/gs-tabs.page:24
+#: C/index.page:14 C/index.page:19 C/index.page:24 C/introduction.page:14
+#: C/introduction.page:19 C/introduction.page:24 C/overview.page:11
+#: C/overview.page:16 C/pref-bell.page:13 C/pref-bell.page:18
+#: C/pref-bell.page:23 C/pref-custom-exit.page:15 C/pref-custom-exit.page:25
 #: C/pref-custom-command.page:16 C/pref-custom-command.page:26
-#: C/pref-encoding.page:12 C/pref-encoding.page:17 C/pref-encoding.page:22
+#: C/pref-encoding.page:11 C/pref-encoding.page:16 C/pref-encoding.page:21
 #: C/pref-keyboard-access.page:14 C/pref-keyboard-access.page:19
-#: C/pref-keyboard-access.page:24 C/pref-menubar.page:15
-#: C/pref-menubar.page:20 C/pref-menubar.page:25 C/pref-profiles.page:14
-#: C/pref-profiles.page:24 C/pref-scrolling.page:14 C/prob-reset.page:13
-#: C/prob-reset.page:18 C/txt-copy-paste.page:13 C/txt-copy-paste.page:18
-#: C/txt-copy-paste.page:23 C/txt-links.page:12 C/txt-links.page:17
-#: C/txt-links.page:22 C/txt-search.page:12 C/txt-search.page:17
-#: C/txt-search.page:22 C/txt-select-text.page:16
+#: C/pref-keyboard-access.page:24 C/pref-login-shell.page:14
+#: C/pref-login-shell.page:24 C/pref-menubar.page:15 C/pref-menubar.page:20
+#: C/pref-menubar.page:25 C/pref-profiles.page:14 C/pref-profiles.page:24
+#: C/pref-scrolling.page:14 C/prob-reset.page:13 C/prob-reset.page:18
+#: C/txt-copy-paste.page:13 C/txt-copy-paste.page:18 C/txt-copy-paste.page:23
+#: C/txt-links.page:12 C/txt-links.page:17 C/txt-links.page:22
+#: C/txt-save-text.page:12 C/txt-save-text.page:17 C/txt-save-text.page:22
+#: C/txt-search.page:12 C/txt-search.page:17 C/txt-search.page:22
+#: C/txt-select-text.page:15
 msgid "2013"
 msgstr "2013"
 
 #. (itstool) path: credit/name
-#: C/adv-keyboard-shortcuts.page:18 C/app-colors.page:16 C/app-cursor.page:16
+#: C/adv-keyboard-shortcuts.page:18 C/app-colors.page:16 C/app-cursor.page:17
 #: C/app-fonts.page:16 C/app-fullscreen.page:16 C/app-terminal-sizes.page:16
 #: C/app-zoom.page:15 C/gs-execute-commands.page:19 C/gs-tabs.page:17
 #: C/index.page:17 C/introduction.page:17 C/overview.page:14 C/pref.page:9
-#: C/pref-bell.page:16 C/pref-custom-exit.page:18
-#: C/pref-custom-command.page:19 C/pref-encoding.page:15
-#: C/pref-keyboard-access.page:17 C/pref-menubar.page:18
-#: C/pref-profiles.page:17 C/pref-profile-char-width.page:11
-#: C/pref-profile-encoding.page:11 C/pref-scrolling.page:17
-#: C/pref-tab-window.page:13 C/pref-user-input.page:10 C/profile.page:9
+#: C/pref-bell.page:16 C/pref-custom-exit.page:18 C/pref-custom-command.page:19
+#: C/pref-encoding.page:14 C/pref-keyboard-access.page:17
+#: C/pref-login-shell.page:17 C/pref-menubar.page:18 C/pref-profiles.page:17
+#: C/pref-profile-char-width.page:11 C/pref-profile-encoding.page:11
+#: C/pref-scrolling.page:17 C/pref-tab-window.page:13 C/pref-user-input.page:10
 #: C/prob-reset.page:16 C/txt-copy-paste.page:16 C/txt-links.page:15
-#: C/txt-search.page:15 C/txt-select-text.page:19
+#: C/txt-save-text.page:15 C/txt-search.page:15 C/txt-select-text.page:18
 msgid "Ekaterina Gerasimova"
 msgstr "Ekaterina Gerasimova"
 
 #. (itstool) path: credit/name
-#: C/adv-keyboard-shortcuts.page:23 C/app-colors.page:21 C/app-cursor.page:21
+#: C/adv-keyboard-shortcuts.page:23 C/app-colors.page:21 C/app-cursor.page:22
 #: C/app-fonts.page:21 C/app-fullscreen.page:21 C/app-terminal-sizes.page:21
 #: C/app-zoom.page:20 C/gs-execute-commands.page:24 C/gs-tabs.page:22
 #: C/introduction.page:22 C/pref-bell.page:21 C/pref-custom-exit.page:23
-#: C/pref-custom-command.page:24 C/pref-encoding.page:20
-#: C/pref-keyboard-access.page:22 C/pref-menubar.page:23
-#: C/pref-profiles.page:22 C/txt-copy-paste.page:21 C/txt-links.page:20
-#: C/txt-search.page:20
+#: C/pref-custom-command.page:24 C/pref-encoding.page:19
+#: C/pref-keyboard-access.page:22 C/pref-login-shell.page:22
+#: C/pref-menubar.page:23 C/pref-profiles.page:22 C/txt-copy-paste.page:21
+#: C/txt-links.page:20 C/txt-save-text.page:20 C/txt-search.page:20
 msgid "Michael Hill"
 msgstr "Michael Hill"
 
 #. (itstool) path: info/desc
 #: C/adv-keyboard-shortcuts.page:30
 msgid "View and edit keyboard shortcuts."
-msgstr "Afficher et modifier les raccourcis clavier"
+msgstr "Afficher et modifier les raccourcis clavier."
 
 #. (itstool) path: page/title
 #: C/adv-keyboard-shortcuts.page:33
@@ -121,17 +122,17 @@ msgid ""
 "preferences."
 msgstr ""
 "Les raccourcis clavier sont des combinaisons de touches qui vous permettent "
-"d'effectuer des actions telles que l'ouverture de la boîte de dialogue des "
-"paramètres ou l'accès rapide à une fonctionnalité de <app>Terminal</app>. "
+"d’effectuer des actions telles que l’ouverture de la boîte de dialogue des "
+"paramètres ou l’accès rapide à une fonctionnalité de <app>Terminal</app>. "
 "Ces raccourcis peuvent être modifiés en fonction de vos préférences."
 
 #. (itstool) path: page/p
 #: C/adv-keyboard-shortcuts.page:40
 msgid "To change a keyboard shortcut:"
-msgstr "Pour changer un raccourci clavier : "
+msgstr "Pour changer un raccourci clavier :"
 
 #. (itstool) path: item/p
-#: C/adv-keyboard-shortcuts.page:43 C/pref-keyboard-access.page:80
+#: C/adv-keyboard-shortcuts.page:43
 msgid ""
 "Select <guiseq><gui style=\"menu\">Edit</gui> <gui style=\"menuitem"
 "\">Preferences</gui> <gui style=\"tab\">Shortcuts</gui></guiseq>."
@@ -140,12 +141,19 @@ msgstr ""
 "\">Préférences</gui> <gui style=\"tab\">Raccourcis</gui></guiseq>."
 
 #. (itstool) path: item/p
-#: C/adv-keyboard-shortcuts.page:48
+#: C/adv-keyboard-shortcuts.page:48 C/adv-keyboard-shortcuts.page:51
+msgid "Make sure <gui style=\"checkbox\">Enable shortcuts</gui> is selected."
+msgstr ""
+"Assurez-vous que <gui style=\"checkbox\">Activer les raccourcis</gui> est "
+"sélectionné."
+
+#. (itstool) path: item/p
+#: C/adv-keyboard-shortcuts.page:54
 msgid "Select the shortcut that you wish to edit by clicking on it."
-msgstr "Sélectionner le raccourci que vous voulez modifier en cliquant dessus"
+msgstr "Sélectionner le raccourci que vous voulez modifier en cliquant dessus."
 
 #. (itstool) path: item/p
-#: C/adv-keyboard-shortcuts.page:51
+#: C/adv-keyboard-shortcuts.page:57
 msgid ""
 "Once the shortcut is selected, click on the shortcut key combination to edit "
 "it."
@@ -154,19 +162,20 @@ msgstr ""
 "touches de raccourci pour le modifier."
 
 #. (itstool) path: item/p
-#: C/adv-keyboard-shortcuts.page:55
+#: C/adv-keyboard-shortcuts.page:61
 msgid ""
 "Press your desired shortcut key combination as you would enter it to use it. "
 "The keys that you can use include <key>Alt</key>, <key>Alt Gr</key>, "
-"<key>Ctrl</key>, <key>Shift</key>, number and letter keys."
+"<key>Ctrl</key>, <key>Shift</key>, <key>Super</key>, number and letter keys."
 msgstr ""
-"Saisissez la combinaison de touches de raccourci souhaitée dans l'ordre que "
+"Saisissez la combinaison de touches de raccourci souhaitée dans l’ordre que "
 "vous devrez saisir lors de son utilisation. Les touches que vous pouvez "
 "utiliser incluent les touches <key>Alt</key>, <key>Alt Gr</key>, <key>Ctrl</"
-"key>, <key>Maj</key>, ainsi que les touches de chiffres et de lettres."
+"key>, <key>Maj</key>, <key>Logo</key>, ainsi que les touches de chiffres et "
+"de lettres."
 
 #. (itstool) path: note/p
-#: C/adv-keyboard-shortcuts.page:60
+#: C/adv-keyboard-shortcuts.page:66
 msgid ""
 "Mnemonic key combinations, such as <keyseq><key>Alt</key> <key>F</key></"
 "keyseq> will not work."
@@ -175,16 +184,16 @@ msgstr ""
 "keyseq> ne fonctionnent pas."
 
 #. (itstool) path: item/p
-#: C/adv-keyboard-shortcuts.page:65
+#: C/adv-keyboard-shortcuts.page:71
 msgid ""
 "Once you have entered your new shortcut, it will automatically be saved and "
 "you should see it in the list next to the corresponding action."
 msgstr ""
 "Une fois le nouveau raccourci saisi, il sera automatiquement enregistré et "
-"vous devriez le voir dans la liste à côté de l'action correspondante."
+"vous devriez le voir dans la liste à côté de l’action correspondante."
 
 #. (itstool) path: note/p
-#: C/adv-keyboard-shortcuts.page:72
+#: C/adv-keyboard-shortcuts.page:78
 msgid ""
 "To disable a shortcut, edit it and press the <key>Backspace</key> instead of "
 "the new shortcut."
@@ -193,373 +202,443 @@ msgstr ""
 "<key>Retour arrière</key> au lieu du nouveau raccourci."
 
 #. (itstool) path: section/title
-#: C/adv-keyboard-shortcuts.page:77
+#: C/adv-keyboard-shortcuts.page:83
 msgid "<gui style=\"menu\">File</gui> shortcuts"
 msgstr "Raccourcis de <gui style=\"menu\">Fichier</gui>"
 
 #. (itstool) path: section/p
-#: C/adv-keyboard-shortcuts.page:79
+#: C/adv-keyboard-shortcuts.page:85
 msgid ""
 "The default shortcuts for options under <gui style=\"menu\">File</gui> menu "
 "are:"
 msgstr ""
 "Les raccourcis par défaut pour les options du menu <gui style=\"menu"
-"\">Fichier</gui> sont : "
+"\">Fichier</gui> sont :"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:85 C/adv-keyboard-shortcuts.page:119
-#: C/adv-keyboard-shortcuts.page:145 C/adv-keyboard-shortcuts.page:178
-#: C/adv-keyboard-shortcuts.page:252 C/adv-keyboard-shortcuts.page:273
-#: C/adv-keyboard-shortcuts.page:306
+#: C/adv-keyboard-shortcuts.page:91 C/adv-keyboard-shortcuts.page:125
+#: C/adv-keyboard-shortcuts.page:151 C/adv-keyboard-shortcuts.page:185
+#: C/adv-keyboard-shortcuts.page:218 C/adv-keyboard-shortcuts.page:291
+#: C/adv-keyboard-shortcuts.page:340
 msgid "Action"
 msgstr "Action"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:86 C/adv-keyboard-shortcuts.page:120
-#: C/adv-keyboard-shortcuts.page:146 C/adv-keyboard-shortcuts.page:179
-#: C/adv-keyboard-shortcuts.page:253 C/adv-keyboard-shortcuts.page:274
+#: C/adv-keyboard-shortcuts.page:92 C/adv-keyboard-shortcuts.page:126
+#: C/adv-keyboard-shortcuts.page:152 C/adv-keyboard-shortcuts.page:186
+#: C/adv-keyboard-shortcuts.page:219 C/adv-keyboard-shortcuts.page:292
 msgid "Keyboard Shortcut"
 msgstr "Raccourci Clavier"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:91
+#: C/adv-keyboard-shortcuts.page:97
 msgid "New Tab"
 msgstr "Nouvel Onglet"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:92
+#: C/adv-keyboard-shortcuts.page:98
 msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>T</key></keyseq>"
 msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>T</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:95
+#: C/adv-keyboard-shortcuts.page:101
 msgid "New Window"
 msgstr "Nouvelle Fenêtre"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:96
+#: C/adv-keyboard-shortcuts.page:102
 msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>N</key></keyseq>"
 msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>N</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:99
+#: C/adv-keyboard-shortcuts.page:105
 msgid "Close Tab"
-msgstr "Fermer l'onglet"
+msgstr "Fermer l’onglet"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:100
+#: C/adv-keyboard-shortcuts.page:106
 msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>W</key></keyseq>"
 msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>W</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:103
+#: C/adv-keyboard-shortcuts.page:109
 msgid "Close Window"
 msgstr "Fermer la Fenêtre"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:104
+#: C/adv-keyboard-shortcuts.page:110
 msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq>"
 msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>Q</key></keyseq>"
 
 #. (itstool) path: section/title
-#: C/adv-keyboard-shortcuts.page:111
+#: C/adv-keyboard-shortcuts.page:117
 msgid "<gui style=\"menu\">Edit</gui> shortcuts"
 msgstr "Raccourcis <gui style=\"menu\">Édition</gui>"
 
 #. (itstool) path: section/p
-#: C/adv-keyboard-shortcuts.page:113
+#: C/adv-keyboard-shortcuts.page:119
 msgid ""
 "The default shortcuts for options under <gui style=\"menu\">Edit</gui> menu "
 "are:"
 msgstr ""
 "Les raccourcis par défaut pour les options du menu <gui style=\"menu"
-"\">Édition</gui> sont : "
+"\">Édition</gui> sont :"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:125
+#: C/adv-keyboard-shortcuts.page:131
 msgid "Copy"
 msgstr "Copier"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:126
-msgid "<keyseq><key>Ctrl</key><key>Shift</key><key>C</key></keyseq>"
-msgstr "<keyseq><key>Ctrl</key><key>Shift</key><key>C</key></keyseq>"
+#: C/adv-keyboard-shortcuts.page:132
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>C</key></keyseq>"
+msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>C</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:129
+#: C/adv-keyboard-shortcuts.page:135
 msgid "Paste"
 msgstr "Coller"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:130
-msgid "<keyseq><key>Ctrl</key><key>Shift</key><key>V</key></keyseq>"
-msgstr "<keyseq><key>Ctrl</key><key>Shift</key><key>V</key></keyseq>"
+#: C/adv-keyboard-shortcuts.page:136
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>V</key></keyseq>"
+msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>V</key></keyseq>"
 
 #. (itstool) path: section/title
-#: C/adv-keyboard-shortcuts.page:137
+#: C/adv-keyboard-shortcuts.page:143
 msgid "<gui style=\"menu\">View</gui> shortcuts"
 msgstr "Raccourcis <gui style=\"menu\">Affichage</gui>"
 
 #. (itstool) path: section/p
-#: C/adv-keyboard-shortcuts.page:139
+#: C/adv-keyboard-shortcuts.page:145
 msgid ""
 "The default shortcuts for options in the <gui style=\"menu\">View</gui> menu "
 "are:"
 msgstr ""
 "Les raccourcis par défaut des options dans le menu <gui style=\"menu"
-"\">Affichage</gui> sont : "
+"\">Affichage</gui> sont :"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:151
+#: C/adv-keyboard-shortcuts.page:157
 msgid "Full Screen"
 msgstr "Plein écran"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:152
+#: C/adv-keyboard-shortcuts.page:158
 msgid "<key>F11</key>"
 msgstr "<key>F11</key>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:155
+#: C/adv-keyboard-shortcuts.page:161
 msgid "Zoom In"
 msgstr "Zoom avant"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:156
+#: C/adv-keyboard-shortcuts.page:162
 msgid "<keyseq><key>Ctrl</key><key>+</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>+</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:159
+#: C/adv-keyboard-shortcuts.page:165
 msgid "Zoom Out"
 msgstr "Zoom arrière"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:160
+#: C/adv-keyboard-shortcuts.page:166
 msgid "<keyseq><key>Ctrl</key><key>-</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>-</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:163
+#: C/adv-keyboard-shortcuts.page:169
 msgid "Normal Size"
 msgstr "Taille normale"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:164
+#: C/adv-keyboard-shortcuts.page:170
 msgid "<keyseq><key>Ctrl</key><key>0</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>0</key></keyseq>"
 
 #. (itstool) path: section/title
-#: C/adv-keyboard-shortcuts.page:171
+#: C/adv-keyboard-shortcuts.page:177
+msgid "<gui style=\"menu\">Find</gui> shortcuts"
+msgstr "Raccourcis de <gui style=\"menu\">Rechercher</gui>"
+
+#. (itstool) path: section/p
+#: C/adv-keyboard-shortcuts.page:179
+msgid ""
+"The default shortcuts for options under <gui style=\"menu\">Find</gui> menu "
+"are:"
+msgstr ""
+"Les raccourcis par défaut pour les options du menu <gui style=\"menu"
+"\">Fichier</gui> sont :"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:191
+msgid "Find"
+msgstr "Rechercher"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:192
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>F</key></keyseq>"
+msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>F</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:195
+msgid "Find Next"
+msgstr "Rechercher le suivant"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:196
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq>"
+msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>G</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:199
+msgid "Find Previous"
+msgstr "Rechercher le précédent"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:200
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>H</key></keyseq>"
+msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>H</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:203
+msgid "Clear Highlight"
+msgstr "Effacer les surbrillances"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:204
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>"
+msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>J</key></keyseq>"
+
+#. (itstool) path: section/title
+#: C/adv-keyboard-shortcuts.page:211
 msgid "Tab shortcuts"
-msgstr "Raccourcis d'onglet"
+msgstr "Raccourcis d’onglet"
 
 #. (itstool) path: section/p
-#: C/adv-keyboard-shortcuts.page:173
+#: C/adv-keyboard-shortcuts.page:213
 msgid "The default shortcuts for working with tabs are:"
-msgstr "Les raccourcis par défaut pour travailler avec les onglets sont : "
+msgstr "Les raccourcis par défaut pour travailler avec les onglets sont :"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:184
+#: C/adv-keyboard-shortcuts.page:224
 msgid "Switch to Previous Tab"
-msgstr "Passer à l'onglet précédent"
+msgstr "Passer à l’onglet précédent"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:185
+#: C/adv-keyboard-shortcuts.page:225
 msgid "<keyseq><key>Ctrl</key><key>Page Up</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>Page haut</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:188
+#: C/adv-keyboard-shortcuts.page:228
 msgid "Switch to Next Tab"
-msgstr "Passer à l'onglet suivant"
+msgstr "Passer à l’onglet suivant"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:189
+#: C/adv-keyboard-shortcuts.page:229
 msgid "<keyseq><key>Ctrl</key><key>Page Down</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>Page bas</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:192
+#: C/adv-keyboard-shortcuts.page:232
 msgid "Move Tab to the Left"
-msgstr "Déplacer l'onglet vers la gauche"
+msgstr "Déplacer l’onglet vers la gauche"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:193
+#: C/adv-keyboard-shortcuts.page:233
 msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>Page Up</key></keyseq>"
 msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>Page haut</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:196
+#: C/adv-keyboard-shortcuts.page:236
 msgid "Move Tab to the Right"
-msgstr "Déplacer l'onglet vers la droite"
+msgstr "Déplacer l’onglet vers la droite"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:197
+#: C/adv-keyboard-shortcuts.page:237
 msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>Page Down</key></keyseq>"
 msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>Page bas</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:200
+#: C/adv-keyboard-shortcuts.page:240
 msgid "Switch to Tab 1"
-msgstr "Passer à l'onglet 1"
+msgstr "Passer à l’onglet 1"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:201
+#: C/adv-keyboard-shortcuts.page:241
 msgid "<keyseq><key>Alt</key><key>1</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>1</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:204
+#: C/adv-keyboard-shortcuts.page:244
 msgid "Switch to Tab 2"
-msgstr "Passer à l'onglet 2"
+msgstr "Passer à l’onglet 2"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:205
+#: C/adv-keyboard-shortcuts.page:245
 msgid "<keyseq><key>Alt</key><key>2</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>2</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:208
+#: C/adv-keyboard-shortcuts.page:248
 msgid "Switch to Tab 3"
-msgstr "Passer à l'onglet 3"
+msgstr "Passer à l’onglet 3"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:209
+#: C/adv-keyboard-shortcuts.page:249
 msgid "<keyseq><key>Alt</key><key>3</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>3</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:212
+#: C/adv-keyboard-shortcuts.page:252
 msgid "Switch to Tab 4"
-msgstr "Passer à l'onglet 4"
+msgstr "Passer à l’onglet 4"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:213
+#: C/adv-keyboard-shortcuts.page:253
 msgid "<keyseq><key>Alt</key><key>4</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>4</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:216
+#: C/adv-keyboard-shortcuts.page:256
 msgid "Switch to Tab 5"
-msgstr "Passer à l'onglet 5"
+msgstr "Passer à l’onglet 5"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:217
+#: C/adv-keyboard-shortcuts.page:257
 msgid "<keyseq><key>Alt</key><key>5</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>5</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:220
+#: C/adv-keyboard-shortcuts.page:260
 msgid "Switch to Tab 6"
-msgstr "Passer à l'onglet 6"
+msgstr "Passer à l’onglet 6"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:221
+#: C/adv-keyboard-shortcuts.page:261
 msgid "<keyseq><key>Alt</key><key>6</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>6</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:224
+#: C/adv-keyboard-shortcuts.page:264
 msgid "Switch to Tab 7"
-msgstr "Passer à l'onglet 7"
+msgstr "Passer à l’onglet 7"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:225
+#: C/adv-keyboard-shortcuts.page:265
 msgid "<keyseq><key>Alt</key><key>7</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>7</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:228
+#: C/adv-keyboard-shortcuts.page:268
 msgid "Switch to Tab 8"
-msgstr "Passer à l'onglet 8"
+msgstr "Passer à l’onglet 8"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:229
+#: C/adv-keyboard-shortcuts.page:269
 msgid "<keyseq><key>Alt</key><key>8</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>8</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:232
+#: C/adv-keyboard-shortcuts.page:272
 msgid "Switch to Tab 9"
-msgstr "Passer à l'onglet 9"
+msgstr "Passer à l’onglet 9"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:233
+#: C/adv-keyboard-shortcuts.page:273
 msgid "<keyseq><key>Alt</key><key>9</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>9</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:236
+#: C/adv-keyboard-shortcuts.page:276
 msgid "Switch to Tab 10"
-msgstr "Passer à l'onglet 10"
+msgstr "Passer à l’onglet 10"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:237
+#: C/adv-keyboard-shortcuts.page:277
 msgid "<keyseq><key>Alt</key><key>0</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>0</key></keyseq>"
 
 #. (itstool) path: section/title
-#: C/adv-keyboard-shortcuts.page:244
-msgid "Help shortcuts"
-msgstr "Raccourcis de l'Aide"
-
-#. (itstool) path: section/p
-#: C/adv-keyboard-shortcuts.page:246
-msgid ""
-"The default shortcuts for accessing items in the <gui style=\"menu\">Help</"
-"gui> menu are:"
-msgstr ""
-"Les raccourcis par défaut pour accéder aux éléments dans le menu <gui style="
-"\"menu\">Aide</gui> sont : "
-
-#. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:258
-msgid "Contents"
-msgstr "Sommaire"
-
-#. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:259
-msgid "<key>F1</key>"
-msgstr "<key>F1</key>"
-
-#. (itstool) path: section/title
-#: C/adv-keyboard-shortcuts.page:266
+#: C/adv-keyboard-shortcuts.page:284
 msgid "Other"
 msgstr "Autre"
 
 #. (itstool) path: section/p
-#: C/adv-keyboard-shortcuts.page:268
+#: C/adv-keyboard-shortcuts.page:286
 msgid "There are also some shortcuts that cannot be edited:"
-msgstr "Il y a aussi quelques raccourcis qui ne peuvent pas être modifiés : "
+msgstr "Il y a aussi quelques raccourcis qui ne peuvent pas être modifiés :"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:279
+#: C/adv-keyboard-shortcuts.page:297
 msgid "Scroll up by one line"
 msgstr "Défilement vers le haut ligne par ligne"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:280
+#: C/adv-keyboard-shortcuts.page:298
 msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>Up</key></keyseq>"
 msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>Haut</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:283
+#: C/adv-keyboard-shortcuts.page:301
 msgid "Scroll down by one line"
 msgstr "Défilement vers le bas ligne par ligne"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:284
+#: C/adv-keyboard-shortcuts.page:302
 msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>Down</key></keyseq>"
 msgstr "<keyseq><key>Maj</key><key>Ctrl</key><key>Bas</key></keyseq>"
 
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:305
+msgid "Scroll up by one page"
+msgstr "Défilement vers le haut page par page"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:306
+msgid "<keyseq><key>Shift</key><key>Page Up</key></keyseq>"
+msgstr "<keyseq><key>Maj</key><key>Page haut</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:309
+msgid "Scroll down by one page"
+msgstr "Défilement vers le bas page par page"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:310
+msgid "<keyseq><key>Shift</key><key>Page Down</key></keyseq>"
+msgstr "<keyseq><key>Maj</key><key>Page bas</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:313
+msgid "Scroll to the top"
+msgstr "Défilement vers le haut"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:314
+msgid "<keyseq><key>Shift</key><key>Home</key></keyseq>"
+msgstr "<keyseq><key>Maj</key><key>Origine</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:317
+msgid "Scroll to the bottom"
+msgstr "Défilement vers le bas"
+
+#. (itstool) path: td/p
+#: C/adv-keyboard-shortcuts.page:318
+msgid "<keyseq><key>Shift</key><key>End</key></keyseq>"
+msgstr "<keyseq><key>Maj</key><key>Fin</key></keyseq>"
+
 #. (itstool) path: section/title
-#: C/adv-keyboard-shortcuts.page:291
+#: C/adv-keyboard-shortcuts.page:325
 msgid "Bash shortcuts"
 msgstr "Raccourcis Bash"
 
 #. (itstool) path: section/p
-#: C/adv-keyboard-shortcuts.page:293
+#: C/adv-keyboard-shortcuts.page:327
 msgid ""
 "These are <app>Bash</app> shortcuts. <app>Bash</app> is usually the default "
 "shell."
@@ -568,178 +647,174 @@ msgstr ""
 "habituellement le shell par défaut."
 
 #. (itstool) path: section/p
-#: C/adv-keyboard-shortcuts.page:301
+#: C/adv-keyboard-shortcuts.page:335
 msgid "<app>Bash</app> shell specific keyboard shortcuts are:"
-msgstr "Les raccourcis clavier spécifiques du shell <app>Bash</app> sont : "
+msgstr "Les raccourcis clavier spécifiques du shell <app>Bash</app> sont :"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:307
+#: C/adv-keyboard-shortcuts.page:341
 msgid "Keyboard shortcut"
 msgstr "Raccourci Clavier"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:312
+#: C/adv-keyboard-shortcuts.page:346
 msgid "Erase a word"
 msgstr "Effacer un mot"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:313 C/adv-keyboard-shortcuts.page:353
+#: C/adv-keyboard-shortcuts.page:347 C/adv-keyboard-shortcuts.page:387
 msgid "<keyseq><key>Ctrl</key><key>W</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>W</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:316
+#: C/adv-keyboard-shortcuts.page:350
 msgid "Erase a line"
 msgstr "Effacer une ligne"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:317
+#: C/adv-keyboard-shortcuts.page:351
 msgid "<keyseq><key>Ctrl</key><key>U</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>U</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:320
+#: C/adv-keyboard-shortcuts.page:354
 msgid "Move to the start of the line"
-msgstr "Se déplacer jusqu'au début de la ligne"
+msgstr "Se déplacer jusqu’au début de la ligne"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:321
+#: C/adv-keyboard-shortcuts.page:355
 msgid "<keyseq><key>Ctrl</key><key>A</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>A</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:324
+#: C/adv-keyboard-shortcuts.page:358
 msgid "Move to the end of the line"
-msgstr "Se déplacer jusqu'à la fin de la ligne"
+msgstr "Se déplacer jusqu’à la fin de la ligne"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:325
+#: C/adv-keyboard-shortcuts.page:359
 msgid "<keyseq><key>Ctrl</key><key>E</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>E</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:328
+#: C/adv-keyboard-shortcuts.page:362
 msgid "Move back one character"
-msgstr "Reculer d'un caractère"
+msgstr "Reculer d’un caractère"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:329
+#: C/adv-keyboard-shortcuts.page:363
 msgid "<keyseq><key>Ctrl</key><key>B</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>B</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:332
+#: C/adv-keyboard-shortcuts.page:366
 msgid "Move back one word"
-msgstr "Revenir en arrière d'un mot"
+msgstr "Revenir en arrière d’un mot"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:333
+#: C/adv-keyboard-shortcuts.page:367
 msgid "<keyseq><key>Alt</key><key>B</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>B</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:336
+#: C/adv-keyboard-shortcuts.page:370
 msgid "Move forward one character"
-msgstr "Avancer d'un caractère"
+msgstr "Avancer d’un caractère"
 
 #. (itstool) path: td/p
-#: C/adv-keyboard-shortcuts.page:337
+#: C/adv-keyboard-shortcuts.page:371
 msgid "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
 
 #. (itstool) path: td/p