From 27a3d78f2ce4bbe0c6a872136b77b33bd0791945 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Feb 19 2019 13:50:53 +0000 Subject: Update to 3.31.90 - Rebase the translations --- diff --git a/.gitignore b/.gitignore index 9455e34..594a9e1 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.30.0.tar.xz /gnome-terminal-3.30.1.tar.xz /gnome-terminal-3.30.2.tar.xz +/gnome-terminal-3.31.90.tar.xz diff --git a/gnome-terminal-notify-open-title-transparency.patch b/gnome-terminal-notify-open-title-transparency.patch index 22cf486..3d8bdc3 100644 --- a/gnome-terminal-notify-open-title-transparency.patch +++ b/gnome-terminal-notify-open-title-transparency.patch @@ -1,4 +1,4 @@ -From c9a5c9630248efe0bc34dfbd4f54c8d4f68d4ee6 Mon Sep 17 00:00:00 2001 +From fc524bc1e538d383787f653a7f3987a1e32e6c03 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 12 May 2014 14:57:18 +0200 Subject: [PATCH 01/14] Restore transparency @@ -25,10 +25,10 @@ Some changes by Peter Weber 6 files changed, 104 insertions(+), 1 deletion(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 945b0bd661c5..c581f3cf2553 100644 +index b9ba23904fe5..07a4107c3793 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml -@@ -400,6 +400,16 @@ +@@ -395,6 +395,16 @@ 'narrow' Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding @@ -46,7 +46,7 @@ index 945b0bd661c5..c581f3cf2553 100644 diff --git a/src/preferences.ui b/src/preferences.ui -index 6259aac0f02f..f5c366f14e10 100644 +index 4788959aeec0..47f1cf8abce2 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -77,6 +77,11 @@ @@ -111,7 +111,7 @@ index 6259aac0f02f..f5c366f14e10 100644 diff --git a/src/profile-editor.c b/src/profile-editor.c -index eaad9182fed2..e03e35fc1bea 100644 +index 1912c8cf2431..a0081e23a1c5 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c @@ -1254,6 +1254,22 @@ profile_prefs_load (const char *uuid, GSettings *profile) @@ -138,7 +138,7 @@ index eaad9182fed2..e03e35fc1bea 100644 /* Called once per Preferences window, to destroy stuff that doesn't depend on the profile being edited */ diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index 5b0d8c3ed416..4da44232e491 100644 +index ef30bd595374..a386938b64c5 100644 --- a/src/terminal-schemas.h +++ b/src/terminal-schemas.h @@ -73,6 +73,9 @@ G_BEGIN_DECLS @@ -206,10 +206,10 @@ index a85fcefd40e1..26202e4555ea 100644 static void diff --git a/src/terminal-window.c b/src/terminal-window.c -index 4ed3647498b2..8fc70ce74252 100644 +index 1d877a98275b..be6463b6b1b7 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -2088,6 +2088,8 @@ terminal_window_init (TerminalWindow *window) +@@ -2115,6 +2115,8 @@ terminal_window_init (TerminalWindow *window) }; TerminalWindowPrivate *priv; TerminalApp *app; @@ -218,7 +218,7 @@ index 4ed3647498b2..8fc70ce74252 100644 GSettings *gtk_debug_settings; GtkWindowGroup *window_group; // GtkAccelGroup *accel_group; -@@ -2102,6 +2104,11 @@ terminal_window_init (TerminalWindow *window) +@@ -2130,6 +2132,11 @@ terminal_window_init (TerminalWindow *window) gtk_widget_init_template (GTK_WIDGET (window)); @@ -231,10 +231,10 @@ index 4ed3647498b2..8fc70ce74252 100644 uuid_unparse (u, uuidstr); priv->uuid = g_strdup (uuidstr); -- -2.19.1 +2.21.0.rc1 -From f10a426375c392add4ad9ce28bdfc17c27b2da23 Mon Sep 17 00:00:00 2001 +From 15ac91337d2c3b540d3ec2d80b9e6e3d98d9df38 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 28 May 2014 14:11:02 +0200 Subject: [PATCH 02/14] window: Make the drawing robust across all themes @@ -254,10 +254,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=730016 1 file changed, 21 insertions(+) diff --git a/src/terminal-window.c b/src/terminal-window.c -index 8fc70ce74252..1707ada83ce8 100644 +index be6463b6b1b7..7d87c2461e36 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -1944,6 +1944,26 @@ terminal_window_realize (GtkWidget *widget) +@@ -1969,6 +1969,26 @@ terminal_window_realize (GtkWidget *widget) terminal_window_update_size (window); } @@ -284,7 +284,7 @@ index 8fc70ce74252..1707ada83ce8 100644 static gboolean terminal_window_state_event (GtkWidget *widget, GdkEventWindowState *event) -@@ -2255,6 +2275,7 @@ terminal_window_class_init (TerminalWindowClass *klass) +@@ -2291,6 +2311,7 @@ terminal_window_class_init (TerminalWindowClass *klass) widget_class->show = terminal_window_show; widget_class->realize = terminal_window_realize; @@ -293,10 +293,10 @@ index 8fc70ce74252..1707ada83ce8 100644 widget_class->screen_changed = terminal_window_screen_changed; widget_class->style_updated = terminal_window_style_updated; -- -2.19.1 +2.21.0.rc1 -From ab579d89948777e2e0267376d64cca79af6684d9 Mon Sep 17 00:00:00 2001 +From 3210cd9f76e58135ef5776c64af6d147f8ca4cb7 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 13 Nov 2015 15:16:42 +0100 Subject: [PATCH 03/14] screen, window: Extra padding around transparent @@ -388,10 +388,10 @@ index 26202e4555ea..c0ce8a89126c 100644 terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event) diff --git a/src/terminal-window.c b/src/terminal-window.c -index 1707ada83ce8..a3c5a7fc2f46 100644 +index 7d87c2461e36..2aba397fe922 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -1950,15 +1950,21 @@ terminal_window_draw (GtkWidget *widget, +@@ -1975,15 +1975,21 @@ terminal_window_draw (GtkWidget *widget, { if (gtk_widget_get_app_paintable (widget)) { @@ -420,10 +420,10 @@ index 1707ada83ce8..a3c5a7fc2f46 100644 return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); -- -2.19.1 +2.21.0.rc1 -From aa31c5189de74fba379426792f5d48c64515ba48 Mon Sep 17 00:00:00 2001 +From 785ff41858664a1116168b992c64b537d4d285ca Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 27 Feb 2017 16:53:51 +0100 Subject: [PATCH 04/14] screen: Silence -Wunused variable @@ -446,10 +446,10 @@ index c0ce8a89126c..1b763a3890dd 100644 gboolean use_theme_colors; -- -2.19.1 +2.21.0.rc1 -From dde5c4452134cef537120c70a0d6749329736b7b Mon Sep 17 00:00:00 2001 +From 64b37a1274622ad119b1df96be1e510fa3b60efe Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 27 Jan 2015 18:40:13 +0100 Subject: [PATCH 05/14] Support desktop notifications from OSC 777 @@ -463,10 +463,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059 4 files changed, 171 insertions(+), 1 deletion(-) diff --git a/src/terminal-app.c b/src/terminal-app.c -index f8e290d577ef..35a8c79e530e 100644 +index db1c4c366ec8..072e3dcdde97 100644 --- a/src/terminal-app.c +++ b/src/terminal-app.c -@@ -601,6 +601,31 @@ app_menu_quit_cb (GSimpleAction *action, +@@ -704,6 +704,31 @@ app_menu_quit_cb (GSimpleAction *action, gtk_widget_destroy (GTK_WIDGET (window)); } @@ -498,7 +498,7 @@ index f8e290d577ef..35a8c79e530e 100644 /* Class implementation */ G_DEFINE_TYPE (TerminalApp, terminal_app, GTK_TYPE_APPLICATION) -@@ -625,6 +650,10 @@ terminal_app_startup (GApplication *application) +@@ -727,6 +752,10 @@ terminal_app_startup (GApplication *application) { "quit", app_menu_quit_cb, NULL, NULL, NULL } }; @@ -509,7 +509,7 @@ index f8e290d577ef..35a8c79e530e 100644 g_application_set_resource_base_path (application, TERMINAL_RESOURCES_PATH_PREFIX); G_APPLICATION_CLASS (terminal_app_parent_class)->startup (application); -@@ -635,6 +664,9 @@ terminal_app_startup (GApplication *application) +@@ -737,6 +766,9 @@ terminal_app_startup (GApplication *application) g_action_map_add_action_entries (G_ACTION_MAP (application), action_entries, G_N_ELEMENTS (action_entries), application); @@ -768,10 +768,10 @@ index 20cfbceb36b0..a987025e0524 100644 G_END_DECLS -- -2.19.1 +2.21.0.rc1 -From 0dd2a301dfc5b23d62595d901312c2a627f39f1e Mon Sep 17 00:00:00 2001 +From 3bec6bfdf4fcc0f91487a8b62da75c2f504f33a3 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Jan 2015 11:47:21 +0100 Subject: [PATCH 06/14] Sprinkle debug messages for notifications @@ -851,10 +851,10 @@ index ced2cdfe8a30..36a9afa3ded9 100644 } -- -2.19.1 +2.21.0.rc1 -From 0c11608721e2e522ef4315c710b0f2763346d862 Mon Sep 17 00:00:00 2001 +From 63637e056498b46b5ca9525aec9a80615cf8ec69 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 10 Apr 2018 15:39:35 +0200 Subject: [PATCH 07/14] profile: Split the Command tab into two nested GtkGrids @@ -868,7 +868,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 1 file changed, 90 insertions(+), 83 deletions(-) diff --git a/src/preferences.ui b/src/preferences.ui -index f5c366f14e10..edd924689d35 100644 +index 47f1cf8abce2..b35cf5e8999a 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -1863,95 +1863,102 @@ @@ -1058,10 +1058,10 @@ index f5c366f14e10..edd924689d35 100644 -- -2.19.1 +2.21.0.rc1 -From 75b2fcb3e9ec7518327fef96f79a3e9bbc427c73 Mon Sep 17 00:00:00 2001 +From 169c21b84e4df0ff9068ea20063a4f5ff5375ee0 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 10 Apr 2018 16:01:51 +0200 Subject: [PATCH 08/14] Revert "profile: Remove the "Command" sub-heading" @@ -1074,7 +1074,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 1 file changed, 109 insertions(+), 70 deletions(-) diff --git a/src/preferences.ui b/src/preferences.ui -index edd924689d35..11a283064996 100644 +index b35cf5e8999a..a4b2027ff300 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -1871,94 +1871,133 @@ @@ -1282,10 +1282,10 @@ index edd924689d35..11a283064996 100644 -- -2.19.1 +2.21.0.rc1 -From ae37843fd6ec1d6e901228da912dfdfdbe9f7ed2 Mon Sep 17 00:00:00 2001 +From 343a4d6c1a30476b888345aefdf8a755f602cae6 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:02:13 +0200 Subject: [PATCH 09/14] Revert "screen: Remove unused description and @@ -1461,10 +1461,10 @@ index ff77fcf78947..af9583e7cbaf 100644 char *terminal_screen_get_current_dir (TerminalScreen *screen); -- -2.19.1 +2.21.0.rc1 -From be017f0b1885796a02da2fdc247071b03ed4f998 Mon Sep 17 00:00:00 2001 +From ba31aebfbebdc7ad424bf2483bd5a25d7cbfcb6f Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 17:39:48 +0200 Subject: [PATCH 10/14] Revert "Remove the static title setting from profile @@ -1482,7 +1482,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 5 files changed, 91 insertions(+) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index c581f3cf2553..c070ca024222 100644 +index 07a4107c3793..fc0968935495 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -183,6 +183,11 @@ @@ -1498,7 +1498,7 @@ index c581f3cf2553..c070ca024222 100644 true Whether to allow bold text diff --git a/src/preferences.ui b/src/preferences.ui -index 11a283064996..baa65c705b32 100644 +index a4b2027ff300..18f7e097e666 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -1864,6 +1864,77 @@ @@ -1580,7 +1580,7 @@ index 11a283064996..baa65c705b32 100644 True diff --git a/src/profile-editor.c b/src/profile-editor.c -index e03e35fc1bea..28c536fc4a5a 100644 +index a0081e23a1c5..da8a7fdc4b85 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c @@ -1201,6 +1201,11 @@ profile_prefs_load (const char *uuid, GSettings *profile) @@ -1596,7 +1596,7 @@ index e03e35fc1bea..28c536fc4a5a 100644 gtk_builder_get_object (builder, "use-custom-command-checkbutton"), diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index 4da44232e491..c52ae53fcc92 100644 +index a386938b64c5..f9222855b231 100644 --- a/src/terminal-schemas.h +++ b/src/terminal-schemas.h @@ -66,6 +66,7 @@ G_BEGIN_DECLS @@ -1640,10 +1640,10 @@ index 8e6f2e935ba4..bf3618cb41b0 100644 (!prop_name || prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) || -- -2.19.1 +2.21.0.rc1 -From b3c8ba6bd276defab38d05406d225f56b170db08 Mon Sep 17 00:00:00 2001 +From 9963077700ce22edef85a369c2b0d98c42532e91 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 17 Feb 2015 17:06:17 +0100 Subject: [PATCH 11/14] Restore translations for setting a title and @@ -1688,7 +1688,7 @@ Subject: [PATCH 11/14] Restore translations for setting a title and po/he.po | 16 ++++++++-------- po/hi.po | 17 ++++++++--------- po/hr.po | 10 ++++++++++ - po/hu.po | 12 ++++++++++++ + po/hu.po | 11 +++++++++++ po/hy.po | 8 ++++---- po/id.po | 12 ++++++++++++ po/it.po | 12 ++++++++++++ @@ -1742,7 +1742,7 @@ Subject: [PATCH 11/14] Restore translations for setting a title and po/zh_CN.po | 15 +++++++++------ po/zh_HK.po | 15 +++++++++------ po/zh_TW.po | 15 +++++++++------ - 92 files changed, 707 insertions(+), 371 deletions(-) + 92 files changed, 706 insertions(+), 371 deletions(-) diff --git a/po/am.po b/po/am.po index 3445d96da657..ee992f0712a5 100644 @@ -2204,13 +2204,13 @@ index 65cfb20d9ad3..8c5c97c7465a 100644 +msgid "Transparent background" +msgstr "Gennemsigtig baggrund" diff --git a/po/de.po b/po/de.po -index 205f69111437..61b0214daf5b 100644 +index a7fd71fe9f96..da704eb7fbef 100644 --- a/po/de.po +++ b/po/de.po -@@ -2342,3 +2342,15 @@ msgstr "" - #: ../src/terminal-window.c:3210 - msgid "C_lose Window" - msgstr "Fenster _schließen" +@@ -2364,3 +2364,15 @@ msgstr "Fenster _schließen" + + #~ msgid "_Quit" + #~ msgstr "_Beenden" + +msgid "Title" +msgstr "Titel" @@ -2385,21 +2385,21 @@ index c9999e204f33..dfbff85bf907 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "S_hade transparent or image background:" diff --git a/po/eo.po b/po/eo.po -index 567c08dc1da8..c59f57c6a8d5 100644 +index 2956aa8c3f6d..a91669d7a5e0 100644 --- a/po/eo.po +++ b/po/eo.po -@@ -2215,8 +2215,8 @@ msgstr "_Fermi la fenestron" - #~ msgid "Close Window" - #~ msgstr "Fermi la fenestron" +@@ -2663,8 +2663,8 @@ msgstr "_Fermi la fenestron" + #~ msgid "_Font:" + #~ msgstr "_Tiparo:" -#~ msgid "Set Title" -#~ msgstr "Agordi titolon" +msgid "Set Title" +msgstr "Agordi titolon" - #~ msgid "Switch to Tab 2" - #~ msgstr "Ŝalti al langeto 2" -@@ -2299,8 +2299,8 @@ msgstr "_Fermi la fenestron" + #~ msgid "Switch to Tab 3" + #~ msgstr "Ŝalti al langeto 3" +@@ -2726,8 +2726,8 @@ msgstr "_Fermi la fenestron" #~ msgid "_Input Methods" #~ msgstr "_Enigmetodoj" @@ -2411,10 +2411,10 @@ index 567c08dc1da8..c59f57c6a8d5 100644 #~ msgid "On the left side" #~ msgstr "Maldekstre" diff --git a/po/es.po b/po/es.po -index 142347b3720a..9325d95de22f 100644 +index b54ad88fa136..1205b871d122 100644 --- a/po/es.po +++ b/po/es.po -@@ -2741,17 +2741,17 @@ msgstr "_Cerrar ventana" +@@ -2738,17 +2738,17 @@ msgstr "_Cerrar ventana" #~ msgid "Default size:" #~ msgstr "Tamaño predeterminado:" @@ -2438,7 +2438,7 @@ index 142347b3720a..9325d95de22f 100644 #~ msgid "Current Locale" #~ msgstr "Configuración regional actual" -@@ -3577,8 +3577,8 @@ msgstr "_Cerrar ventana" +@@ -3574,8 +3574,8 @@ msgstr "_Cerrar ventana" #~ msgid "_Solid color" #~ msgstr "Color _sólido" @@ -2566,10 +2566,10 @@ index e284b406f040..6e7f402af7bd 100644 +msgid "Set Title" +msgstr "Aseta otsikko" diff --git a/po/fr.po b/po/fr.po -index 87a8e0ff46d4..2eacb4584f32 100644 +index 927c1dd5d3af..a539d62c2646 100644 --- a/po/fr.po +++ b/po/fr.po -@@ -2591,3 +2591,15 @@ msgstr "Fermer _la fenêtre" +@@ -2607,3 +2607,15 @@ msgstr "Fermer _la fenêtre" #~ msgid "_Same as text color" #~ msgstr "_Même couleur que le texte" @@ -2586,10 +2586,10 @@ index 87a8e0ff46d4..2eacb4584f32 100644 +msgid "Set Title" +msgstr "Définir le titre" diff --git a/po/fur.po b/po/fur.po -index 3f5429cfecd8..e637a6c0dc5f 100644 +index 07327a0c529a..46bf1b1d1b6a 100644 --- a/po/fur.po +++ b/po/fur.po -@@ -454,6 +454,10 @@ msgstr "" +@@ -445,6 +445,10 @@ msgstr "" msgid "Which encoding to use" msgstr "Codifiche di doprâ" @@ -2597,10 +2597,10 @@ index 3f5429cfecd8..e637a6c0dc5f 100644 +msgid "Transparent background" +msgstr "Fondâl trasparent" + - #: ../src/org.gnome.Terminal.gschema.xml.h:68 + #: ../src/org.gnome.Terminal.gschema.xml.h:66 msgid "" "Whether ambiguous-width characters are narrow or wide when using UTF-8 " -@@ -3371,6 +3375,9 @@ msgstr "_Siere barcon" +@@ -3384,6 +3388,9 @@ msgstr "_Siere barcon" #~ msgid "The text you clicked on doesn't seem to be a valid OTP challenge." #~ msgstr "Il test fracât nol samee jessi un OTP challenge." @@ -2610,7 +2610,7 @@ index 3f5429cfecd8..e637a6c0dc5f 100644 #~ msgid "Switch to Tab 3" #~ msgstr "Passe a la schede 3" -@@ -3426,8 +3433,8 @@ msgstr "_Siere barcon" +@@ -3439,8 +3446,8 @@ msgstr "_Siere barcon" #~ msgid "_Input Methods" #~ msgstr "_Cemût inserî test" @@ -2633,10 +2633,10 @@ index 93d5fa9d1481..feb87dce3d6b 100644 +msgid "Transparent background" +msgstr "Cúlra trédhearcach" diff --git a/po/gl.po b/po/gl.po -index 4ae0f6a0935c..fa643dc89659 100644 +index f0ddeac3b6bf..e774d9dcf429 100644 --- a/po/gl.po +++ b/po/gl.po -@@ -2678,17 +2678,17 @@ msgstr "P_echar a xanela" +@@ -2696,17 +2696,17 @@ msgstr "P_echar a xanela" #~ msgid "Default size:" #~ msgstr "Tamaño predeterminado:" @@ -2660,7 +2660,7 @@ index 4ae0f6a0935c..fa643dc89659 100644 #~ msgid "Current Locale" #~ msgstr "Configuración rexional actual" -@@ -3502,8 +3502,8 @@ msgstr "P_echar a xanela" +@@ -3520,8 +3520,8 @@ msgstr "P_echar a xanela" #~ msgid "Background image _scrolls" #~ msgstr "A imaxe de fondo _desprázase" @@ -2826,14 +2826,13 @@ index aec2eaa8bac1..207b5c774b32 100644 +msgid "Set Title" +msgstr "Postavi naslov" diff --git a/po/hu.po b/po/hu.po -index 401ae619d5d2..b6e96230111b 100644 +index 113e71b3411c..767144eb6cc7 100644 --- a/po/hu.po +++ b/po/hu.po -@@ -2370,3 +2370,15 @@ msgstr "_Ablak bezárása" +@@ -2302,3 +2302,14 @@ msgstr "" + msgid "C_lose Window" + msgstr "_Ablak bezárása" - #~ msgid "_Profile Preferences" - #~ msgstr "_Profil beállításai" -+ +msgid "Title" +msgstr "Cím" + @@ -2872,10 +2871,10 @@ index aaf2d9b292da..4d466f164420 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/id.po b/po/id.po -index 9198218c5aaa..9f2fbd0c9d4c 100644 +index ce49d31f1348..b47b9656a834 100644 --- a/po/id.po +++ b/po/id.po -@@ -2548,3 +2548,15 @@ msgstr "Tutup Jende_la" +@@ -2559,3 +2559,15 @@ msgstr "Tutup Jende_la" #~ msgid "_Add or Remove…" #~ msgstr "T_ambah atau Hapus…" @@ -2912,13 +2911,13 @@ index 632667207c17..2cd93716f4f9 100644 +msgid "Set Title" +msgstr "Imposta titolo" diff --git a/po/ja.po b/po/ja.po -index 9a18d3db624f..bbfd18e6ab24 100644 +index 3bd1ba92cb49..2c947e580007 100644 --- a/po/ja.po +++ b/po/ja.po -@@ -2096,3 +2096,15 @@ msgstr "この端末には未だ実行中のプロセスが存在しています - #: ../src/terminal-window.c:3953 - msgid "C_lose Window" - msgstr "ウィンドウを閉じる(_L)" +@@ -2535,3 +2535,15 @@ msgstr "ウィンドウを閉じる(_L)" + + #~ msgid "_Add or Remove…" + #~ msgstr "追加/削除(_A)…" + +msgid "Transparent background" +msgstr "透過な画像にする" @@ -3196,10 +3195,10 @@ index 4fe43192fe57..a5a874b49c59 100644 #: ../src/profile-preferences.glade.h:78 #| msgid "_Text color:" diff --git a/po/ml.po b/po/ml.po -index a23f4cc4f1ae..49caa9efe94f 100644 +index 296149701e1f..e3bce1225738 100644 --- a/po/ml.po +++ b/po/ml.po -@@ -2461,3 +2461,6 @@ msgstr "ജാലകം അടയ്ക്കുക (_l)" +@@ -2577,3 +2577,6 @@ msgstr "ജാലകം അടയ്ക്കുക (_l)" #~ msgid "_Unlimited" #~ msgstr "പരിധിയില്ല (_U)" @@ -3647,10 +3646,10 @@ index c40dba26b08a..9be7eec414e9 100644 +msgid "Transparent background" +msgstr "Fundo transparente" diff --git a/po/ro.po b/po/ro.po -index 53dd72be9c45..d694adf36934 100644 +index b7ec580b8d4f..9440c93c2f26 100644 --- a/po/ro.po +++ b/po/ro.po -@@ -3412,8 +3412,8 @@ msgstr "Î_nchide fereastra" +@@ -3358,8 +3358,8 @@ msgstr "Î_nchide fereastra" #~ msgid "_Solid color" #~ msgstr "Culoare _solidă" @@ -3753,10 +3752,10 @@ index d0282159b459..01dd96a06939 100644 +msgid "Set Title" +msgstr "Nastaviť titulok" diff --git a/po/sl.po b/po/sl.po -index db9cb98834fe..261abe9c1e64 100644 +index 09e7f51e707c..b00813d45d58 100644 --- a/po/sl.po +++ b/po/sl.po -@@ -2663,17 +2663,17 @@ msgstr "_Zapri okno" +@@ -2680,17 +2680,17 @@ msgstr "_Zapri okno" #~ msgid "Default size:" #~ msgstr "Privzeta velikost:" @@ -3780,7 +3779,7 @@ index db9cb98834fe..261abe9c1e64 100644 #~ msgid "Current Locale" #~ msgstr "Trenutne jezikovne nastavitve" -@@ -2788,3 +2788,6 @@ msgstr "_Zapri okno" +@@ -2805,3 +2805,6 @@ msgstr "_Zapri okno" #~ msgid "_Profile Preferences…" #~ msgstr "Možnosti _profila ..." @@ -3918,10 +3917,10 @@ index 45dbad07fba7..852c47cc6ee5 100644 +msgid "Transparent background" +msgstr "Providna pozadina" diff --git a/po/sv.po b/po/sv.po -index 8560fde55941..bd1030f519ab 100644 +index 25bfb732780c..18269e4130cb 100644 --- a/po/sv.po +++ b/po/sv.po -@@ -2572,5 +2572,17 @@ msgstr "Stän_g fönster" +@@ -2582,5 +2582,17 @@ msgstr "Stän_g fönster" #~ msgid "Unknown completion request for \"%s\"" #~ msgstr "Okänd kompletteringsbegäran för \"%s\"" @@ -4154,10 +4153,10 @@ index 63263749655c..496da331bbf9 100644 #~ msgid "" #~ "You already have a profile called “%s”. Do you want to create another " diff --git a/po/tr.po b/po/tr.po -index fa79334e08dc..5b988d7dbd4a 100644 +index 7d0aad5eb97e..faf16bac15ce 100644 --- a/po/tr.po +++ b/po/tr.po -@@ -2558,3 +2558,15 @@ msgstr "_Pencereyi Kapat" +@@ -2570,3 +2570,15 @@ msgstr "_Pencereyi Kapat" #~ msgid "_Same as text color" #~ msgstr "_Metin rengiyle aynı" @@ -4462,10 +4461,10 @@ index b9890ad91bdc..18e55e2e945c 100644 +msgid "Transparent background" +msgstr "透明背景" -- -2.19.1 +2.21.0.rc1 -From 617748abc5c22e094c764c3a4da5258f86ed19a8 Mon Sep 17 00:00:00 2001 +From e41debdabdf53555e41f8d54b527604cbe1d158a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 25 May 2016 13:47:36 +0200 Subject: [PATCH 12/14] Restore the action and shortcut to set a static title @@ -4482,10 +4481,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 3 files changed, 81 insertions(+) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index c070ca024222..ee0a6c4f0c87 100644 +index fc0968935495..03dc3d4fb241 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml -@@ -480,6 +480,10 @@ +@@ -475,6 +475,10 @@ 'disabled' Keyboard shortcut to toggle the read-only state @@ -4497,10 +4496,10 @@ index c070ca024222..ee0a6c4f0c87 100644 'disabled' Keyboard shortcut to reset the terminal diff --git a/src/terminal-accels.c b/src/terminal-accels.c -index e412180f173e..14bf97768065 100644 +index 75ac3a1e4b65..b39e80b5533d 100644 --- a/src/terminal-accels.c +++ b/src/terminal-accels.c -@@ -75,6 +75,7 @@ +@@ -76,6 +76,7 @@ #define KEY_RESET "reset" #define KEY_SAVE_CONTENTS "save-contents" #define KEY_SELECT_ALL "select-all" @@ -4508,7 +4507,7 @@ index e412180f173e..14bf97768065 100644 #define KEY_TOGGLE_MENUBAR "toggle-menubar" #define KEY_ZOOM_IN "zoom-in" #define KEY_ZOOM_NORMAL "zoom-normal" -@@ -163,6 +164,7 @@ static KeyEntry terminal_entries[] = { +@@ -165,6 +166,7 @@ static KeyEntry terminal_entries[] = { ENTRY (N_("Read-Only"), KEY_READ_ONLY, "read-only", NULL, NULL ), ENTRY (N_("Reset"), KEY_RESET, "reset", "b", "false"), ENTRY (N_("Reset and Clear"), KEY_RESET_AND_CLEAR, "reset", "b", "true" ), @@ -4517,10 +4516,10 @@ index e412180f173e..14bf97768065 100644 static KeyEntry tabs_entries[] = { diff --git a/src/terminal-window.c b/src/terminal-window.c -index a3c5a7fc2f46..8df7707ab77f 100644 +index 2aba397fe922..8d3ddd6f790b 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -739,6 +739,80 @@ action_select_all_cb (GSimpleAction *action, +@@ -747,6 +747,80 @@ action_select_all_cb (GSimpleAction *action, vte_terminal_select_all (VTE_TERMINAL (priv->active_screen)); } @@ -4601,7 +4600,7 @@ index a3c5a7fc2f46..8df7707ab77f 100644 static void action_reset_cb (GSimpleAction *action, GVariant *parameter, -@@ -2080,6 +2154,7 @@ terminal_window_init (TerminalWindow *window) +@@ -2106,6 +2180,7 @@ terminal_window_init (TerminalWindow *window) { "paste-uris", action_paste_uris_cb, NULL, NULL, NULL }, { "reset", action_reset_cb, "b", NULL, NULL }, { "select-all", action_select_all_cb, NULL, NULL, NULL }, @@ -4610,10 +4609,10 @@ index a3c5a7fc2f46..8df7707ab77f 100644 { "tab-detach", action_tab_detach_cb, NULL, NULL, NULL }, { "tab-move-left", action_tab_move_left_cb, NULL, NULL, NULL }, -- -2.19.1 +2.21.0.rc1 -From 810666d52c2d373c62d25e68f8f1a91e1597a744 Mon Sep 17 00:00:00 2001 +From 41efd6569a8a6cb36dd151425d09e03adba486c4 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 18:14:36 +0200 Subject: [PATCH 13/14] screen: Style fix @@ -4640,10 +4639,10 @@ index bf3618cb41b0..6caa002ddece 100644 const char *p; -- -2.19.1 +2.21.0.rc1 -From 93e37d374dde902662c2240b0d6c50b19b76a77b Mon Sep 17 00:00:00 2001 +From 67d25877283935a3a55203c908d055875e5039ec Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:58:15 +0200 Subject: [PATCH 14/14] Restore the rest of the title handling options and make @@ -4665,7 +4664,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 8 files changed, 265 insertions(+), 78 deletions(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index ee0a6c4f0c87..3e07770d0469 100644 +index 03dc3d4fb241..af338359956a 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -24,6 +24,13 @@ @@ -4695,7 +4694,7 @@ index ee0a6c4f0c87..3e07770d0469 100644 'Terminal' Title for terminal diff --git a/src/preferences.ui b/src/preferences.ui -index baa65c705b32..0dddd9bf32ba 100644 +index 18f7e097e666..188f3c774b18 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -1900,7 +1900,7 @@ @@ -4746,7 +4745,7 @@ index baa65c705b32..0dddd9bf32ba 100644 diff --git a/src/profile-editor.c b/src/profile-editor.c -index 28c536fc4a5a..4f0b6bbeafd9 100644 +index da8a7fdc4b85..fb4e9dd33e30 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c @@ -1206,6 +1206,15 @@ profile_prefs_load (const char *uuid, GSettings *profile) @@ -4785,7 +4784,7 @@ index bdd354e38360..731dcf2aaebc 100644 TERMINAL_EXIT_CLOSE, TERMINAL_EXIT_RESTART, diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index c52ae53fcc92..af5d884d20f1 100644 +index f9222855b231..c5682c5eac83 100644 --- a/src/terminal-schemas.h +++ b/src/terminal-schemas.h @@ -66,6 +66,7 @@ G_BEGIN_DECLS @@ -5242,10 +5241,10 @@ index af9583e7cbaf..a75bd4f06659 100644 void terminal_screen_get_size (TerminalScreen *screen, diff --git a/src/terminal-window.c b/src/terminal-window.c -index 8df7707ab77f..37bbcca35580 100644 +index 8d3ddd6f790b..74af1c649f34 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -757,6 +757,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog, +@@ -765,6 +765,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog, gtk_widget_destroy (dialog); } @@ -5258,7 +5257,7 @@ index 8df7707ab77f..37bbcca35580 100644 static void action_set_title_cb (GSimpleAction *action, GVariant *parameter, -@@ -2509,14 +2515,11 @@ sync_screen_title (TerminalScreen *screen, +@@ -2545,14 +2551,11 @@ sync_screen_title (TerminalScreen *screen, TerminalWindow *window) { TerminalWindowPrivate *priv = window->priv; @@ -5275,5 +5274,5 @@ index 8df7707ab77f..37bbcca35580 100644 static void -- -2.19.1 +2.21.0.rc1 diff --git a/gnome-terminal.spec b/gnome-terminal.spec index fcbc2ea..c8edd18 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -2,17 +2,17 @@ %define glib2_version 2.50.0 %define gtk3_version 3.22.27 -%define vte_version 0.54.1 +%define vte_version 0.55.90 %define desktop_file_utils_version 0.2.90 Name: gnome-terminal -Version: 3.30.2 -Release: 2%{?dist} +Version: 3.31.90 +Release: 1%{?dist} Summary: Terminal emulator for GNOME License: GPLv3+ and GFDL and LGPLv2+ URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/gnome-terminal/3.30/gnome-terminal-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-terminal/3.31/gnome-terminal-%{version}.tar.xz Source1: org.gnome.Terminal.gschema.override Patch100: gnome-terminal-notify-open-title-transparency.patch @@ -97,6 +97,8 @@ make check %{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.override %{_datadir}/gnome-shell +%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Terminal.svg +%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Terminal-symbolic.svg %{_userunitdir}/gnome-terminal-server.service %files nautilus @@ -104,6 +106,10 @@ make check %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Tue Feb 19 2019 Kalev Lember - 3.31.90-1 +- Update to 3.31.90 +- Rebase the translations + * Thu Jan 31 2019 Fedora Release Engineering - 3.30.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index a9c92aa..ff51932 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-terminal-3.30.2.tar.xz) = acbc854271b8dd8c60e04277228d5e0d2dbfaff42bc9c002d4bc42bb97052e2e3ab03da130c31c3cc1452644adfafcddd5103a6d79a10a659b4fe20d6063c61e +SHA512 (gnome-terminal-3.31.90.tar.xz) = 5040e05170108df244b91e060de90de18cd0c1769c8c2dc36166d582fceef916841a87566da1cfd3209e8342e6a3f8032716d35f163bd2b621ae658b85f96e9d