From d1d4ad282e4f8cf1367947370295b7f0400ea64d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mar 29 2019 17:55:11 +0000 Subject: Update to 3.31.92 Rebase the translations. --- diff --git a/.gitignore b/.gitignore index 594a9e1..1e4f913 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.30.1.tar.xz /gnome-terminal-3.30.2.tar.xz /gnome-terminal-3.31.90.tar.xz +/gnome-terminal-3.31.92.tar.xz diff --git a/gnome-terminal-notify-open-title-transparency.patch b/gnome-terminal-notify-open-title-transparency.patch index 3d8bdc3..5f8bdcb 100644 --- a/gnome-terminal-notify-open-title-transparency.patch +++ b/gnome-terminal-notify-open-title-transparency.patch @@ -1,7 +1,7 @@ -From fc524bc1e538d383787f653a7f3987a1e32e6c03 Mon Sep 17 00:00:00 2001 +From 9a4aa2293d0c3b5948eb8fa9241f36b6a25098b1 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 +Subject: [PATCH 01/15] Restore transparency The transparency settings were removed as a side effect of 2bff4b63ed3ceef6055e35563e9b0b33ad57349d @@ -25,7 +25,7 @@ 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 b9ba23904fe5..07a4107c3793 100644 +index e4e0c003b281..1b0fb22b7d46 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -395,6 +395,16 @@ @@ -231,13 +231,13 @@ index 1d877a98275b..be6463b6b1b7 100644 uuid_unparse (u, uuidstr); priv->uuid = g_strdup (uuidstr); -- -2.21.0.rc1 +2.20.1 -From 15ac91337d2c3b540d3ec2d80b9e6e3d98d9df38 Mon Sep 17 00:00:00 2001 +From 4532a389c6d57299c04e58ccfca80dca5cecdc8f 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 +Subject: [PATCH 02/15] window: Make the drawing robust across all themes There are lots of themes out there in the wild that do not specify a background-color for all widgets and the default is transparent. This @@ -293,13 +293,13 @@ index be6463b6b1b7..7d87c2461e36 100644 widget_class->screen_changed = terminal_window_screen_changed; widget_class->style_updated = terminal_window_style_updated; -- -2.21.0.rc1 +2.20.1 -From 3210cd9f76e58135ef5776c64af6d147f8ca4cb7 Mon Sep 17 00:00:00 2001 +From d484077fcfc900f9dc72ed19396616bbc4fbee2e 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 +Subject: [PATCH 03/15] screen, window: Extra padding around transparent terminals in Wayland https://bugzilla.redhat.com/show_bug.cgi?id=1207943 @@ -420,13 +420,13 @@ index 7d87c2461e36..2aba397fe922 100644 return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); -- -2.21.0.rc1 +2.20.1 -From 785ff41858664a1116168b992c64b537d4d285ca Mon Sep 17 00:00:00 2001 +From 1d34e107b172874e7219b1b00be4501c907862ea 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 +Subject: [PATCH 04/15] screen: Silence -Wunused variable https://bugzilla.redhat.com/show_bug.cgi?id=1207943 --- @@ -446,13 +446,13 @@ index c0ce8a89126c..1b763a3890dd 100644 gboolean use_theme_colors; -- -2.21.0.rc1 +2.20.1 -From 64b37a1274622ad119b1df96be1e510fa3b60efe Mon Sep 17 00:00:00 2001 +From 5e578ad208e9dc0ff2ce9b9a478c4a2f6a1a129e 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 +Subject: [PATCH 05/15] Support desktop notifications from OSC 777 https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- @@ -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 db1c4c366ec8..072e3dcdde97 100644 +index ab1c81a6b554..34c53f40904b 100644 --- a/src/terminal-app.c +++ b/src/terminal-app.c -@@ -704,6 +704,31 @@ app_menu_quit_cb (GSimpleAction *action, +@@ -747,6 +747,31 @@ app_menu_quit_cb (GSimpleAction *action, gtk_widget_destroy (GTK_WIDGET (window)); } @@ -498,7 +498,7 @@ index db1c4c366ec8..072e3dcdde97 100644 /* Class implementation */ G_DEFINE_TYPE (TerminalApp, terminal_app, GTK_TYPE_APPLICATION) -@@ -727,6 +752,10 @@ terminal_app_startup (GApplication *application) +@@ -770,6 +795,10 @@ terminal_app_startup (GApplication *application) { "quit", app_menu_quit_cb, NULL, NULL, NULL } }; @@ -509,7 +509,7 @@ index db1c4c366ec8..072e3dcdde97 100644 g_application_set_resource_base_path (application, TERMINAL_RESOURCES_PATH_PREFIX); G_APPLICATION_CLASS (terminal_app_parent_class)->startup (application); -@@ -737,6 +766,9 @@ terminal_app_startup (GApplication *application) +@@ -780,6 +809,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,13 +768,13 @@ index 20cfbceb36b0..a987025e0524 100644 G_END_DECLS -- -2.21.0.rc1 +2.20.1 -From 3bec6bfdf4fcc0f91487a8b62da75c2f504f33a3 Mon Sep 17 00:00:00 2001 +From 5342942b85502f7174d3ef2321ba11d57803d655 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 +Subject: [PATCH 06/15] Sprinkle debug messages for notifications This can be useful for finding out whether the escape sequence wasn't emitted or the filtering was faulty. @@ -851,13 +851,13 @@ index ced2cdfe8a30..36a9afa3ded9 100644 } -- -2.21.0.rc1 +2.20.1 -From 63637e056498b46b5ca9525aec9a80615cf8ec69 Mon Sep 17 00:00:00 2001 +From efbd95a3d5c16b976e12e3be5c51deeef84dbb25 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 +Subject: [PATCH 07/15] profile: Split the Command tab into two nested GtkGrids This will let the subsequent patch add a "Command" sub-heading to keep the command settings separate from the to-be-restored title settings. @@ -1058,13 +1058,13 @@ index 47f1cf8abce2..b35cf5e8999a 100644 -- -2.21.0.rc1 +2.20.1 -From 169c21b84e4df0ff9068ea20063a4f5ff5375ee0 Mon Sep 17 00:00:00 2001 +From 1f1a949701070558326731c58edd2d0b09b8b980 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" +Subject: [PATCH 08/15] Revert "profile: Remove the "Command" sub-heading" This reverts commit 8e27479299d075df0a52d0e8e7baeab344dcaa6c. @@ -1282,13 +1282,13 @@ index b35cf5e8999a..a4b2027ff300 100644 -- -2.21.0.rc1 +2.20.1 -From 343a4d6c1a30476b888345aefdf8a755f602cae6 Mon Sep 17 00:00:00 2001 +From 802f74aedf6a9c31efc8fc5a0e2dd4f96c522036 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 +Subject: [PATCH 09/15] Revert "screen: Remove unused description and user_title API" This reverts commit 3bb41272b7509a16ec2a5cd93e44f73d5743b626. @@ -1461,13 +1461,13 @@ index ff77fcf78947..af9583e7cbaf 100644 char *terminal_screen_get_current_dir (TerminalScreen *screen); -- -2.21.0.rc1 +2.20.1 -From ba31aebfbebdc7ad424bf2483bd5a25d7cbfcb6f Mon Sep 17 00:00:00 2001 +From 4bced9208e1fde33c779de6528782e79b307d4a0 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 +Subject: [PATCH 10/15] Revert "Remove the static title setting from profile preferences" This reverts commit e9cb8fea14a849704074c5d69f173bcf4dc2fb27. @@ -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 07a4107c3793..fc0968935495 100644 +index 1b0fb22b7d46..0c50f82f4e47 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -183,6 +183,11 @@ @@ -1640,13 +1640,13 @@ index 8e6f2e935ba4..bf3618cb41b0 100644 (!prop_name || prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) || -- -2.21.0.rc1 +2.20.1 -From 9963077700ce22edef85a369c2b0d98c42532e91 Mon Sep 17 00:00:00 2001 +From da8a5bf9a01df1ed50a5a2aa531d72f13164ddb3 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 +Subject: [PATCH 11/15] Restore translations for setting a title and transparency --- @@ -1667,7 +1667,7 @@ Subject: [PATCH 11/14] Restore translations for setting a title and po/ca@valencia.po | 12 ++++++++++++ po/cs.po | 12 ++++++++++++ po/cy.po | 8 ++++---- - po/da.po | 11 +++++++++++ + po/da.po | 12 ++++++++++++ po/de.po | 12 ++++++++++++ po/dz.po | 8 ++++---- po/el.po | 15 +++++++++------ @@ -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, 706 insertions(+), 371 deletions(-) + 92 files changed, 707 insertions(+), 371 deletions(-) diff --git a/po/am.po b/po/am.po index 3445d96da657..ee992f0712a5 100644 @@ -1944,13 +1944,13 @@ index 586c1e4d827b..4bd846797101 100644 #: ../src/gnome-terminal.glade2.h:103 msgid "_Update login records when command is launched" diff --git a/po/be.po b/po/be.po -index ce07d47995ca..3c65f9090ef4 100644 +index 298ec2d6ae0c..50f46093a712 100644 --- a/po/be.po +++ b/po/be.po -@@ -2392,3 +2392,6 @@ msgstr "_Закрыць акно" +@@ -2635,3 +2635,6 @@ msgstr "_Закрыць акно" - #~ msgid "_Set Title…" - #~ msgstr "Прызначыць _загаловак..." + #~ msgid "Current Locale" + #~ msgstr "Дзейная лакальнасць" + +msgid "Transparent background" +msgstr "Празрысты фон" @@ -2099,13 +2099,13 @@ index 49e710859ac9..8703552984b1 100644 +msgid "Set Title" +msgstr "Postavi naslov" diff --git a/po/ca.po b/po/ca.po -index 4a612fcfc0ba..6091324a9547 100644 +index 52b30f62831c..81efec6ef9bd 100644 --- a/po/ca.po +++ b/po/ca.po -@@ -2333,3 +2333,15 @@ msgstr "Tanca la _finestra" - - #~ msgid "Open the terminal file manager Midnight Commander" - #~ msgstr "Obre el gestor de fitxers del terminal Midnight Commander" +@@ -2315,3 +2315,15 @@ msgstr "" + #: ../src/terminal-window.c:3246 + msgid "C_lose Window" + msgstr "Tanca la _finestra" + +msgid "Transparent background" +msgstr "Fons transparent" @@ -2139,11 +2139,11 @@ index a6e8fb4250dc..c9ed8508228d 100644 +msgid "Set Title" +msgstr "Estableix el títol" diff --git a/po/cs.po b/po/cs.po -index ee33ed2a0103..2acf2aa99656 100644 +index ee7b75f7d037..7c3390493d8f 100644 --- a/po/cs.po +++ b/po/cs.po -@@ -2310,3 +2310,15 @@ msgstr "" - #: ../src/terminal-window.c:3353 +@@ -2287,3 +2287,15 @@ msgstr "" + #: ../src/terminal-window.c:3246 msgid "C_lose Window" msgstr "_Zavřít okno" + @@ -2185,13 +2185,14 @@ index 644df82363f1..cd862feb50c0 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/da.po b/po/da.po -index 65cfb20d9ad3..8c5c97c7465a 100644 +index 2ad0736c0b66..0a8858c75e0c 100644 --- a/po/da.po +++ b/po/da.po -@@ -2325,3 +2325,14 @@ msgstr "" - msgid "C_lose Window" - msgstr "_Luk vindue" +@@ -2339,3 +2339,15 @@ msgstr "_Luk vindue" + #~ msgid "Open the terminal file manager Midnight Commander" + #~ msgstr "Åbn terminalfilhåndteringen Midnight Commander" ++ +msgid "Title" +msgstr "Titel" + @@ -2250,10 +2251,10 @@ index d97e6102b850..a768fe4adc54 100644 #: ../src/profile-preferences.glade.h:78 #, fuzzy diff --git a/po/el.po b/po/el.po -index a32f5b1684f6..7fa98b45e6f5 100644 +index 99c9a629b472..15f683b5a625 100644 --- a/po/el.po +++ b/po/el.po -@@ -2710,17 +2710,17 @@ msgstr "Κ_λείσιμο παραθύρου" +@@ -2735,17 +2735,17 @@ msgstr "Κ_λείσιμο παραθύρου" #~ msgid "Default size:" #~ msgstr "Προεπιλεγμένο μέγεθος:" @@ -2277,7 +2278,7 @@ index a32f5b1684f6..7fa98b45e6f5 100644 #~ msgid "Current Locale" #~ msgstr "Τρέχουσα τοπική ρύθμιση" -@@ -2758,3 +2758,6 @@ msgstr "Κ_λείσιμο παραθύρου" +@@ -2783,3 +2783,6 @@ msgstr "Κ_λείσιμο παραθύρου" #~ msgid "_Input Methods" #~ msgstr "_Μέθοδοι εισαγωγής" @@ -2540,10 +2541,10 @@ index 8b0ca26eebe5..6079d0c40a1d 100644 +msgid "Transparent background" +msgstr "پس‌زمینه‌ی شفاف" diff --git a/po/fi.po b/po/fi.po -index e284b406f040..6e7f402af7bd 100644 +index 1d341ed83115..7ab745dafa50 100644 --- a/po/fi.po +++ b/po/fi.po -@@ -2589,9 +2589,21 @@ msgstr "_Sulje ikkuna" +@@ -2591,9 +2591,21 @@ msgstr "_Sulje ikkuna" #~ msgid "_Update login records when command is launched" #~ msgstr "_Päivitä kirjautumistallenne kun komento käynnistetään" @@ -2586,7 +2587,7 @@ index 927c1dd5d3af..a539d62c2646 100644 +msgid "Set Title" +msgstr "Définir le titre" diff --git a/po/fur.po b/po/fur.po -index 07327a0c529a..46bf1b1d1b6a 100644 +index d4a67b1cbcd0..81841080e39e 100644 --- a/po/fur.po +++ b/po/fur.po @@ -445,6 +445,10 @@ msgstr "" @@ -2891,11 +2892,11 @@ index ce49d31f1348..b47b9656a834 100644 +msgid "Set Title" +msgstr "Atur Judul" diff --git a/po/it.po b/po/it.po -index 632667207c17..2cd93716f4f9 100644 +index c62d53d1c988..2b9028608286 100644 --- a/po/it.po +++ b/po/it.po -@@ -2348,3 +2348,15 @@ msgstr "" - #: ../src/terminal-window.c:3354 +@@ -2327,3 +2327,15 @@ msgstr "" + #: ../src/terminal-window.c:3246 msgid "C_lose Window" msgstr "Chiudi _finestra" + @@ -2911,10 +2912,10 @@ index 632667207c17..2cd93716f4f9 100644 +msgid "Set Title" +msgstr "Imposta titolo" diff --git a/po/ja.po b/po/ja.po -index 3bd1ba92cb49..2c947e580007 100644 +index b42e552761f9..2c88593bb28e 100644 --- a/po/ja.po +++ b/po/ja.po -@@ -2535,3 +2535,15 @@ msgstr "ウィンドウを閉じる(_L)" +@@ -2524,3 +2524,15 @@ msgstr "ウィンドウを閉じる(_L)" #~ msgid "_Add or Remove…" #~ msgstr "追加/削除(_A)…" @@ -2955,10 +2956,10 @@ index 2a0bc91fad40..c289e30eb4fa 100644 #: ../src/gnome-terminal.glade2.h:87 diff --git a/po/kk.po b/po/kk.po -index 2811b7ec6239..d4239e5d12c5 100644 +index ac7eff8587dc..258d7de5cb46 100644 --- a/po/kk.po +++ b/po/kk.po -@@ -2547,3 +2547,15 @@ msgstr "Терезені жа_бу" +@@ -2557,3 +2557,15 @@ msgstr "Терезені жа_бу" #~ msgid "Be quiet" #~ msgstr "Тыныш болу" @@ -3073,10 +3074,10 @@ index bc2bb7f03de4..d2a83a007097 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/lt.po b/po/lt.po -index e8b7622e5d46..c6fe38021b6a 100644 +index b5b20eeaaf41..849bd76f52c4 100644 --- a/po/lt.po +++ b/po/lt.po -@@ -2571,3 +2571,15 @@ msgstr "_Užverti langą" +@@ -2589,3 +2589,15 @@ msgstr "_Užverti langą" #~ msgid "Whether to use a dark theme variant" #~ msgstr "Ar naudoti tamsų temos variantą" @@ -3093,10 +3094,10 @@ index e8b7622e5d46..c6fe38021b6a 100644 +msgid "Set Title" +msgstr "Nustatyti pavadinimą" diff --git a/po/lv.po b/po/lv.po -index 47d9e75b1ee8..a8dad3bc0d6b 100644 +index d7ba841bd82e..cdd1ebec10b5 100644 --- a/po/lv.po +++ b/po/lv.po -@@ -2578,3 +2578,19 @@ msgstr "Aizvērt _logu" +@@ -2527,3 +2527,19 @@ msgstr "Aizvērt _logu" #~ msgid "_Add or Remove…" #~ msgstr "_Pievienot vai izņemt…" @@ -3389,10 +3390,10 @@ index 4fe16cc88a9a..53fb89134be0 100644 #~ msgid "" #~ "text/plain dropped on terminal had wrong format (%d) or length (%d)\n" diff --git a/po/nl.po b/po/nl.po -index 5f070152cade..560e472f0917 100644 +index 66a5ca65c0fc..2ae40798f830 100644 --- a/po/nl.po +++ b/po/nl.po -@@ -2596,3 +2596,15 @@ msgstr "Venster sl_uiten" +@@ -2608,3 +2608,15 @@ msgstr "Venster sl_uiten" #~ msgid "_Add or Remove…" #~ msgstr "_Toevoegen of verwijderen…" @@ -3611,10 +3612,10 @@ index 5181419ad973..3df37f6d5bc7 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "Transparente som_breado ou imagem de fundo:" diff --git a/po/pt_BR.po b/po/pt_BR.po -index c40dba26b08a..9be7eec414e9 100644 +index fc9eb831d667..153a1f3d8bee 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po -@@ -2687,17 +2687,17 @@ msgstr "_Fechar janela" +@@ -2705,17 +2705,17 @@ msgstr "_Fechar janela" #~ msgid "Default size:" #~ msgstr "Tamanho padrão:" @@ -3638,7 +3639,7 @@ index c40dba26b08a..9be7eec414e9 100644 #~ msgid "Current Locale" #~ msgstr "Codificação atual" -@@ -3323,3 +3323,6 @@ msgstr "_Fechar janela" +@@ -3341,3 +3341,6 @@ msgstr "_Fechar janela" #~ "terminal poderão usar. Essa é a paleta, na forma de uma lista de nomes de " #~ "cores separada por dois pontos. Os nomes de cores devem estar no formato " #~ "hexadecimal. Exemplo: \"#FF00FF\"" @@ -3661,10 +3662,10 @@ index b7ec580b8d4f..9440c93c2f26 100644 #~ msgid "_Unlimited" #~ msgstr "_Neliminat" diff --git a/po/ru.po b/po/ru.po -index fedc4d3ec51c..c08bffcb4d10 100644 +index d6f6dd4f8279..814ba613679f 100644 --- a/po/ru.po +++ b/po/ru.po -@@ -2539,3 +2539,19 @@ msgstr "_Закрыть окно" +@@ -2552,3 +2552,19 @@ msgstr "_Закрыть окно" #~ msgid "_Add or Remove…" #~ msgstr "_Добавить или удалить…" @@ -3813,10 +3814,10 @@ index 158f6cb167cc..a3494fb70bd6 100644 #: ../src/gnome-terminal.glade2.h:86 msgid "_Update login records when command is launched" diff --git a/po/sr.po b/po/sr.po -index 8bf15f3250a4..81a73722c616 100644 +index de0dea5a7859..c9603a3406a8 100644 --- a/po/sr.po +++ b/po/sr.po -@@ -2576,10 +2576,9 @@ msgstr "_Затвори прозор" +@@ -2590,10 +2590,9 @@ msgstr "_Затвори прозор" #~ msgid "GNOME Terminal Client" #~ msgstr "Клијент Гномовог терминала" @@ -3830,7 +3831,7 @@ index 8bf15f3250a4..81a73722c616 100644 #~ msgid "Title for terminal" #~ msgstr "Наслов за терминал" -@@ -2625,11 +2624,11 @@ msgstr "_Затвори прозор" +@@ -2639,11 +2638,11 @@ msgstr "_Затвори прозор" #~ msgid "Default size:" #~ msgstr "Основна величина:" @@ -3846,7 +3847,7 @@ index 8bf15f3250a4..81a73722c616 100644 #~ msgid "Title and Command" #~ msgstr "Наслов и наредба" -@@ -2637,8 +2636,8 @@ msgstr "_Затвори прозор" +@@ -2651,8 +2650,8 @@ msgstr "_Затвори прозор" #~ msgid "_Unlimited" #~ msgstr "_Неограничено" @@ -3857,7 +3858,7 @@ index 8bf15f3250a4..81a73722c616 100644 #~ msgid "Current Locale" #~ msgstr "Текући локалитет" -@@ -2648,3 +2647,6 @@ msgstr "_Затвори прозор" +@@ -2662,3 +2661,6 @@ msgstr "_Затвори прозор" #~ msgid "Hidden" #~ msgstr "Скривен" @@ -4238,10 +4239,10 @@ index a08f25914d12..a4fbcbe6e474 100644 #~ msgid "Switch to Tab 2" #~ msgstr "До вкладки 2" diff --git a/po/vi.po b/po/vi.po -index 67eb9326545f..5a279ad647b6 100644 +index 49dede2f5f1c..07362526f2ae 100644 --- a/po/vi.po +++ b/po/vi.po -@@ -2673,8 +2673,8 @@ msgstr "Đón_g cửa sổ" +@@ -2686,8 +2686,8 @@ msgstr "Đón_g cửa sổ" #~ msgid "Default size:" #~ msgstr "Cỡ mặc định:" @@ -4252,7 +4253,7 @@ index 67eb9326545f..5a279ad647b6 100644 #~ msgid "When terminal commands set their o_wn titles:" #~ msgstr "Khi câu lệnh thiết bị cuối tự đặt tựa đề _mình:" -@@ -2685,8 +2685,8 @@ msgstr "Đón_g cửa sổ" +@@ -2698,8 +2698,8 @@ msgstr "Đón_g cửa sổ" #~ msgid "_Unlimited" #~ msgstr "_Không hạn chế" @@ -4263,7 +4264,7 @@ index 67eb9326545f..5a279ad647b6 100644 #~ msgid "Switch to Tab 3" #~ msgstr "Chuyển sang Thanh 3" -@@ -2727,8 +2727,8 @@ msgstr "Đón_g cửa sổ" +@@ -2740,8 +2740,8 @@ msgstr "Đón_g cửa sổ" #~ msgid "_Input Methods" #~ msgstr "K_iểu gõ" @@ -4274,7 +4275,7 @@ index 67eb9326545f..5a279ad647b6 100644 #~ msgid "Disable connection to session manager" #~ msgstr "Tắt kết nối đến trình quản lý phiên làm việc" -@@ -3113,3 +3113,6 @@ msgstr "Đón_g cửa sổ" +@@ -3126,3 +3126,6 @@ msgstr "Đón_g cửa sổ" #~ "Phím tắt để đặt lại thiết bị cuối. Dùng dạng chuỗi có cùng một khuôn dạng " #~ "với tập tin tài nguyên GTK+. Nếu bạn đặt tùy chọn là chuỗi “disabled” (bị " #~ "tắt), nghĩa là không có phím tắt cho hành động này." @@ -4426,10 +4427,10 @@ index 61153529f0c7..c366abddd1af 100644 +msgid "Transparent background" +msgstr "透明背景" diff --git a/po/zh_TW.po b/po/zh_TW.po -index b9890ad91bdc..18e55e2e945c 100644 +index e740ebc6df0b..2fa8c3236b8f 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po -@@ -2562,17 +2562,17 @@ msgstr "關閉視窗(_L)" +@@ -2584,17 +2584,17 @@ msgstr "關閉視窗(_L)" #~ msgid "Default size:" #~ msgstr "預設大小：" @@ -4453,7 +4454,7 @@ index b9890ad91bdc..18e55e2e945c 100644 #~ msgid "Current Locale" #~ msgstr "目前的地區設定" -@@ -2784,3 +2784,6 @@ msgstr "關閉視窗(_L)" +@@ -2806,3 +2806,6 @@ msgstr "關閉視窗(_L)" #~ msgid "Show session management options" #~ msgstr "顯示作業階段管理選項" @@ -4461,13 +4462,13 @@ index b9890ad91bdc..18e55e2e945c 100644 +msgid "Transparent background" +msgstr "透明背景" -- -2.21.0.rc1 +2.20.1 -From e41debdabdf53555e41f8d54b527604cbe1d158a Mon Sep 17 00:00:00 2001 +From f994ed551d815006f3a1f09f20dfadcbb73961b9 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 +Subject: [PATCH 12/15] Restore the action and shortcut to set a static title from the menus This reverts 9bbe19e98f62aa3c9020913a3a5a8080a5177505 with various @@ -4481,7 +4482,7 @@ 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 fc0968935495..03dc3d4fb241 100644 +index 0c50f82f4e47..aaa9e0e97ced 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -475,6 +475,10 @@ @@ -4609,13 +4610,13 @@ index 2aba397fe922..8d3ddd6f790b 100644 { "tab-detach", action_tab_detach_cb, NULL, NULL, NULL }, { "tab-move-left", action_tab_move_left_cb, NULL, NULL, NULL }, -- -2.21.0.rc1 +2.20.1 -From 41efd6569a8a6cb36dd151425d09e03adba486c4 Mon Sep 17 00:00:00 2001 +From e3c3f962755cc6ccfdf026b71ab9cb632deec043 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 +Subject: [PATCH 13/15] screen: Style fix This brings the code in line with how it was before de0dc7c2649c42e2aa02a66e4be27d262b34452d @@ -4639,13 +4640,13 @@ index bf3618cb41b0..6caa002ddece 100644 const char *p; -- -2.21.0.rc1 +2.20.1 -From 67d25877283935a3a55203c908d055875e5039ec Mon Sep 17 00:00:00 2001 +From badc4087551b34bcd210ad8d46fbdbbe9adbc1d3 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 +Subject: [PATCH 14/15] Restore the rest of the title handling options and make it all work This reverts commit f27bf0135a2d18ba22158d28bf1f8c5f6ec066c8 and makes @@ -4664,7 +4665,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 03dc3d4fb241..af338359956a 100644 +index aaa9e0e97ced..641e0203b045 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -24,6 +24,13 @@ @@ -5274,5 +5275,35 @@ index 8d3ddd6f790b..74af1c649f34 100644 static void -- -2.21.0.rc1 +2.20.1 + + +From 5aef51767a3e43990bae9c80a8ae23465af249d6 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Fri, 29 Mar 2019 18:36:02 +0100 +Subject: [PATCH 15/15] headermenu: Add placeholder item for win.set-title + +... to match the ones in the main menubar and the notebook-menus. +--- + src/terminal-headermenu.ui | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/terminal-headermenu.ui b/src/terminal-headermenu.ui +index 0176e4c584ad..42d5296993f0 100644 +--- a/src/terminal-headermenu.ui ++++ b/src/terminal-headermenu.ui +@@ -50,6 +50,11 @@ + Read-_Only + win.read-only + ++ ++ Set _Title… ++ win.set-title ++ action-missing ++ +
+ + _Advanced +-- +2.20.1 diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 3f4ad65..18d5162 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -6,8 +6,8 @@ %define desktop_file_utils_version 0.2.90 Name: gnome-terminal -Version: 3.31.90 -Release: 4%{?dist} +Version: 3.31.92 +Release: 1%{?dist} Summary: Terminal emulator for GNOME License: GPLv3+ and GFDL and LGPLv2+ @@ -106,6 +106,10 @@ make check %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Fri Mar 29 2019 Debarshi Ray - 3.31.92-1 +- Update to 3.31.92 +- Rebase the translations + * Sat Mar 16 2019 Michael Catanzaro - 3.31.90-4 - Revert previous commit: headerbar will come in 3.32 final diff --git a/sources b/sources index ff51932..d723731 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-terminal-3.31.90.tar.xz) = 5040e05170108df244b91e060de90de18cd0c1769c8c2dc36166d582fceef916841a87566da1cfd3209e8342e6a3f8032716d35f163bd2b621ae658b85f96e9d +SHA512 (gnome-terminal-3.31.92.tar.xz) = 35e287fdd79865aebfc63dbeb970b563d1b7e2ba6b40670f7b4504e030215ed760773ddc84ba31cd35271e6f19bd32984327f9140c716665ca1fef1e19dbec16