From 8a6eb8ba0b280e62246dac9e2ba0e7ab023d332a Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Nov 13 2015 14:30:03 +0000 Subject: Update to 3.18.2 - Consolidate all downstream features into a single patch to avoid conflicts - Rebase the translations --- diff --git a/.gitignore b/.gitignore index 29adc5b..fc0327d 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.17.91.tar.xz /gnome-terminal-3.18.0.tar.xz /gnome-terminal-3.18.1.tar.xz +/gnome-terminal-3.18.2.tar.xz diff --git a/gnome-terminal-command-notify.patch b/gnome-terminal-command-notify.patch deleted file mode 100644 index 04df403..0000000 --- a/gnome-terminal-command-notify.patch +++ /dev/null @@ -1,637 +0,0 @@ -From 6794273920bc690c2403938c101d1ed2ae33359b Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Tue, 27 Jan 2015 18:40:13 +0100 -Subject: [PATCH 1/3] Support desktop notifications from OSC 777 - -https://bugzilla.gnome.org/show_bug.cgi?id=711059 ---- - src/terminal-app.c | 32 ++++++++++++++ - src/terminal-screen.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ - src/terminal-tab-label.c | 28 +++++++++++- - src/terminal-tab-label.h | 4 ++ - 4 files changed, 171 insertions(+), 1 deletion(-) - -diff --git a/src/terminal-app.c b/src/terminal-app.c -index 0d2a0e61786e..a068c3673971 100644 ---- a/src/terminal-app.c -+++ b/src/terminal-app.c -@@ -353,6 +353,31 @@ app_menu_quit_cb (GSimpleAction *action, - gtk_widget_destroy (GTK_WIDGET (window)); - } - -+/* Other action callbacks */ -+ -+static void -+action_activate_tab_cb (GSimpleAction *action, -+ GVariant *parameter, -+ gpointer user_data) -+{ -+ GtkApplication *application = user_data; -+ GtkWidget *toplevel; -+ TerminalScreen *screen; -+ const char *uuid; -+ -+ g_variant_get (parameter, "&s", &uuid); -+ screen = terminal_app_get_screen_by_uuid (TERMINAL_APP (application), uuid); -+ if (screen == NULL) -+ return; -+ -+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); -+ if (!gtk_widget_is_toplevel (toplevel)) -+ return; -+ -+ terminal_window_switch_screen (TERMINAL_WINDOW (toplevel), screen); -+ gtk_window_present (GTK_WINDOW (toplevel)); -+} -+ - /* Class implementation */ - - G_DEFINE_TYPE (TerminalApp, terminal_app, GTK_TYPE_APPLICATION) -@@ -375,6 +400,10 @@ terminal_app_startup (GApplication *application) - { "quit", app_menu_quit_cb, NULL, NULL, NULL } - }; - -+ const GActionEntry other_actions[] = { -+ { "activate-tab", action_activate_tab_cb, "s", NULL, NULL } -+ }; -+ - g_application_set_resource_base_path (application, TERMINAL_RESOURCES_PATH_PREFIX); - - G_APPLICATION_CLASS (terminal_app_parent_class)->startup (application); -@@ -385,6 +414,9 @@ terminal_app_startup (GApplication *application) - g_action_map_add_action_entries (G_ACTION_MAP (application), - app_menu_actions, G_N_ELEMENTS (app_menu_actions), - application); -+ g_action_map_add_action_entries (G_ACTION_MAP (application), -+ other_actions, G_N_ELEMENTS (other_actions), -+ application); - - - app_load_css (application); -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index a48de105e953..fbc7d868d568 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -52,6 +52,7 @@ - #include "terminal-marshal.h" - #include "terminal-schemas.h" - #include "terminal-screen-container.h" -+#include "terminal-tab-label.h" - #include "terminal-util.h" - #include "terminal-window.h" - #include "terminal-info-bar.h" -@@ -85,6 +86,7 @@ struct _TerminalScreenPrivate - char **initial_env; - char **override_command; - gboolean shell; -+ gboolean shell_prompt_shown; - int child_pid; - GSList *match_tags; - guint launch_child_source_id; -@@ -135,11 +137,16 @@ 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); -+static gboolean terminal_screen_focus_in (GtkWidget *widget, -+ GdkEventFocus *event); - static gboolean terminal_screen_do_exec (TerminalScreen *screen, - FDSetupData *data, - GError **error); - static void terminal_screen_child_exited (VteTerminal *terminal, - int status); -+static void terminal_screen_notification_received (VteTerminal *terminal, -+ const char *summary, -+ const char *body); - - static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, - TerminalScreen *screen); -@@ -448,6 +455,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) - object_class->get_property = terminal_screen_get_property; - object_class->set_property = terminal_screen_set_property; - -+ widget_class->focus_in_event = terminal_screen_focus_in; - widget_class->realize = terminal_screen_realize; - widget_class->style_updated = terminal_screen_style_updated; - widget_class->drag_data_received = terminal_screen_drag_data_received; -@@ -455,6 +463,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) - widget_class->popup_menu = terminal_screen_popup_menu; - - terminal_class->child_exited = terminal_screen_child_exited; -+ terminal_class->notification_received = terminal_screen_notification_received; - - signals[PROFILE_SET] = - g_signal_new (I_("profile-set"), -@@ -576,6 +585,10 @@ terminal_screen_dispose (GObject *object) - TerminalScreen *screen = TERMINAL_SCREEN (object); - TerminalScreenPrivate *priv = screen->priv; - GtkSettings *settings; -+ TerminalApp *app; -+ -+ app = terminal_app_get (); -+ g_application_withdraw_notification (G_APPLICATION (app), priv->uuid); - - settings = gtk_widget_get_settings (GTK_WIDGET (screen)); - g_signal_handlers_disconnect_matched (settings, G_SIGNAL_MATCH_DATA, -@@ -1512,6 +1525,43 @@ terminal_screen_button_press (GtkWidget *widget, - return FALSE; - } - -+static gboolean -+terminal_screen_focus_in (GtkWidget *widget, -+ GdkEventFocus *event) -+{ -+ TerminalScreen *screen = TERMINAL_SCREEN (widget); -+ TerminalApp *app; -+ TerminalWindow *window; -+ -+ window = terminal_screen_get_window (screen); -+ if (window != NULL) -+ { -+ TerminalScreenContainer *screen_container; -+ -+ screen_container = terminal_screen_container_get_from_screen (screen); -+ if (screen_container != NULL) -+ { -+ GtkWidget *mdi_container; -+ -+ mdi_container = terminal_window_get_mdi_container (window); -+ /* FIXME: add interface method to retrieve tab label */ -+ if (GTK_IS_NOTEBOOK (mdi_container)) -+ { -+ GtkWidget *tab_label; -+ -+ tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container)); -+ terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), FALSE); -+ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), NULL, NULL); -+ } -+ } -+ } -+ -+ app = terminal_app_get (); -+ g_application_withdraw_notification (G_APPLICATION (app), screen->priv->uuid); -+ -+ return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); -+} -+ - /** - * terminal_screen_get_current_dir: - * @screen: -@@ -1613,6 +1663,64 @@ terminal_screen_child_exited (VteTerminal *terminal, - } - - static void -+terminal_screen_notification_received (VteTerminal *terminal, -+ const char *summary, -+ const char *body) -+{ -+ TerminalScreen *screen = TERMINAL_SCREEN (terminal); -+ TerminalScreenPrivate *priv = screen->priv; -+ TerminalWindow *window; -+ -+ if (G_UNLIKELY (!priv->shell_prompt_shown)) -+ { -+ priv->shell_prompt_shown = TRUE; -+ return; -+ } -+ -+ window = terminal_screen_get_window (screen); -+ if (window == NULL) -+ return; -+ -+ if (gtk_window_is_active (GTK_WINDOW (window))) -+ { -+ GtkWidget *mdi_container; -+ TerminalScreenContainer *screen_container; -+ -+ if (screen == terminal_window_get_active (window)) -+ return; -+ -+ screen_container = terminal_screen_container_get_from_screen (screen); -+ if (screen_container == NULL) -+ return; -+ -+ mdi_container = terminal_window_get_mdi_container (window); -+ /* FIXME: add interface method to retrieve tab label */ -+ if (GTK_IS_NOTEBOOK (mdi_container)) -+ { -+ GtkWidget *tab_label; -+ -+ tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container)); -+ terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), TRUE); -+ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary); -+ } -+ } -+ else -+ { -+ gs_unref_object GNotification *notification = NULL; -+ TerminalApp *app; -+ gs_free char *detailed_action = NULL; -+ -+ notification = g_notification_new (summary); -+ g_notification_set_body (notification, body); -+ detailed_action = g_strdup_printf ("app.activate-tab::%s", priv->uuid); -+ g_notification_set_default_action (notification, detailed_action); -+ -+ app = terminal_app_get (); -+ g_application_send_notification (G_APPLICATION (app), priv->uuid, notification); -+ } -+} -+ -+static void - terminal_screen_drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, -diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c -index cdd73d0653be..d6909a13ca65 100644 ---- a/src/terminal-tab-label.c -+++ b/src/terminal-tab-label.c -@@ -34,6 +34,7 @@ - struct _TerminalTabLabelPrivate - { - TerminalScreen *screen; -+ GtkWidget *icon; - GtkWidget *label; - GtkWidget *close_button; - gboolean bold; -@@ -179,7 +180,7 @@ terminal_tab_label_constructed (GObject *object) - { - TerminalTabLabel *tab_label = TERMINAL_TAB_LABEL (object); - TerminalTabLabelPrivate *priv = tab_label->priv; -- GtkWidget *hbox, *label, *close_button; -+ GtkWidget *hbox, *icon, *label, *close_button; - - G_OBJECT_CLASS (terminal_tab_label_parent_class)->constructed (object); - -@@ -189,6 +190,10 @@ terminal_tab_label_constructed (GObject *object) - - gtk_box_set_spacing (GTK_BOX (hbox), SPACING); - -+ priv->icon = icon = gtk_image_new (); -+ gtk_widget_set_no_show_all (icon, TRUE); -+ gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); -+ - priv->label = label = gtk_label_new (NULL); - gtk_widget_set_halign (label, GTK_ALIGN_CENTER); - gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); -@@ -377,6 +382,27 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label, - } - - /** -+ * terminal_tab_label_set_icon: -+ * @tab_label: a #TerminalTabLabel -+ * @icon_name: (allow-none): an icon name -+ * @tooltip: (allow-none): text to be used as tooltip -+ * -+ * Shows an icon at the beginning of @tab_label. If @icon_name is -+ * %NULL, then the icon will be hidden. -+ */ -+void -+terminal_tab_label_set_icon (TerminalTabLabel *tab_label, -+ const char *icon_name, -+ const char *tooltip) -+{ -+ TerminalTabLabelPrivate *priv = tab_label->priv; -+ -+ gtk_widget_set_visible (priv->icon, icon_name != NULL); -+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon), icon_name, GTK_ICON_SIZE_MENU); -+ gtk_widget_set_tooltip_text (GTK_WIDGET (priv->icon), tooltip); -+} -+ -+/** - * terminal_tab_label_get_screen: - * @tab_label: a #TerminalTabLabel - * -diff --git a/src/terminal-tab-label.h b/src/terminal-tab-label.h -index 20cfbceb36b0..a987025e0524 100644 ---- a/src/terminal-tab-label.h -+++ b/src/terminal-tab-label.h -@@ -59,6 +59,10 @@ GtkWidget * terminal_tab_label_new (TerminalScreen *screen); - void terminal_tab_label_set_bold (TerminalTabLabel *tab_label, - gboolean bold); - -+void terminal_tab_label_set_icon (TerminalTabLabel *tab_label, -+ const char *icon_name, -+ const char *tooltip); -+ - TerminalScreen *terminal_tab_label_get_screen (TerminalTabLabel *tab_label); - - G_END_DECLS --- -2.1.0 - - -From 684f71a0548579304ec8283e17d073be243cba44 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Tue, 27 Jan 2015 19:04:19 +0100 -Subject: [PATCH 2/3] Make notifications based on org.gtk.Notification work - -The desktop file should be named after the application ID for this. - -https://bugzilla.gnome.org/show_bug.cgi?id=711059 ---- - Makefile.am | 4 ++-- - configure.ac | 2 +- - gnome-terminal.appdata.xml.in | 38 ---------------------------------- - gnome-terminal.desktop.in.in | 16 -------------- - org.gnome.Terminal.appdata.xml.in | 38 ++++++++++++++++++++++++++++++++++ - org.gnome.Terminal.desktop.in.in | 16 ++++++++++++++ - po/POTFILES.in | 4 ++-- - po/POTFILES.skip | 2 +- - src/gnome-terminal-search-provider.ini | 2 +- - 9 files changed, 61 insertions(+), 61 deletions(-) - delete mode 100644 gnome-terminal.appdata.xml.in - delete mode 100644 gnome-terminal.desktop.in.in - create mode 100644 org.gnome.Terminal.appdata.xml.in - create mode 100644 org.gnome.Terminal.desktop.in.in - -diff --git a/Makefile.am b/Makefile.am -index f6f41a6e2c73..3aa8677ed587 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -14,7 +14,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ - $(NULL) - - desktopdir = $(datadir)/applications --desktop_in_files = @PACKAGE@.desktop.in.in -+desktop_in_files = org.gnome.Terminal.desktop.in.in - nodist_desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) - @INTLTOOL_DESKTOP_RULE@ - -@@ -25,7 +25,7 @@ desktop-file-validate: $(nodist_desktop_DATA) - done - - appdatadir = $(datadir)/appdata --appdata_in_files = gnome-terminal.appdata.xml.in -+appdata_in_files = org.gnome.Terminal.appdata.xml.in - nodist_appdata_DATA = $(appdata_in_files:.xml.in=.xml) - @INTLTOOL_XML_RULE@ - -diff --git a/configure.ac b/configure.ac -index fcaf3df73ce7..0f04df152015 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -353,7 +353,7 @@ AC_DEFINE_UNQUOTED([GDK_VERSION_MAX_ALLOWED],[GDK_VERSION_[]AS_TR_SH([$GTK_MAX_A - - AC_CONFIG_FILES([ - Makefile --gnome-terminal.desktop.in -+org.gnome.Terminal.desktop.in - src/Makefile - src/terminal-version.h - help/Makefile -diff --git a/gnome-terminal.appdata.xml.in b/gnome-terminal.appdata.xml.in -deleted file mode 100644 -index 7ef61e967ae5..000000000000 ---- a/gnome-terminal.appdata.xml.in -+++ /dev/null -@@ -1,38 +0,0 @@ -- -- -- -- -- gnome-terminal.desktop -- GPL-3.0+ -- GPL-3.0+ -- <_name>Terminal -- <_summary>Use the command line -- -- <_p>GNOME Terminal is a terminal emulator application for accessing a UNIX shell environment which can be used to run programs available on your system. -- <_p>It supports several profiles, multiple tabs and implements several keyboard shortcuts. -- -- -- https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png -- -- https://wiki.gnome.org/Apps/Terminal -- GNOME -- https://wiki.gnome.org/Apps/Terminal/ReportingBugs -- -diff --git a/gnome-terminal.desktop.in.in b/gnome-terminal.desktop.in.in -deleted file mode 100644 -index 98ad8f9fe083..000000000000 ---- a/gnome-terminal.desktop.in.in -+++ /dev/null -@@ -1,16 +0,0 @@ --[Desktop Entry] --_Name=Terminal --_Comment=Use the command line --_Keywords=shell;prompt;command;commandline;cmd; --TryExec=gnome-terminal --Exec=gnome-terminal --Icon=utilities-terminal --Type=Application --X-GNOME-DocPath=gnome-terminal/index.html --X-GNOME-Bugzilla-Bugzilla=GNOME --X-GNOME-Bugzilla-Product=gnome-terminal --X-GNOME-Bugzilla-Component=BugBuddyBugs --X-GNOME-Bugzilla-Version=@VERSION@ --Categories=GNOME;GTK;System;TerminalEmulator; --StartupNotify=true --X-GNOME-SingleWindow=false -diff --git a/org.gnome.Terminal.appdata.xml.in b/org.gnome.Terminal.appdata.xml.in -new file mode 100644 -index 000000000000..ab4f23b8329a ---- /dev/null -+++ b/org.gnome.Terminal.appdata.xml.in -@@ -0,0 +1,38 @@ -+ -+ -+ -+ -+ org.gnome.Terminal.desktop -+ GPL-3.0+ -+ GPL-3.0+ -+ <_name>Terminal -+ <_summary>Use the command line -+ -+ <_p>GNOME Terminal is a terminal emulator application for accessing a UNIX shell environment which can be used to run programs available on your system. -+ <_p>It supports several profiles, multiple tabs and implements several keyboard shortcuts. -+ -+ -+ https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png -+ -+ https://wiki.gnome.org/Apps/Terminal -+ GNOME -+ https://wiki.gnome.org/Apps/Terminal/ReportingBugs -+ -diff --git a/org.gnome.Terminal.desktop.in.in b/org.gnome.Terminal.desktop.in.in -new file mode 100644 -index 000000000000..98ad8f9fe083 ---- /dev/null -+++ b/org.gnome.Terminal.desktop.in.in -@@ -0,0 +1,16 @@ -+[Desktop Entry] -+_Name=Terminal -+_Comment=Use the command line -+_Keywords=shell;prompt;command;commandline;cmd; -+TryExec=gnome-terminal -+Exec=gnome-terminal -+Icon=utilities-terminal -+Type=Application -+X-GNOME-DocPath=gnome-terminal/index.html -+X-GNOME-Bugzilla-Bugzilla=GNOME -+X-GNOME-Bugzilla-Product=gnome-terminal -+X-GNOME-Bugzilla-Component=BugBuddyBugs -+X-GNOME-Bugzilla-Version=@VERSION@ -+Categories=GNOME;GTK;System;TerminalEmulator; -+StartupNotify=true -+X-GNOME-SingleWindow=false -diff --git a/po/POTFILES.in b/po/POTFILES.in -index dcbc5fe2c5aa..ae304cdfbbe1 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -1,8 +1,8 @@ - [encoding: UTF-8] - # List of source files containing translatable strings. - # Please keep this file sorted alphabetically. --gnome-terminal.appdata.xml.in --gnome-terminal.desktop.in.in -+org.gnome.Terminal.appdata.xml.in -+org.gnome.Terminal.desktop.in.in - [type: gettext/glade]src/find-dialog.ui - src/gterminal.vala - src/migration.c -diff --git a/po/POTFILES.skip b/po/POTFILES.skip -index 7c37b7fc2ca7..ef7c63561d4b 100644 ---- a/po/POTFILES.skip -+++ b/po/POTFILES.skip -@@ -1,4 +1,4 @@ - # List of source files that should *not* be translated. - # Please keep this file sorted alphabetically. --gnome-terminal.desktop.in -+org.gnome.Terminal.desktop.in - src/gterminal.c -diff --git a/src/gnome-terminal-search-provider.ini b/src/gnome-terminal-search-provider.ini -index b6506f299f1d..1b9f81c10fcf 100644 ---- a/src/gnome-terminal-search-provider.ini -+++ b/src/gnome-terminal-search-provider.ini -@@ -14,7 +14,7 @@ - # along with this program. If not, see . - - [Shell Search Provider] --DesktopId=gnome-terminal.desktop -+DesktopId=org.gnome.Terminal.desktop - BusName=org.gnome.Terminal - ObjectPath=/org/gnome/Terminal/SearchProvider - Version=2 --- -2.1.0 - - -From ac22ab8ab4d12d051f0e371c8a405d7568db50dd Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Thu, 29 Jan 2015 11:47:21 +0100 -Subject: [PATCH 3/3] Sprinkle debug messages for notifications - -This can be useful for finding out whether the escape sequence wasn't -emitted or the filtering was faulty. - -https://bugzilla.gnome.org/show_bug.cgi?id=711059 ---- - src/terminal-debug.c | 1 + - src/terminal-debug.h | 3 ++- - src/terminal-screen.c | 6 ++++++ - 3 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/terminal-debug.c b/src/terminal-debug.c -index 0ff321f1f0e2..dac79c38d82b 100644 ---- a/src/terminal-debug.c -+++ b/src/terminal-debug.c -@@ -38,6 +38,7 @@ _terminal_debug_init(void) - { "settings-list", TERMINAL_DEBUG_SETTINGS_LIST }, - { "appmenu", TERMINAL_DEBUG_APPMENU }, - { "search", TERMINAL_DEBUG_SEARCH }, -+ { "notifications", TERMINAL_DEBUG_NOTIFICATIONS }, - }; - - _terminal_debug_flags = g_parse_debug_string (g_getenv ("GNOME_TERMINAL_DEBUG"), -diff --git a/src/terminal-debug.h b/src/terminal-debug.h -index 5dc3ca4f3df0..7499ebe06c88 100644 ---- a/src/terminal-debug.h -+++ b/src/terminal-debug.h -@@ -34,7 +34,8 @@ typedef enum { - TERMINAL_DEBUG_PROFILE = 1 << 6, - TERMINAL_DEBUG_SETTINGS_LIST = 1 << 7, - TERMINAL_DEBUG_APPMENU = 1 << 8, -- TERMINAL_DEBUG_SEARCH = 1 << 9 -+ TERMINAL_DEBUG_SEARCH = 1 << 9, -+ TERMINAL_DEBUG_NOTIFICATIONS = 1 << 10 - } TerminalDebugFlags; - - void _terminal_debug_init(void); -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index fbc7d868d568..f95ad2748e83 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -1533,6 +1533,8 @@ terminal_screen_focus_in (GtkWidget *widget, - TerminalApp *app; - TerminalWindow *window; - -+ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notification withdrawn\n"); -+ - window = terminal_screen_get_window (screen); - if (window != NULL) - { -@@ -1671,6 +1673,8 @@ terminal_screen_notification_received (VteTerminal *terminal, - TerminalScreenPrivate *priv = screen->priv; - TerminalWindow *window; - -+ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notification received: [%s]: %s\n", summary, body); -+ - if (G_UNLIKELY (!priv->shell_prompt_shown)) - { - priv->shell_prompt_shown = TRUE; -@@ -1702,6 +1706,7 @@ terminal_screen_notification_received (VteTerminal *terminal, - tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container)); - terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), TRUE); - terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary); -+ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify tab\n"); - } - } - else -@@ -1717,6 +1722,7 @@ terminal_screen_notification_received (VteTerminal *terminal, - - app = terminal_app_get (); - g_application_send_notification (G_APPLICATION (app), priv->uuid, notification); -+ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify desktop\n"); - } - } - --- -2.1.0 - diff --git a/gnome-terminal-dark-transparency-notify.patch b/gnome-terminal-dark-transparency-notify.patch new file mode 100644 index 0000000..7b37462 --- /dev/null +++ b/gnome-terminal-dark-transparency-notify.patch @@ -0,0 +1,2995 @@ +From da56656bf00ef6fecd4b865845a8091d7de84583 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Mon, 12 May 2014 14:57:18 +0200 +Subject: [PATCH 1/9] Restore transparency + +The transparency settings were removed as a side effect of +2bff4b63ed3ceef6055e35563e9b0b33ad57349d + +This restores them and you will need a compositing window manager to +use it. The background image setting, also known as faux transparency, +was not restored. + +The transparency checkbox lost its mnemonic accelerator because 't' +is already taken and using any other letter would make it hard to +restore the translations of the string. +--- + src/org.gnome.Terminal.gschema.xml | 10 +++++ + src/profile-editor.c | 11 +++++ + src/profile-preferences.ui | 92 ++++++++++++++++++++++++++++++++++++++ + src/terminal-schemas.h | 3 ++ + src/terminal-screen.c | 22 ++++++++- + src/terminal-window.c | 7 +++ + 6 files changed, 144 insertions(+), 1 deletion(-) + +diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml +index 6e24f564c91a..0a646370dd65 100644 +--- a/src/org.gnome.Terminal.gschema.xml ++++ b/src/org.gnome.Terminal.gschema.xml +@@ -334,6 +334,16 @@ + 'narrow' + Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding + ++ ++ false ++ Whether to use a transparent background ++ ++ ++ 50 ++ ++ Adjust the amount of transparency ++ A value between 0 and 100, where 0 is opaque and 100 is fully transparent. ++ + + + +diff --git a/src/profile-editor.c b/src/profile-editor.c +index a96145f8d60c..93327c6178e7 100644 +--- a/src/profile-editor.c ++++ b/src/profile-editor.c +@@ -1137,7 +1137,18 @@ terminal_profile_edit (GSettings *profile, + "active-id", + G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); + ++ g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, ++ gtk_builder_get_object (builder, "use-transparent-background"), ++ "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, ++ gtk_builder_get_object (builder, "background-transparent-scale-box"), ++ "sensitive", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY); ++ g_settings_bind (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT, ++ gtk_builder_get_object (builder, "background-transparent-adjustment"), ++ "value", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ + /* Finished! */ ++ + terminal_util_bind_mnemonic_label_sensitivity (editor); + + terminal_util_dialog_focus_widget (editor, widget_name); +diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui +index 579c28ff344f..edb264ba5d72 100644 +--- a/src/profile-preferences.ui ++++ b/src/profile-preferences.ui +@@ -23,6 +23,11 @@ + 1 + 100 + ++ ++ 100 ++ 1 ++ 10 ++ + + + +@@ -991,6 +996,93 @@ + 1 + + ++ ++ ++ True ++ False ++ horizontal ++ 12 ++ ++ ++ Transparent background ++ True ++ True ++ False ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ False ++ horizontal ++ 6 ++ ++ ++ True ++ False ++ 0.5 ++ none ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ background-transparent-adjustment ++ False ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ True ++ False ++ 0.5 ++ full ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ True ++ True ++ 2 ++ ++ + + + +diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h +index a8a0d908beea..e35990d728dc 100644 +--- a/src/terminal-schemas.h ++++ b/src/terminal-schemas.h +@@ -63,6 +63,9 @@ G_BEGIN_DECLS + #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" + #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions" + ++#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND "use-transparent-background" ++#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent" ++ + #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" + #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 a48de105e953..f5a70cdbcf81 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -765,7 +765,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, + prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR_KEY) || + prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY) || + prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_KEY) || +- prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY)) ++ prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) || ++ prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) || ++ prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT)) + update_color_scheme (screen); + + if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) +@@ -831,6 +833,8 @@ update_color_scheme (TerminalScreen *screen) + GdkRGBA fg, bg, bold, theme_fg, theme_bg; + GdkRGBA *boldp; + GtkStyleContext *context; ++ GtkWidget *toplevel; ++ gboolean transparent; + + context = gtk_widget_get_style_context (widget); + gtk_style_context_get_color (context, gtk_style_context_get_state (context), &theme_fg); +@@ -851,9 +855,25 @@ update_color_scheme (TerminalScreen *screen) + boldp = NULL; + + colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); ++ ++ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); ++ if (transparent) ++ { ++ gint transparency_percent; ++ ++ transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT); ++ bg.alpha = (100 - transparency_percent) / 100.0; ++ } ++ else ++ bg.alpha = 1.0; ++ + vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, + colors, n_colors); + vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); ++ ++ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); ++ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) ++ gtk_widget_set_app_paintable (toplevel, transparent); + } + + static void +diff --git a/src/terminal-window.c b/src/terminal-window.c +index 618425c0e4d5..637b533a4bff 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -2590,6 +2590,8 @@ terminal_window_init (TerminalWindow *window) + TerminalWindowPrivate *priv; + TerminalApp *app; + TerminalSettingsList *profiles_list; ++ GdkScreen *screen; ++ GdkVisual *visual; + GtkActionGroup *action_group; + GtkAction *action; + GtkUIManager *manager; +@@ -2605,6 +2607,11 @@ terminal_window_init (TerminalWindow *window) + + gtk_widget_init_template (GTK_WIDGET (window)); + ++ screen = gtk_widget_get_screen (GTK_WIDGET (window)); ++ visual = gdk_screen_get_rgba_visual (screen); ++ if (visual != NULL) ++ gtk_widget_set_visual (GTK_WIDGET (window), visual); ++ + uuid_generate (u); + uuid_unparse (u, uuidstr); + priv->uuid = g_strdup (uuidstr); +-- +2.5.0 + + +From b29a3cf85006ef2b0d34c70fe2e350915d6d3574 Mon Sep 17 00:00:00 2001 +From: Lars Uebernickel +Date: Wed, 28 May 2014 14:11:02 +0200 +Subject: [PATCH 2/9] 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 +is usually not a problem because GTK+ sets an opaque region on the +whole window and things without a background-color get drawn with the +theme's default background colour. However, to achieve transparency +we disable the opaque region by making the window app-paintable. This +can lead to transparent menubars or notebook tabs in some themes. We +can avoid this by ensuring that the window always renders a background. + +https://bugzilla.gnome.org/show_bug.cgi?id=730016 +--- + src/terminal-window.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/src/terminal-window.c b/src/terminal-window.c +index 637b533a4bff..7385b1dd5369 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -2229,6 +2229,26 @@ terminal_window_realize (GtkWidget *widget) + } + + static gboolean ++terminal_window_draw (GtkWidget *widget, ++ cairo_t *cr) ++{ ++ if (gtk_widget_get_app_paintable (widget)) ++ { ++ GtkStyleContext *context; ++ int width; ++ int height; ++ ++ context = gtk_widget_get_style_context (widget); ++ width = gtk_widget_get_allocated_width (widget); ++ height = gtk_widget_get_allocated_height (widget); ++ gtk_render_background (context, cr, 0, 0, width, height); ++ gtk_render_frame (context, cr, 0, 0, width, height); ++ } ++ ++ return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); ++} ++ ++static gboolean + terminal_window_state_event (GtkWidget *widget, + GdkEventWindowState *event) + { +@@ -2791,6 +2811,7 @@ terminal_window_class_init (TerminalWindowClass *klass) + + widget_class->show = terminal_window_show; + widget_class->realize = terminal_window_realize; ++ widget_class->draw = terminal_window_draw; + widget_class->window_state_event = terminal_window_state_event; + widget_class->screen_changed = terminal_window_screen_changed; + widget_class->style_updated = terminal_window_style_updated; +-- +2.5.0 + + +From 6a353ac2ce5a21521a893ba6f99384fb59d123b5 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Tue, 17 Feb 2015 13:22:11 +0100 +Subject: [PATCH 3/9] Revert "prefs: Remove dark theme pref" + +This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18. +--- + src/org.gnome.Terminal.gschema.xml | 5 +++++ + src/preferences.ui | 16 ++++++++++++++++ + src/terminal-app.c | 4 ++++ + src/terminal-prefs.c | 9 ++++++++- + src/terminal-schemas.h | 1 + + 5 files changed, 34 insertions(+), 1 deletion(-) + +diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml +index 0a646370dd65..719a5f06ee33 100644 +--- a/src/org.gnome.Terminal.gschema.xml ++++ b/src/org.gnome.Terminal.gschema.xml +@@ -658,6 +658,11 @@ + Whether to show the menubar in new windows + + ++ ++ false ++ Whether to use a dark theme variant ++ ++ + + 'window' + Whether to open new terminals as windows or tabs +diff --git a/src/preferences.ui b/src/preferences.ui +index bdb643d992cb..a918b1b9f565 100644 +--- a/src/preferences.ui ++++ b/src/preferences.ui +@@ -99,6 +99,22 @@ + + + ++ ++ Use _dark theme variant ++ True ++ True ++ False ++ True ++ 0 ++ True ++ ++ ++ False ++ True ++ 3 ++ ++ ++ + + True + False +diff --git a/src/terminal-app.c b/src/terminal-app.c +index 0d2a0e61786e..96341e96cfad 100644 +--- a/src/terminal-app.c ++++ b/src/terminal-app.c +@@ -409,6 +409,10 @@ terminal_app_init (TerminalApp *app) + + /* Terminal global settings */ + app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA); ++ g_settings_bind (app->global_settings, TERMINAL_SETTING_DARK_THEME_KEY, ++ gtk_settings_get_default (), ++ "gtk-application-prefer-dark-theme", ++ G_SETTINGS_BIND_GET); + + /* Check if we need to migrate from gconf to dconf */ + maybe_migrate_settings (app); +diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c +index 230b0aec46f8..f2ce723771fe 100644 +--- a/src/terminal-prefs.c ++++ b/src/terminal-prefs.c +@@ -560,7 +560,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, + GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button; + GtkWidget *disable_shortcuts_button; + GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button; +- GtkWidget *new_terminal_mode_combo; ++ GtkWidget *dark_theme_button, *new_terminal_mode_combo; + GtkWidget *default_hbox, *default_label; + GtkWidget *close_button, *help_button; + GtkTreeSelection *selection; +@@ -584,6 +584,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, + "close-button", &close_button, + "help-button", &help_button, + "default-show-menubar-checkbutton", &show_menubar_button, ++ "dark-theme-checkbutton", &dark_theme_button, + "new-terminal-mode-combobox", &new_terminal_mode_combo, + "disable-mnemonics-checkbutton", &disable_mnemonics_button, + "disable-shortcuts-checkbutton", &disable_shortcuts_button, +@@ -614,6 +615,12 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, + G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); + + g_settings_bind (settings, ++ TERMINAL_SETTING_DARK_THEME_KEY, ++ dark_theme_button, ++ "active", ++ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ ++ g_settings_bind (settings, + TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY, + new_terminal_mode_combo, + "active-id", +diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h +index e35990d728dc..d4f44d2f538e 100644 +--- a/src/terminal-schemas.h ++++ b/src/terminal-schemas.h +@@ -68,6 +68,7 @@ G_BEGIN_DECLS + + #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" + #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" ++#define TERMINAL_SETTING_DARK_THEME_KEY "dark-theme" + #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" + #define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY "mnemonics-enabled" + #define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY "shortcuts-enabled" +-- +2.5.0 + + +From 6a5ae778dd478ec76fb31c7fd038755f6244827f Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Tue, 17 Feb 2015 13:22:21 +0100 +Subject: [PATCH 4/9] Revert "help: Remove dark theme pref" + +This reverts commit baaca6a4cc5ca78d7b0e02cfaee6c159bad7ce4b. +--- + help/C/pref-theme.page | 41 +++++++++++++++++++++++++++++++++++++++++ + help/Makefile.am | 1 + + 2 files changed, 42 insertions(+) + create mode 100644 help/C/pref-theme.page + +diff --git a/help/C/pref-theme.page b/help/C/pref-theme.page +new file mode 100644 +index 000000000000..a997d14c0dfd +--- /dev/null ++++ b/help/C/pref-theme.page +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ ++ ++ ++ Ekaterina Gerasimova ++ kittykat3756@gmail.com ++ 2014 ++ ++ ++ ++ ++ ++ Use either the light or dark theme for Terminal. ++ ++ ++ Chose the window theme ++ ++

You can chose to use either the dark theme or the light theme for the ++ terminal window.

++ ++ ++ ++

Select ++ EditPreferencesGeneral.

++ ++ ++

To use the dark theme, select Use dark theme variant.

++ ++ ++ ++ +diff --git a/help/Makefile.am b/help/Makefile.am +index e3ca62732cf6..4bacc91265de 100644 +--- a/help/Makefile.am ++++ b/help/Makefile.am +@@ -35,6 +35,7 @@ HELP_FILES = \ + pref-profile-encoding.page \ + pref-scrolling.page \ + pref-tab-window.page \ ++ pref-theme.page \ + pref-user-input.page \ + profile.page \ + prob-reset.page \ +-- +2.5.0 + + +From 38a9536245918e521005ca3b4b473d3f68a24da4 Mon Sep 17 00:00:00 2001 +From: "Owen W. Taylor" +Date: Fri, 13 Nov 2015 15:16:42 +0100 +Subject: [PATCH 5/9] screen, window: Extra padding around transparent + terminals in Wayland + +https://bugzilla.redhat.com/show_bug.cgi?id=1207943 +--- + src/terminal-screen.c | 40 +++++++++++++++++++++++++++++++++++++--- + src/terminal-window.c | 18 ++++++++++++------ + 2 files changed, 49 insertions(+), 9 deletions(-) + +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index f5a70cdbcf81..6838ee41957e 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -135,6 +135,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); ++static void terminal_screen_hierarchy_changed (GtkWidget *widget, ++ GtkWidget *previous_toplevel); + static gboolean terminal_screen_do_exec (TerminalScreen *screen, + FDSetupData *data, + GError **error); +@@ -453,6 +455,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; ++ widget_class->hierarchy_changed = terminal_screen_hierarchy_changed; + + terminal_class->child_exited = terminal_screen_child_exited; + +@@ -823,6 +826,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, + } + + static void ++update_toplevel_transparency (TerminalScreen *screen) ++{ ++ GtkWidget *widget = GTK_WIDGET (screen); ++ TerminalScreenPrivate *priv = screen->priv; ++ GSettings *profile = priv->profile; ++ GtkWidget *toplevel; ++ ++ toplevel = gtk_widget_get_toplevel (widget); ++ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) ++ { ++ gboolean transparent; ++ ++ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); ++ if (gtk_widget_get_app_paintable (toplevel) != transparent) ++ { ++ gtk_widget_set_app_paintable (toplevel, transparent); ++ ++ /* The opaque region of the toplevel isn't updated until the toplevel is allocated; ++ * set_app_paintable() doesn't force an allocation, so do that manually. ++ */ ++ gtk_widget_queue_resize (toplevel); ++ } ++ } ++} ++ ++static void + update_color_scheme (TerminalScreen *screen) + { + GtkWidget *widget = GTK_WIDGET (screen); +@@ -871,9 +900,7 @@ update_color_scheme (TerminalScreen *screen) + colors, n_colors); + vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); + +- toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); +- if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) +- gtk_widget_set_app_paintable (toplevel, transparent); ++ update_toplevel_transparency (screen); + } + + static void +@@ -1473,6 +1500,13 @@ terminal_screen_do_popup (TerminalScreen *screen, + terminal_screen_popup_info_unref (info); + } + ++static void ++terminal_screen_hierarchy_changed (GtkWidget *widget, ++ GtkWidget *previous_toplevel) ++{ ++ update_toplevel_transparency (TERMINAL_SCREEN (widget)); ++} ++ + static gboolean + terminal_screen_button_press (GtkWidget *widget, + GdkEventButton *event) +diff --git a/src/terminal-window.c b/src/terminal-window.c +index 7385b1dd5369..ce5a33f31dad 100644 +--- a/src/terminal-window.c ++++ b/src/terminal-window.c +@@ -2234,15 +2234,21 @@ terminal_window_draw (GtkWidget *widget, + { + if (gtk_widget_get_app_paintable (widget)) + { ++ GtkAllocation child_allocation; + GtkStyleContext *context; +- int width; +- int height; ++ GtkWidget *child; ++ ++ /* Get the *child* allocation, so we don't overwrite window borders */ ++ child = gtk_bin_get_child (GTK_BIN (widget)); ++ gtk_widget_get_allocation (child, &child_allocation); + + context = gtk_widget_get_style_context (widget); +- width = gtk_widget_get_allocated_width (widget); +- height = gtk_widget_get_allocated_height (widget); +- gtk_render_background (context, cr, 0, 0, width, height); +- gtk_render_frame (context, cr, 0, 0, width, height); ++ gtk_render_background (context, cr, ++ child_allocation.x, child_allocation.y, ++ child_allocation.width, child_allocation.height); ++ gtk_render_frame (context, cr, ++ child_allocation.x, child_allocation.y, ++ child_allocation.width, child_allocation.height); + } + + return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); +-- +2.5.0 + + +From 400488c2b07043e410666b6a98be58f530aa15b1 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Tue, 27 Jan 2015 18:40:13 +0100 +Subject: [PATCH 6/9] Support desktop notifications from OSC 777 + +https://bugzilla.gnome.org/show_bug.cgi?id=711059 +--- + src/terminal-app.c | 32 ++++++++++++++ + src/terminal-screen.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ + src/terminal-tab-label.c | 28 +++++++++++- + src/terminal-tab-label.h | 4 ++ + 4 files changed, 171 insertions(+), 1 deletion(-) + +diff --git a/src/terminal-app.c b/src/terminal-app.c +index 96341e96cfad..197ddfd48691 100644 +--- a/src/terminal-app.c ++++ b/src/terminal-app.c +@@ -353,6 +353,31 @@ app_menu_quit_cb (GSimpleAction *action, + gtk_widget_destroy (GTK_WIDGET (window)); + } + ++/* Other action callbacks */ ++ ++static void ++action_activate_tab_cb (GSimpleAction *action, ++ GVariant *parameter, ++ gpointer user_data) ++{ ++ GtkApplication *application = user_data; ++ GtkWidget *toplevel; ++ TerminalScreen *screen; ++ const char *uuid; ++ ++ g_variant_get (parameter, "&s", &uuid); ++ screen = terminal_app_get_screen_by_uuid (TERMINAL_APP (application), uuid); ++ if (screen == NULL) ++ return; ++ ++ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); ++ if (!gtk_widget_is_toplevel (toplevel)) ++ return; ++ ++ terminal_window_switch_screen (TERMINAL_WINDOW (toplevel), screen); ++ gtk_window_present (GTK_WINDOW (toplevel)); ++} ++ + /* Class implementation */ + + G_DEFINE_TYPE (TerminalApp, terminal_app, GTK_TYPE_APPLICATION) +@@ -375,6 +400,10 @@ terminal_app_startup (GApplication *application) + { "quit", app_menu_quit_cb, NULL, NULL, NULL } + }; + ++ const GActionEntry other_actions[] = { ++ { "activate-tab", action_activate_tab_cb, "s", NULL, NULL } ++ }; ++ + g_application_set_resource_base_path (application, TERMINAL_RESOURCES_PATH_PREFIX); + + G_APPLICATION_CLASS (terminal_app_parent_class)->startup (application); +@@ -385,6 +414,9 @@ terminal_app_startup (GApplication *application) + g_action_map_add_action_entries (G_ACTION_MAP (application), + app_menu_actions, G_N_ELEMENTS (app_menu_actions), + application); ++ g_action_map_add_action_entries (G_ACTION_MAP (application), ++ other_actions, G_N_ELEMENTS (other_actions), ++ application); + + + app_load_css (application); +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index 6838ee41957e..6a4dbd18bf9f 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -52,6 +52,7 @@ + #include "terminal-marshal.h" + #include "terminal-schemas.h" + #include "terminal-screen-container.h" ++#include "terminal-tab-label.h" + #include "terminal-util.h" + #include "terminal-window.h" + #include "terminal-info-bar.h" +@@ -85,6 +86,7 @@ struct _TerminalScreenPrivate + char **initial_env; + char **override_command; + gboolean shell; ++ gboolean shell_prompt_shown; + int child_pid; + GSList *match_tags; + guint launch_child_source_id; +@@ -137,11 +139,16 @@ static gboolean terminal_screen_button_press (GtkWidget *widget, + GdkEventButton *event); + static void terminal_screen_hierarchy_changed (GtkWidget *widget, + GtkWidget *previous_toplevel); ++static gboolean terminal_screen_focus_in (GtkWidget *widget, ++ GdkEventFocus *event); + static gboolean terminal_screen_do_exec (TerminalScreen *screen, + FDSetupData *data, + GError **error); + static void terminal_screen_child_exited (VteTerminal *terminal, + int status); ++static void terminal_screen_notification_received (VteTerminal *terminal, ++ const char *summary, ++ const char *body); + + static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, + TerminalScreen *screen); +@@ -450,6 +457,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) + object_class->get_property = terminal_screen_get_property; + object_class->set_property = terminal_screen_set_property; + ++ widget_class->focus_in_event = terminal_screen_focus_in; + widget_class->realize = terminal_screen_realize; + widget_class->style_updated = terminal_screen_style_updated; + widget_class->drag_data_received = terminal_screen_drag_data_received; +@@ -458,6 +466,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) + widget_class->hierarchy_changed = terminal_screen_hierarchy_changed; + + terminal_class->child_exited = terminal_screen_child_exited; ++ terminal_class->notification_received = terminal_screen_notification_received; + + signals[PROFILE_SET] = + g_signal_new (I_("profile-set"), +@@ -579,6 +588,10 @@ terminal_screen_dispose (GObject *object) + TerminalScreen *screen = TERMINAL_SCREEN (object); + TerminalScreenPrivate *priv = screen->priv; + GtkSettings *settings; ++ TerminalApp *app; ++ ++ app = terminal_app_get (); ++ g_application_withdraw_notification (G_APPLICATION (app), priv->uuid); + + settings = gtk_widget_get_settings (GTK_WIDGET (screen)); + g_signal_handlers_disconnect_matched (settings, G_SIGNAL_MATCH_DATA, +@@ -1566,6 +1579,43 @@ terminal_screen_button_press (GtkWidget *widget, + return FALSE; + } + ++static gboolean ++terminal_screen_focus_in (GtkWidget *widget, ++ GdkEventFocus *event) ++{ ++ TerminalScreen *screen = TERMINAL_SCREEN (widget); ++ TerminalApp *app; ++ TerminalWindow *window; ++ ++ window = terminal_screen_get_window (screen); ++ if (window != NULL) ++ { ++ TerminalScreenContainer *screen_container; ++ ++ screen_container = terminal_screen_container_get_from_screen (screen); ++ if (screen_container != NULL) ++ { ++ GtkWidget *mdi_container; ++ ++ mdi_container = terminal_window_get_mdi_container (window); ++ /* FIXME: add interface method to retrieve tab label */ ++ if (GTK_IS_NOTEBOOK (mdi_container)) ++ { ++ GtkWidget *tab_label; ++ ++ tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container)); ++ terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), FALSE); ++ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), NULL, NULL); ++ } ++ } ++ } ++ ++ app = terminal_app_get (); ++ g_application_withdraw_notification (G_APPLICATION (app), screen->priv->uuid); ++ ++ return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); ++} ++ + /** + * terminal_screen_get_current_dir: + * @screen: +@@ -1667,6 +1717,64 @@ terminal_screen_child_exited (VteTerminal *terminal, + } + + static void ++terminal_screen_notification_received (VteTerminal *terminal, ++ const char *summary, ++ const char *body) ++{ ++ TerminalScreen *screen = TERMINAL_SCREEN (terminal); ++ TerminalScreenPrivate *priv = screen->priv; ++ TerminalWindow *window; ++ ++ if (G_UNLIKELY (!priv->shell_prompt_shown)) ++ { ++ priv->shell_prompt_shown = TRUE; ++ return; ++ } ++ ++ window = terminal_screen_get_window (screen); ++ if (window == NULL) ++ return; ++ ++ if (gtk_window_is_active (GTK_WINDOW (window))) ++ { ++ GtkWidget *mdi_container; ++ TerminalScreenContainer *screen_container; ++ ++ if (screen == terminal_window_get_active (window)) ++ return; ++ ++ screen_container = terminal_screen_container_get_from_screen (screen); ++ if (screen_container == NULL) ++ return; ++ ++ mdi_container = terminal_window_get_mdi_container (window); ++ /* FIXME: add interface method to retrieve tab label */ ++ if (GTK_IS_NOTEBOOK (mdi_container)) ++ { ++ GtkWidget *tab_label; ++ ++ tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container)); ++ terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), TRUE); ++ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary); ++ } ++ } ++ else ++ { ++ gs_unref_object GNotification *notification = NULL; ++ TerminalApp *app; ++ gs_free char *detailed_action = NULL; ++ ++ notification = g_notification_new (summary); ++ g_notification_set_body (notification, body); ++ detailed_action = g_strdup_printf ("app.activate-tab::%s", priv->uuid); ++ g_notification_set_default_action (notification, detailed_action); ++ ++ app = terminal_app_get (); ++ g_application_send_notification (G_APPLICATION (app), priv->uuid, notification); ++ } ++} ++ ++static void + terminal_screen_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, +diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c +index cdd73d0653be..d6909a13ca65 100644 +--- a/src/terminal-tab-label.c ++++ b/src/terminal-tab-label.c +@@ -34,6 +34,7 @@ + struct _TerminalTabLabelPrivate + { + TerminalScreen *screen; ++ GtkWidget *icon; + GtkWidget *label; + GtkWidget *close_button; + gboolean bold; +@@ -179,7 +180,7 @@ terminal_tab_label_constructed (GObject *object) + { + TerminalTabLabel *tab_label = TERMINAL_TAB_LABEL (object); + TerminalTabLabelPrivate *priv = tab_label->priv; +- GtkWidget *hbox, *label, *close_button; ++ GtkWidget *hbox, *icon, *label, *close_button; + + G_OBJECT_CLASS (terminal_tab_label_parent_class)->constructed (object); + +@@ -189,6 +190,10 @@ terminal_tab_label_constructed (GObject *object) + + gtk_box_set_spacing (GTK_BOX (hbox), SPACING); + ++ priv->icon = icon = gtk_image_new (); ++ gtk_widget_set_no_show_all (icon, TRUE); ++ gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); ++ + priv->label = label = gtk_label_new (NULL); + gtk_widget_set_halign (label, GTK_ALIGN_CENTER); + gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); +@@ -377,6 +382,27 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label, + } + + /** ++ * terminal_tab_label_set_icon: ++ * @tab_label: a #TerminalTabLabel ++ * @icon_name: (allow-none): an icon name ++ * @tooltip: (allow-none): text to be used as tooltip ++ * ++ * Shows an icon at the beginning of @tab_label. If @icon_name is ++ * %NULL, then the icon will be hidden. ++ */ ++void ++terminal_tab_label_set_icon (TerminalTabLabel *tab_label, ++ const char *icon_name, ++ const char *tooltip) ++{ ++ TerminalTabLabelPrivate *priv = tab_label->priv; ++ ++ gtk_widget_set_visible (priv->icon, icon_name != NULL); ++ gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon), icon_name, GTK_ICON_SIZE_MENU); ++ gtk_widget_set_tooltip_text (GTK_WIDGET (priv->icon), tooltip); ++} ++ ++/** + * terminal_tab_label_get_screen: + * @tab_label: a #TerminalTabLabel + * +diff --git a/src/terminal-tab-label.h b/src/terminal-tab-label.h +index 20cfbceb36b0..a987025e0524 100644 +--- a/src/terminal-tab-label.h ++++ b/src/terminal-tab-label.h +@@ -59,6 +59,10 @@ GtkWidget * terminal_tab_label_new (TerminalScreen *screen); + void terminal_tab_label_set_bold (TerminalTabLabel *tab_label, + gboolean bold); + ++void terminal_tab_label_set_icon (TerminalTabLabel *tab_label, ++ const char *icon_name, ++ const char *tooltip); ++ + TerminalScreen *terminal_tab_label_get_screen (TerminalTabLabel *tab_label); + + G_END_DECLS +-- +2.5.0 + + +From 07508b34ae2635634310fb0ab3a49009e5bec56c Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Tue, 27 Jan 2015 19:04:19 +0100 +Subject: [PATCH 7/9] Make notifications based on org.gtk.Notification work + +The desktop file should be named after the application ID for this. + +https://bugzilla.gnome.org/show_bug.cgi?id=711059 +--- + Makefile.am | 4 ++-- + configure.ac | 2 +- + gnome-terminal.appdata.xml.in | 38 ---------------------------------- + gnome-terminal.desktop.in.in | 16 -------------- + org.gnome.Terminal.appdata.xml.in | 38 ++++++++++++++++++++++++++++++++++ + org.gnome.Terminal.desktop.in.in | 16 ++++++++++++++ + po/POTFILES.in | 4 ++-- + po/POTFILES.skip | 2 +- + src/gnome-terminal-search-provider.ini | 2 +- + 9 files changed, 61 insertions(+), 61 deletions(-) + delete mode 100644 gnome-terminal.appdata.xml.in + delete mode 100644 gnome-terminal.desktop.in.in + create mode 100644 org.gnome.Terminal.appdata.xml.in + create mode 100644 org.gnome.Terminal.desktop.in.in + +diff --git a/Makefile.am b/Makefile.am +index f6f41a6e2c73..3aa8677ed587 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,7 +14,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ + $(NULL) + + desktopdir = $(datadir)/applications +-desktop_in_files = @PACKAGE@.desktop.in.in ++desktop_in_files = org.gnome.Terminal.desktop.in.in + nodist_desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) + @INTLTOOL_DESKTOP_RULE@ + +@@ -25,7 +25,7 @@ desktop-file-validate: $(nodist_desktop_DATA) + done + + appdatadir = $(datadir)/appdata +-appdata_in_files = gnome-terminal.appdata.xml.in ++appdata_in_files = org.gnome.Terminal.appdata.xml.in + nodist_appdata_DATA = $(appdata_in_files:.xml.in=.xml) + @INTLTOOL_XML_RULE@ + +diff --git a/configure.ac b/configure.ac +index 35c799e70c54..3e63c04569e4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -353,7 +353,7 @@ AC_DEFINE_UNQUOTED([GDK_VERSION_MAX_ALLOWED],[GDK_VERSION_[]AS_TR_SH([$GTK_MAX_A + + AC_CONFIG_FILES([ + Makefile +-gnome-terminal.desktop.in ++org.gnome.Terminal.desktop.in + src/Makefile + src/terminal-version.h + help/Makefile +diff --git a/gnome-terminal.appdata.xml.in b/gnome-terminal.appdata.xml.in +deleted file mode 100644 +index 7ef61e967ae5..000000000000 +--- a/gnome-terminal.appdata.xml.in ++++ /dev/null +@@ -1,38 +0,0 @@ +- +- +- +- +- gnome-terminal.desktop +- GPL-3.0+ +- GPL-3.0+ +- <_name>Terminal +- <_summary>Use the command line +- +- <_p>GNOME Terminal is a terminal emulator application for accessing a UNIX shell environment which can be used to run programs available on your system. +- <_p>It supports several profiles, multiple tabs and implements several keyboard shortcuts. +- +- +- https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png +- +- https://wiki.gnome.org/Apps/Terminal +- GNOME +- https://wiki.gnome.org/Apps/Terminal/ReportingBugs +- +diff --git a/gnome-terminal.desktop.in.in b/gnome-terminal.desktop.in.in +deleted file mode 100644 +index 98ad8f9fe083..000000000000 +--- a/gnome-terminal.desktop.in.in ++++ /dev/null +@@ -1,16 +0,0 @@ +-[Desktop Entry] +-_Name=Terminal +-_Comment=Use the command line +-_Keywords=shell;prompt;command;commandline;cmd; +-TryExec=gnome-terminal +-Exec=gnome-terminal +-Icon=utilities-terminal +-Type=Application +-X-GNOME-DocPath=gnome-terminal/index.html +-X-GNOME-Bugzilla-Bugzilla=GNOME +-X-GNOME-Bugzilla-Product=gnome-terminal +-X-GNOME-Bugzilla-Component=BugBuddyBugs +-X-GNOME-Bugzilla-Version=@VERSION@ +-Categories=GNOME;GTK;System;TerminalEmulator; +-StartupNotify=true +-X-GNOME-SingleWindow=false +diff --git a/org.gnome.Terminal.appdata.xml.in b/org.gnome.Terminal.appdata.xml.in +new file mode 100644 +index 000000000000..ab4f23b8329a +--- /dev/null ++++ b/org.gnome.Terminal.appdata.xml.in +@@ -0,0 +1,38 @@ ++ ++ ++ ++ ++ org.gnome.Terminal.desktop ++ GPL-3.0+ ++ GPL-3.0+ ++ <_name>Terminal ++ <_summary>Use the command line ++ ++ <_p>GNOME Terminal is a terminal emulator application for accessing a UNIX shell environment which can be used to run programs available on your system. ++ <_p>It supports several profiles, multiple tabs and implements several keyboard shortcuts. ++ ++ ++ https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png ++ ++ https://wiki.gnome.org/Apps/Terminal ++ GNOME ++ https://wiki.gnome.org/Apps/Terminal/ReportingBugs ++ +diff --git a/org.gnome.Terminal.desktop.in.in b/org.gnome.Terminal.desktop.in.in +new file mode 100644 +index 000000000000..98ad8f9fe083 +--- /dev/null ++++ b/org.gnome.Terminal.desktop.in.in +@@ -0,0 +1,16 @@ ++[Desktop Entry] ++_Name=Terminal ++_Comment=Use the command line ++_Keywords=shell;prompt;command;commandline;cmd; ++TryExec=gnome-terminal ++Exec=gnome-terminal ++Icon=utilities-terminal ++Type=Application ++X-GNOME-DocPath=gnome-terminal/index.html ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=gnome-terminal ++X-GNOME-Bugzilla-Component=BugBuddyBugs ++X-GNOME-Bugzilla-Version=@VERSION@ ++Categories=GNOME;GTK;System;TerminalEmulator; ++StartupNotify=true ++X-GNOME-SingleWindow=false +diff --git a/po/POTFILES.in b/po/POTFILES.in +index dcbc5fe2c5aa..ae304cdfbbe1 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -1,8 +1,8 @@ + [encoding: UTF-8] + # List of source files containing translatable strings. + # Please keep this file sorted alphabetically. +-gnome-terminal.appdata.xml.in +-gnome-terminal.desktop.in.in ++org.gnome.Terminal.appdata.xml.in ++org.gnome.Terminal.desktop.in.in + [type: gettext/glade]src/find-dialog.ui + src/gterminal.vala + src/migration.c +diff --git a/po/POTFILES.skip b/po/POTFILES.skip +index 7c37b7fc2ca7..ef7c63561d4b 100644 +--- a/po/POTFILES.skip ++++ b/po/POTFILES.skip +@@ -1,4 +1,4 @@ + # List of source files that should *not* be translated. + # Please keep this file sorted alphabetically. +-gnome-terminal.desktop.in ++org.gnome.Terminal.desktop.in + src/gterminal.c +diff --git a/src/gnome-terminal-search-provider.ini b/src/gnome-terminal-search-provider.ini +index b6506f299f1d..1b9f81c10fcf 100644 +--- a/src/gnome-terminal-search-provider.ini ++++ b/src/gnome-terminal-search-provider.ini +@@ -14,7 +14,7 @@ + # along with this program. If not, see . + + [Shell Search Provider] +-DesktopId=gnome-terminal.desktop ++DesktopId=org.gnome.Terminal.desktop + BusName=org.gnome.Terminal + ObjectPath=/org/gnome/Terminal/SearchProvider + Version=2 +-- +2.5.0 + + +From 33fe553a2504e5ae2f8b4cc3e7a3eeb722b7ce93 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Thu, 29 Jan 2015 11:47:21 +0100 +Subject: [PATCH 8/9] Sprinkle debug messages for notifications + +This can be useful for finding out whether the escape sequence wasn't +emitted or the filtering was faulty. + +https://bugzilla.gnome.org/show_bug.cgi?id=711059 +--- + src/terminal-debug.c | 1 + + src/terminal-debug.h | 3 ++- + src/terminal-screen.c | 6 ++++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/terminal-debug.c b/src/terminal-debug.c +index 0ff321f1f0e2..dac79c38d82b 100644 +--- a/src/terminal-debug.c ++++ b/src/terminal-debug.c +@@ -38,6 +38,7 @@ _terminal_debug_init(void) + { "settings-list", TERMINAL_DEBUG_SETTINGS_LIST }, + { "appmenu", TERMINAL_DEBUG_APPMENU }, + { "search", TERMINAL_DEBUG_SEARCH }, ++ { "notifications", TERMINAL_DEBUG_NOTIFICATIONS }, + }; + + _terminal_debug_flags = g_parse_debug_string (g_getenv ("GNOME_TERMINAL_DEBUG"), +diff --git a/src/terminal-debug.h b/src/terminal-debug.h +index 5dc3ca4f3df0..7499ebe06c88 100644 +--- a/src/terminal-debug.h ++++ b/src/terminal-debug.h +@@ -34,7 +34,8 @@ typedef enum { + TERMINAL_DEBUG_PROFILE = 1 << 6, + TERMINAL_DEBUG_SETTINGS_LIST = 1 << 7, + TERMINAL_DEBUG_APPMENU = 1 << 8, +- TERMINAL_DEBUG_SEARCH = 1 << 9 ++ TERMINAL_DEBUG_SEARCH = 1 << 9, ++ TERMINAL_DEBUG_NOTIFICATIONS = 1 << 10 + } TerminalDebugFlags; + + void _terminal_debug_init(void); +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index 6a4dbd18bf9f..7f9276319e2b 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -1587,6 +1587,8 @@ terminal_screen_focus_in (GtkWidget *widget, + TerminalApp *app; + TerminalWindow *window; + ++ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notification withdrawn\n"); ++ + window = terminal_screen_get_window (screen); + if (window != NULL) + { +@@ -1725,6 +1727,8 @@ terminal_screen_notification_received (VteTerminal *terminal, + TerminalScreenPrivate *priv = screen->priv; + TerminalWindow *window; + ++ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notification received: [%s]: %s\n", summary, body); ++ + if (G_UNLIKELY (!priv->shell_prompt_shown)) + { + priv->shell_prompt_shown = TRUE; +@@ -1756,6 +1760,7 @@ terminal_screen_notification_received (VteTerminal *terminal, + tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container)); + terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), TRUE); + terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary); ++ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify tab\n"); + } + } + else +@@ -1771,6 +1776,7 @@ terminal_screen_notification_received (VteTerminal *terminal, + + app = terminal_app_get (); + g_application_send_notification (G_APPLICATION (app), priv->uuid, notification); ++ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify desktop\n"); + } + } + +-- +2.5.0 + + +From 3173ff8007f3cd52414c1d8e05f3aa592c2947d7 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Tue, 17 Feb 2015 17:06:17 +0100 +Subject: [PATCH 9/9] Restore translations for dark terminals and transparency + +--- + po/am.po | 4 ++-- + po/ar.po | 13 ++++++------- + po/as.po | 4 ++-- + po/ast.po | 4 ++-- + po/az.po | 4 ++-- + po/be.po | 3 +++ + po/be@latin.po | 4 ++-- + po/bg.po | 3 +++ + po/bn_IN.po | 3 +++ + po/bs.po | 4 ++++ + po/ca.po | 11 +++++++---- + po/ca@valencia.po | 3 +++ + po/cs.po | 3 +++ + po/cy.po | 4 ++-- + po/da.po | 12 ++++++------ + po/de.po | 12 ++++++------ + po/dz.po | 4 ++-- + po/el.po | 11 +++++++---- + po/en@shaw.po | 4 ++-- + po/en_CA.po | 4 ++-- + po/en_GB.po | 4 ++-- + po/es.po | 12 ++++++------ + po/et.po | 3 +++ + po/eu.po | 12 ++++++------ + po/fa.po | 3 +++ + po/fi.po | 11 +++++++---- + po/fr.po | 11 +++++++---- + po/fur.po | 4 ++++ + po/ga.po | 3 +++ + po/gd.po | 9 ++++----- + po/gl.po | 12 ++++++------ + po/gu.po | 4 ++-- + po/he.po | 12 ++++++------ + po/hi.po | 4 ++-- + po/hr.po | 4 ++-- + po/hu.po | 11 +++++++---- + po/hy.po | 4 ++-- + po/id.po | 3 +++ + po/it.po | 3 +++ + po/ja.po | 3 +++ + po/ka.po | 2 +- + po/kk.po | 11 +++++++---- + po/kn.po | 3 +++ + po/ko.po | 11 +++++++---- + po/ku.po | 4 ++-- + po/lt.po | 11 +++++++---- + po/lv.po | 3 +++ + po/mai.po | 4 ++-- + po/mg.po | 4 ++-- + po/mk.po | 4 ++-- + po/ml.po | 4 ++-- + po/mn.po | 4 ++-- + po/mr.po | 4 ++-- + po/ms.po | 4 ++-- + po/nb.po | 3 +++ + po/nds.po | 4 ++-- + po/ne.po | 4 ++-- + po/nl.po | 3 +++ + po/nn.po | 4 ++-- + po/oc.po | 12 ++++++------ + po/or.po | 4 ++-- + po/pa.po | 4 ++-- + po/pl.po | 3 +++ + po/ps.po | 4 ++-- + po/pt.po | 12 ++++++------ + po/pt_BR.po | 11 +++++++---- + po/ro.po | 4 ++-- + po/ru.po | 3 +++ + po/rw.po | 2 +- + po/si.po | 4 ++-- + po/sk.po | 11 +++++++---- + po/sl.po | 11 +++++++---- + po/sq.po | 4 ++-- + po/sr.po | 11 +++++++---- + po/sr@latin.po | 11 +++++++---- + po/sv.po | 3 +++ + po/ta.po | 4 ++-- + po/te.po | 4 ++-- + po/tg.po | 8 ++++---- + po/th.po | 12 ++++++------ + po/tr.po | 3 +++ + po/ug.po | 4 ++-- + po/uk.po | 12 ++++++------ + po/vi.po | 11 +++++++---- + po/wa.po | 4 ++-- + po/xh.po | 4 ++-- + po/zh_CN.po | 10 ++++++++-- + po/zh_HK.po | 3 +++ + po/zh_TW.po | 11 +++++++---- + 89 files changed, 329 insertions(+), 212 deletions(-) + +diff --git a/po/am.po b/po/am.po +index 27a7e9640668..04a8ad9f36a3 100644 +--- a/po/am.po ++++ b/po/am.po +@@ -613,8 +613,8 @@ msgid "_Text color:" + msgstr "የ_ጽሑፍ ቀለም፦" + + #: ../src/gnome-terminal.glade2.h:102 +-msgid "_Transparent background" +-msgstr "_የሚያሳይ መደብ" ++msgid "Transparent background" ++msgstr "የሚያሳይ መደብ" + + #: ../src/gnome-terminal.glade2.h:103 + msgid "_Update login records when command is launched" +diff --git a/po/ar.po b/po/ar.po +index 43e55363d72d..f6ead579e064 100644 +--- a/po/ar.po ++++ b/po/ar.po +@@ -2074,12 +2074,11 @@ msgstr "أغ_لق النافذة" + #~ msgid "Missing command" + #~ msgstr "خطأ أثناء تحليل الأمر: %s" + +-#, fuzzy +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "فيما إذا سيستعمل خط النظام ثابت العرض" ++msgid "Whether to use a dark theme variant" ++msgstr "فيما إذا سيستعمل خط النظام ثابت العرض" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "استخدم سمة _داكنة" ++msgid "Use _dark theme variant" ++msgstr "استخدم سمة _داكنة" + + #~ msgid "COMMAND" + #~ msgstr "الأمر" +@@ -2929,8 +2928,8 @@ msgstr "أغ_لق النافذة" + #~ msgid "Background image _scrolls" + #~ msgstr "صورة الخلفية ت_لتف" + +-#~ msgid "_Transparent background" +-#~ msgstr "خلفية _شفافة" ++msgid "Transparent background" ++msgstr "خلفية شفافة" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "_ظلل شفافية أو صورة الخلفية:" +diff --git a/po/as.po b/po/as.po +index 0bd699d5e021..63fca0132a93 100644 +--- a/po/as.po ++++ b/po/as.po +@@ -2979,8 +2979,8 @@ msgstr "উইন্ডো বন্ধ কৰক (_l)" + #~ msgid "Background image _scrolls" + #~ msgstr "পটভূমিৰ ছবি স্ক্ৰল কৰক (_s)" + +-#~ msgid "_Transparent background" +-#~ msgstr "স্বচ্চ পটভূমি (_T)" ++msgid "Transparent background" ++msgstr "স্বচ্চ পটভূমি " + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "স্বচ্ছ বা ছবিৰ সৈতে পটভূমি ছায়া আচ্ছন্ন কৰক (_h):" +diff --git a/po/ast.po b/po/ast.po +index d1c6e7b8174a..4210820a1429 100644 +--- a/po/ast.po ++++ b/po/ast.po +@@ -1598,8 +1598,8 @@ msgid "_Text color:" + msgstr "Color del _testu:" + + #: ../src/profile-preferences.glade.h:77 +-msgid "_Transparent background" +-msgstr "Fondu _tresparente" ++msgid "Transparent background" ++msgstr "Fondu tresparente" + + #: ../src/profile-preferences.glade.h:78 + msgid "_Underline color:" +diff --git a/po/az.po b/po/az.po +index b0f2e3eac8b8..877f114954e0 100644 +--- a/po/az.po ++++ b/po/az.po +@@ -619,8 +619,8 @@ msgid "_Text color:" + msgstr "_Mətn rəngi:" + + #: ../src/gnome-terminal.glade2.h:102 +-msgid "_Transparent background" +-msgstr "_Şəffaf arxa plan" ++msgid "Transparent background" ++msgstr "Şəffaf arxa plan" + + #: ../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 fca0ae4617d4..74ff3291321a 100644 +--- a/po/be.po ++++ b/po/be.po +@@ -2015,3 +2015,6 @@ msgstr "" + msgid "C_lose Window" + msgstr "_Закрыць акно" + ++msgid "Transparent background" ++msgstr "Празрысты фон" ++ +diff --git a/po/be@latin.po b/po/be@latin.po +index 1e057c74b152..1d22a58915af 100644 +--- a/po/be@latin.po ++++ b/po/be@latin.po +@@ -1425,8 +1425,8 @@ msgid "_Text color:" + msgstr "Koler _tekstu:" + + #: ../src/profile-preferences.glade.h:73 +-msgid "_Transparent background" +-msgstr "_Prazrysty fon" ++msgid "Transparent background" ++msgstr "Prazrysty fon" + + #: ../src/profile-preferences.glade.h:74 + msgid "_Update login records when command is launched" +diff --git a/po/bg.po b/po/bg.po +index 7e9c9be32700..241ef52bf50f 100644 +--- a/po/bg.po ++++ b/po/bg.po +@@ -2100,3 +2100,6 @@ msgstr "" + #: ../src/terminal-window.c:3652 + msgid "C_lose Window" + msgstr "_Затваряне на този прозорец" ++ ++msgid "Transparent background" ++msgstr "Прозрачен фон" +diff --git a/po/bn_IN.po b/po/bn_IN.po +index c74246a5a26d..d65b322ba88c 100644 +--- a/po/bn_IN.po ++++ b/po/bn_IN.po +@@ -2358,3 +2358,6 @@ msgstr "উইন্ডো বন্ধ করুন (_l)" + + #~ msgid "_Title:" + #~ msgstr "শিরোনাম: (_T)" ++ ++msgid "Transparent background" ++msgstr "স্বচ্চ পটভূমি " +diff --git a/po/bs.po b/po/bs.po +index 49e710859ac9..fccfa86de311 100644 +--- a/po/bs.po ++++ b/po/bs.po +@@ -680,6 +680,10 @@ msgstr "Kratica tastature za povećavanje fonta" + msgid "Keyboard shortcut to make font smaller" + msgstr "Kratica tastature za smanjivanje fonta" + ++#: ../src/gnome-terminal.glade2.h:102 ++msgid "Transparent background" ++msgstr "Providna pozadina" ++ + #: ../src/org.gnome.Terminal.gschema.xml.h:78 + msgid "Keyboard shortcut to make font normal-size" + msgstr "Kratica tastature za postavljanje fonta na normalnu veličinu" +diff --git a/po/ca.po b/po/ca.po +index 567b3445927f..68ec312dcb5c 100644 +--- a/po/ca.po ++++ b/po/ca.po +@@ -2106,8 +2106,11 @@ msgstr "Tanca la _finestra" + #~ msgid "Missing command" + #~ msgstr "Manca l'ordre" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Si s'ha d'utilitzar la variant de tema fosc" ++msgid "Whether to use a dark theme variant" ++msgstr "Si s'ha d'utilitzar la variant de tema fosc" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Utilitza la variant de tema _fosc" ++msgid "Use _dark theme variant" ++msgstr "Utilitza la variant de tema _fosc" ++ ++msgid "Transparent background" ++msgstr "Fons transparent" +diff --git a/po/ca@valencia.po b/po/ca@valencia.po +index 1c279a0bf09c..4073f719906a 100644 +--- a/po/ca@valencia.po ++++ b/po/ca@valencia.po +@@ -2092,3 +2092,6 @@ msgstr "" + #: ../src/terminal-window.c:3645 + msgid "C_lose Window" + msgstr "Tanca la _finestra" ++ ++msgid "Transparent background" ++msgstr "Fons transparent" +diff --git a/po/cs.po b/po/cs.po +index 8737182b80bf..542f8135590e 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -2056,3 +2056,6 @@ msgstr "" + #: ../src/terminal-window.c:3694 + msgid "C_lose Window" + msgstr "_Zavřít okno" ++ ++msgid "Transparent background" ++msgstr "Průsvitné pozadí" +diff --git a/po/cy.po b/po/cy.po +index 0739e201f83b..8b1ff006857a 100644 +--- a/po/cy.po ++++ b/po/cy.po +@@ -1447,8 +1447,8 @@ msgid "_Text color:" + msgstr "Lliw'r _testun:" + + #: ../src/profile-preferences.glade.h:73 +-msgid "_Transparent background" +-msgstr "Cefndir _tryloyw" ++msgid "Transparent background" ++msgstr "Cefndir tryloyw" + + #: ../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 f420e1cdbbff..217b176092a9 100644 +--- a/po/da.po ++++ b/po/da.po +@@ -2094,11 +2094,11 @@ msgstr "_Luk vindue" + #~ msgid "Missing command" + #~ msgstr "Manglende kommando" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Om der skal bruges en mørk temavariant" ++msgid "Whether to use a dark theme variant" ++msgstr "Om der skal bruges en mørk temavariant" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Brug _mørk temavariant" ++msgid "Use _dark theme variant" ++msgstr "Brug _mørk temavariant" + + #~ msgid "COMMAND" + #~ msgstr "KOMMANDO" +@@ -2999,8 +2999,8 @@ msgstr "_Luk vindue" + #~ msgid "_Solid color" + #~ msgstr "_Ensfarvet" + +-#~ msgid "_Transparent background" +-#~ msgstr "_Gennemsigtig baggrund" ++msgid "Transparent background" ++msgstr "Gennemsigtig baggrund" + + #~ msgid "" + #~ "You already have a profile called “%s”. Do you want to create another " +diff --git a/po/de.po b/po/de.po +index 7fbad63bb009..9d376b53eec9 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -2134,11 +2134,11 @@ msgstr "Fenster _schließen" + #~ msgid "Missing command" + #~ msgstr "Fehlender Befehl" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Legt fest, ob eine dunkle Themenvariante verwendet wird" ++msgid "Whether to use a dark theme variant" ++msgstr "Legt fest, ob eine dunkle Themenvariante verwendet wird" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Die _dunkle Themenvariante verwenden" ++msgid "Use _dark theme variant" ++msgstr "Die _dunkle Themenvariante verwenden" + + #~ msgid "Set the terminal title" + #~ msgstr "Den Titel des Terminals festlegen" +@@ -3066,8 +3066,8 @@ msgstr "Fenster _schließen" + #~ msgid "Background image _scrolls" + #~ msgstr "Hintergrundbild _folgt Bildlauf" + +-#~ msgid "_Transparent background" +-#~ msgstr "_Transparenter Hintergrund" ++msgid "Transparent background" ++msgstr "Transparenter Hintergrund" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "Transparenz und Bildhintergründe _abdunkeln:" +diff --git a/po/dz.po b/po/dz.po +index ecb8fd59329c..290934ad3e0f 100644 +--- a/po/dz.po ++++ b/po/dz.po +@@ -1551,8 +1551,8 @@ msgid "_Text color:" + msgstr "ཚིག་ཡིག་ཚོས་གཞི་:(_T)" + + #: ../src/profile-preferences.glade.h:77 +-msgid "_Transparent background" +-msgstr "དྭངས་གསལ་རྒྱབ་གཞི།(_T)" ++msgid "Transparent background" ++msgstr "དྭངས་གསལ་རྒྱབ་གཞི།" + + #: ../src/profile-preferences.glade.h:78 + #, fuzzy +diff --git a/po/el.po b/po/el.po +index 587527cb7a99..b0dbdd2a60a7 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -2128,11 +2128,11 @@ msgstr "Κ_λείσιμο παραθύρου" + #~ msgid "Missing command" + #~ msgstr "Λείπει εντολή" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Εάν θα χρησιμοποιεί παραλλαγή σκοτεινού θέματος" ++msgid "Whether to use a dark theme variant" ++msgstr "Εάν θα χρησιμοποιεί παραλλαγή σκοτεινού θέματος" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Χρήση παραλλαγής _σκοτεινού θέματος" ++msgid "Use _dark theme variant" ++msgstr "Χρήση παραλλαγής _σκοτεινού θέματος" + + #~ msgid "_Use the system fixed width font" + #~ msgstr "_Χρήση της γραμματοσειράς σταθερού πλάτους του συστήματος" +@@ -2296,3 +2296,6 @@ msgstr "Κ_λείσιμο παραθύρου" + + #~ msgid "_Input Methods" + #~ msgstr "_Μέθοδοι εισαγωγής" ++ ++msgid "Transparent background" ++msgstr "Διάφανο παρασκήνιο" +diff --git a/po/en@shaw.po b/po/en@shaw.po +index 65f3d415e476..05dc99df5980 100644 +--- a/po/en@shaw.po ++++ b/po/en@shaw.po +@@ -1467,8 +1467,8 @@ msgid "_Text color:" + msgstr "_𐑑𐑧𐑒𐑕𐑑 𐑒𐑳𐑤𐑼:" + + #: ../src/profile-preferences.glade.h:78 +-msgid "_Transparent background" +-msgstr "_𐑑𐑮𐑨𐑯𐑕𐑐𐑸𐑩𐑯𐑑 𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛" ++msgid "Transparent background" ++msgstr "𐑑𐑮𐑨𐑯𐑕𐑐𐑸𐑩𐑯𐑑 𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛" + + #: ../src/profile-preferences.glade.h:79 + msgid "_Underline color:" +diff --git a/po/en_CA.po b/po/en_CA.po +index c79cbf5aa245..b8b14d2030e1 100644 +--- a/po/en_CA.po ++++ b/po/en_CA.po +@@ -556,8 +556,8 @@ msgid "_Text color:" + msgstr "_Text colour:" + + #: ../src/gnome-terminal.glade2.h:86 +-msgid "_Transparent background" +-msgstr "_Transparent background" ++msgid "Transparent background" ++msgstr "Transparent background" + + #: ../src/gnome-terminal.glade2.h:87 + msgid "_Update login records when command is launched" +diff --git a/po/en_GB.po b/po/en_GB.po +index 4d38486679fe..69e71135d75c 100644 +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -2732,8 +2732,8 @@ msgstr "_Title:" + #~ msgid "Background image _scrolls" + #~ msgstr "Background image _scrolls" + +-#~ msgid "_Transparent background" +-#~ msgstr "_Transparent background" ++msgid "Transparent background" ++msgstr "Transparent background" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "S_hade transparent or image background:" +diff --git a/po/es.po b/po/es.po +index 39b3d7e5f1cb..b7c0cab8dae8 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -2120,11 +2120,11 @@ msgstr "_Cerrar ventana" + #~ msgid "Missing command" + #~ msgstr "Falta el comando" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Indica si se debe usar la variante oscura del tema" ++msgid "Whether to use a dark theme variant" ++msgstr "Indica si se debe usar la variante oscura del tema" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Usar la variante _oscura del tema" ++msgid "Use _dark theme variant" ++msgstr "Usar la variante _oscura del tema" + + #~ msgid "Set the terminal title" + #~ msgstr "Establece el título de la terminal" +@@ -3103,8 +3103,8 @@ msgstr "_Cerrar ventana" + #~ msgid "_Solid color" + #~ msgstr "Color _sólido" + +-#~ msgid "_Transparent background" +-#~ msgstr "Fondo _transparente" ++msgid "Transparent background" ++msgstr "Fondo transparente" + + #~ msgid "No such profile \"%s\", using default profile\n" + #~ msgstr "No existe el perfil «%s», usando el perfil predeterminado\n" +diff --git a/po/et.po b/po/et.po +index 4b1c2a7c67e4..770761168806 100644 +--- a/po/et.po ++++ b/po/et.po +@@ -1747,3 +1747,6 @@ msgstr "Su_lge aken" + + #~ msgid "Choose base profile" + #~ msgstr "Vali põhiprofiil" ++ ++msgid "Transparent background" ++msgstr "Läbipaistev taust" +diff --git a/po/eu.po b/po/eu.po +index 0080c74bb8de..a68e24b92337 100644 +--- a/po/eu.po ++++ b/po/eu.po +@@ -2075,11 +2075,11 @@ msgstr "It_xi leihoa" + #~ msgid "Missing command" + #~ msgstr "Komandoa falta da" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Gai ilunaren aldaera erabili edo ez" ++msgid "Whether to use a dark theme variant" ++msgstr "Gai ilunaren aldaera erabili edo ez" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Erabili gai _ilunaren aldaera" ++msgid "Use _dark theme variant" ++msgstr "Erabili gai _ilunaren aldaera" + + #~ msgid "COMMAND" + #~ msgstr "KOMANDOA" +@@ -2976,8 +2976,8 @@ msgstr "It_xi leihoa" + #~ msgid "_Solid color" + #~ msgstr "_Kolore solidoa" + +-#~ msgid "_Transparent background" +-#~ msgstr "_Atzeko plano gardena" ++msgid "Transparent background" ++msgstr "Atzeko plano gardena" + + #~ msgid "" + #~ "You already have a profile called “%s”. Do you want to create another " +diff --git a/po/fa.po b/po/fa.po +index 52856cbdd6a4..2a89999af2bf 100644 +--- a/po/fa.po ++++ b/po/fa.po +@@ -2240,3 +2240,6 @@ msgstr "_بستن پنجره" + + #~ msgid "_Title:" + #~ msgstr "_عنوان:" ++ ++msgid "Transparent background" ++msgstr "پس‌زمینه‌ی شفاف" +diff --git a/po/fi.po b/po/fi.po +index f80a962e458a..ba11a5795b1c 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -2069,6 +2069,9 @@ msgstr "" + msgid "C_lose Window" + msgstr "_Sulje ikkuna" + ++msgid "Transparent background" ++msgstr "Läpinäkyvä tausta" ++ + #~ msgid "Set the terminal title" + #~ msgstr "Aseta päätteen otsikko" + +@@ -2079,8 +2082,8 @@ msgstr "_Sulje ikkuna" + #~ msgid "Missing command" + #~ msgstr "Puuttuva komento" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Käytetäänkö teeman tummaan muunnelmaa" ++msgid "Whether to use a dark theme variant" ++msgstr "Käytetäänkö teeman tummaan muunnelmaa" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Käytä _teeman tummaa muunnelmaa" ++msgid "Use _dark theme variant" ++msgstr "Käytä _teeman tummaa muunnelmaa" +\ No newline at end of file +diff --git a/po/fr.po b/po/fr.po +index 15c8ecc86124..506f0fcb5c49 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -2136,8 +2136,11 @@ msgstr "Fermer _la fenêtre" + #~ msgid "Missing command" + #~ msgstr "Commande manquante" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Indique s'il faut utiliser une variante de thème foncée" ++msgid "Whether to use a dark theme variant" ++msgstr "Indique s'il faut utiliser une variante de thème foncée" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Utiliser une variante de thème _foncée" ++msgid "Use _dark theme variant" ++msgstr "Utiliser une variante de thème _foncée" ++ ++msgid "Transparent background" ++msgstr "Arrière-plan transparent" +diff --git a/po/fur.po b/po/fur.po +index 300ed8fbce71..4b5bfbc150f0 100644 +--- a/po/fur.po ++++ b/po/fur.po +@@ -562,6 +562,10 @@ msgstr "" + "Indiche se tornâ a adatâ in automatic i contignûts dal terminâl al modificâ " + "de dimension dal barcon" + ++#: ../src/gnome-terminal.glade2.h:86 ++msgid "Transparent background" ++msgstr "Fondâl trasparent" ++ + #: ../src/org.gnome.Terminal.gschema.xml.h:50 + msgid "Which encoding to use" + msgstr "Codifiche di doprâ" +diff --git a/po/ga.po b/po/ga.po +index 93d5fa9d1481..feb87dce3d6b 100644 +--- a/po/ga.po ++++ b/po/ga.po +@@ -1925,3 +1925,6 @@ msgstr "_Dún Fuinneog" + #: ../src/terminal-window.c:3582 + msgid "C_lose Terminal" + msgstr "_Dún Teirminéal" ++ ++msgid "Transparent background" ++msgstr "Cúlra trédhearcach" +diff --git a/po/gd.po b/po/gd.po +index 04a76e1de96a..4af1d80ececc 100644 +--- a/po/gd.po ++++ b/po/gd.po +@@ -2071,9 +2071,8 @@ msgstr "_Dùin an uinneag" + #~ msgid "Missing command" + #~ msgstr "Tha àithne a dhìth" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "" +-#~ "Co-dhiù an tèid tionndadh dorcha dhen ùrlar a chleachdadh gus nach tèid" ++msgid "Whether to use a dark theme variant" ++msgstr "Co-dhiù an tèid tionndadh dorcha dhen ùrlar a chleachdadh gus nach tèid" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Cleachd tionndadh _dorcha dhen ùrlar" ++msgid "Use _dark theme variant" ++msgstr "Cleachd tionndadh _dorcha dhen ùrlar" +diff --git a/po/gl.po b/po/gl.po +index ad9af1ba5ddc..bdbfa91fcf13 100644 +--- a/po/gl.po ++++ b/po/gl.po +@@ -2106,11 +2106,11 @@ msgstr "P_echar a xanela" + #~ msgid "Missing command" + #~ msgstr "Falta a orde" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Indica se se usa a variante de tema escura" ++msgid "Whether to use a dark theme variant" ++msgstr "Indica se se usa a variante de tema escura" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Usar variante do tema _escuro" ++msgid "Use _dark theme variant" ++msgstr "Usar variante do tema _escuro" + + #~ msgid "_Use the system fixed width font" + #~ msgstr "_Usar o tipo de letra de largura fixa do sistema" +@@ -3060,8 +3060,8 @@ msgstr "P_echar a xanela" + #~ msgid "Background image _scrolls" + #~ msgstr "A imaxe de fondo _desprázase" + +-#~ msgid "_Transparent background" +-#~ msgstr "Fondo _transparente" ++msgid "Transparent background" ++msgstr "Fondo transparente" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "_Sombra transparente ou imaxe de fondo:" +diff --git a/po/gu.po b/po/gu.po +index 0bcb1954f634..f72a807d6e2b 100644 +--- a/po/gu.po ++++ b/po/gu.po +@@ -2944,8 +2944,8 @@ msgstr "વિન્ડો બંધ કરો (_l)" + #~ msgid "_Solid color" + #~ msgstr "ઘટ્ટ રંગ (_S)" + +-#~ msgid "_Transparent background" +-#~ msgstr "પારદર્શક પાશ્વ ભાગનો ભાગ (_T)" ++msgid "Transparent background" ++msgstr "પારદર્શક પાશ્વ ભાગનો ભાગ" + + #~ msgid "No such profile \"%s\", using default profile\n" + #~ msgstr "\"%s\" જેવી કોઈ રૂપરેખા નથી, મૂળભૂત રૂપરેખા વાપરી રહ્યા છે\n" +diff --git a/po/he.po b/po/he.po +index f3b83b93f20f..68008ceda2d5 100644 +--- a/po/he.po ++++ b/po/he.po +@@ -2054,11 +2054,11 @@ msgstr "סגירת ה_חלון" + #~ msgid "Missing command" + #~ msgstr "Missing command" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Whether to use a dark theme variant" ++msgid "Whether to use a dark theme variant" ++msgstr "Whether to use a dark theme variant" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "שימוש בערכת עיצוב בהגוון _כהה" ++msgid "Use _dark theme variant" ++msgstr "שימוש בערכת עיצוב בהגוון _כהה" + + #~ msgid "Set the terminal title" + #~ msgstr "Set the terminal title" +@@ -3013,8 +3013,8 @@ msgstr "סגירת ה_חלון" + #~ msgid "_Solid color" + #~ msgstr "צבע _אחיד" + +-#~ msgid "_Transparent background" +-#~ msgstr "רקע _שקוף" ++msgid "Transparent background" ++msgstr "רקע שקוף" + + #~ msgid "No such profile \"%s\", using default profile\n" + #~ msgstr "No such profile \"%s\", using default profile\n" +diff --git a/po/hi.po b/po/hi.po +index 2d7dc5b14008..adf8d35e8d3f 100644 +--- a/po/hi.po ++++ b/po/hi.po +@@ -2979,8 +2979,8 @@ msgstr "विंडो बंद करें (_l)" + #~ msgid "_Background image" + #~ msgstr "पृष्ठभूमि छवि (_B)" + +-#~ msgid "_Transparent background" +-#~ msgstr "पारदर्शी पृष्ठभूमि (_T)" ++msgid "Transparent background" ++msgstr "पारदर्शी पृष्ठभूमि" + + #~ msgid "S/Key Challenge Response" + #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया" +diff --git a/po/hr.po b/po/hr.po +index cb48c52f708c..747cf488e7b4 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -1362,8 +1362,8 @@ msgid "_Text color:" + msgstr "_Boja teksta:" + + #: ../src/profile-preferences.glade.h:69 +-msgid "_Transparent background" +-msgstr "_Prozirna pozadina" ++msgid "Transparent background" ++msgstr "Prozirna pozadina" + + #: ../src/profile-preferences.glade.h:70 + msgid "_Update login records when command is launched" +diff --git a/po/hu.po b/po/hu.po +index 62f6b48de0b5..16fd9439489b 100644 +--- a/po/hu.po ++++ b/po/hu.po +@@ -2090,11 +2090,11 @@ msgstr "_Ablak bezárása" + #~ msgid "Missing command" + #~ msgstr "Hiányzó parancs" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Használja-e a sötét témaváltozatot" ++msgid "Whether to use a dark theme variant" ++msgstr "Használja-e a sötét témaváltozatot" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "_Sötét témaváltozat használata" ++msgid "Use _dark theme variant" ++msgstr "_Sötét témaváltozat használata" + + #~ msgid "Set the terminal title" + #~ msgstr "A terminál címének beállítása" +@@ -2513,3 +2513,6 @@ msgstr "_Ablak bezárása" + + #~ msgid "Background type" + #~ msgstr "Háttér típusa" ++ ++msgid "Transparent background" ++msgstr "Áttetsző háttér" +diff --git a/po/hy.po b/po/hy.po +index 558490157ada..caadbba37c5d 100644 +--- a/po/hy.po ++++ b/po/hy.po +@@ -1011,8 +1011,8 @@ msgid "_Text color:" + msgstr "_Տեքստի գույնը՝" + + #: ../src/profile-preferences.glade.h:73 +-msgid "_Transparent background" +-msgstr "_Թափանցիկ նախադրյալ" ++msgid "Transparent background" ++msgstr "Թափանցիկ նախադրյալ" + + #: ../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 595a325a574d..99c29b6d855b 100644 +--- a/po/id.po ++++ b/po/id.po +@@ -2058,3 +2058,6 @@ msgstr "" + #: ../src/terminal-window.c:3694 + msgid "C_lose Window" + msgstr "Tutup Jende_la" ++ ++msgid "Transparent background" ++msgstr "Latar belakang transparan" +diff --git a/po/it.po b/po/it.po +index 491303dfe349..af13ad9ca310 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -2105,3 +2105,6 @@ msgstr "Chiudi _finestra" + + #~ msgid "_Update login records when command is launched" + #~ msgstr "_Aggiornare i record di login quando il comando viene eseguito" ++ ++msgid "Transparent background" ++msgstr "Sfondo trasparente" +diff --git a/po/ja.po b/po/ja.po +index f7235d9f4a0b..63d7fd7bb943 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -1907,3 +1907,6 @@ msgstr "ウィンドウを閉じる(_L)" + + #~ msgid "_Update login records when command is launched" + #~ msgstr "コマンドを実行した時にログイン記録を更新する(_U)" ++ ++msgid "Transparent background" ++msgstr "透過な画像にする" +diff --git a/po/ka.po b/po/ka.po +index 8415e88f94ff..3717b7e75dcd 100644 +--- a/po/ka.po ++++ b/po/ka.po +@@ -568,7 +568,7 @@ msgstr "_ტექსტის ფერი:" + + #: ../src/gnome-terminal.glade2.h:86 + #, fuzzy +-msgid "_Transparent background" ++msgid "Transparent background" + msgstr "გამჭირვალე" + + #: ../src/gnome-terminal.glade2.h:87 +diff --git a/po/kk.po b/po/kk.po +index ed86f1b70460..639411cfce86 100644 +--- a/po/kk.po ++++ b/po/kk.po +@@ -2024,14 +2024,17 @@ msgstr "Терезені жа_бу" + #~ msgid "Missing command" + #~ msgstr "Команда жоқ болып тұр" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Қараңғылау тема нұсқасын қолдану керек пе" ++msgid "Whether to use a dark theme variant" ++msgstr "Қараңғылау тема нұсқасын қолдану керек пе" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Теманың қ_араңғы нұсқасын қолдану" ++msgid "Use _dark theme variant" ++msgstr "Теманың қ_араңғы нұсқасын қолдану" + + #~ msgid "COMMAND" + #~ msgstr "КОМАНДА" + + #~ msgid "Be quiet" + #~ msgstr "Тыныш болу" ++ ++msgid "Transparent background" ++msgstr "Мөлдір фон" +diff --git a/po/kn.po b/po/kn.po +index c887f88a2c87..e899ef3ca8c1 100644 +--- a/po/kn.po ++++ b/po/kn.po +@@ -2344,3 +2344,6 @@ msgstr "ಕಿಟಕಿಯನ್ನು ಮುಚ್ಚು (_l)" + + #~ msgid "_Title:" + #~ msgstr "ಶೀರ್ಷಿಕೆ(_T):" ++ ++msgid "Transparent background" ++msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ" +diff --git a/po/ko.po b/po/ko.po +index 57c120389ac9..a41296a7fb0a 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -2079,8 +2079,11 @@ msgstr "창 닫기(_L)" + #~ msgid "Missing command" + #~ msgstr "명령어 없음" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "어두운 테마를 사용할 지 여부" ++msgid "Whether to use a dark theme variant" ++msgstr "어두운 테마를 사용할 지 여부" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "어두운 테마 사용(_D)" ++msgid "Use _dark theme variant" ++msgstr "어두운 테마 사용(_D)" ++ ++msgid "Transparent background" ++msgstr "투명한 배경" +diff --git a/po/ku.po b/po/ku.po +index 221825b29cd9..96e35811337b 100644 +--- a/po/ku.po ++++ b/po/ku.po +@@ -557,8 +557,8 @@ msgid "_Text color:" + msgstr "Rengê _nivîsê:" + + #: ../src/gnome-terminal.glade2.h:86 +-msgid "_Transparent background" +-msgstr "Rûerdê _transparan" ++msgid "Transparent background" ++msgstr "Rûerdê transparan" + + #: ../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 8c9c9e660d28..71411ab7cf5b 100644 +--- a/po/lt.po ++++ b/po/lt.po +@@ -2085,8 +2085,11 @@ msgstr "_Užverti langą" + #~ msgid "Missing command" + #~ msgstr "Trūksta komandos" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Ar naudoti tamsų temos variantą" ++msgid "Whether to use a dark theme variant" ++msgstr "Ar naudoti tamsų temos variantą" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Nau_doti tamsų temos variantą" ++msgid "Use _dark theme variant" ++msgstr "Nau_doti tamsų temos variantą" ++ ++msgid "Transparent background" ++msgstr "Permatomas fonas" +diff --git a/po/lv.po b/po/lv.po +index 1be896a19eb2..b3ab76e782dd 100644 +--- a/po/lv.po ++++ b/po/lv.po +@@ -2049,3 +2049,6 @@ msgstr "" + #: ../src/terminal-window.c:3694 + msgid "C_lose Window" + msgstr "Aizvērt _logu" ++ ++msgid "Transparent background" ++msgstr "Caurspīdīgs fons" +diff --git a/po/mai.po b/po/mai.po +index 9b984a068fda..a3c0e178ae67 100644 +--- a/po/mai.po ++++ b/po/mai.po +@@ -1290,8 +1290,8 @@ msgid "_Text color:" + msgstr "पाठ रँग (_T):" + + #: ../src/profile-preferences.glade.h:69 +-msgid "_Transparent background" +-msgstr "पारदर्शी पृष्ठभूमि (_T)" ++msgid "Transparent background" ++msgstr "पारदर्शी पृष्ठभूमि" + + #: ../src/profile-preferences.glade.h:70 + msgid "_Update login records when command is launched" +diff --git a/po/mg.po b/po/mg.po +index 1c1895c98ba9..a805417893ed 100644 +--- a/po/mg.po ++++ b/po/mg.po +@@ -566,8 +566,8 @@ msgid "_Text color:" + msgstr "Lokon'ny _soratra:" + + #: ../src/gnome-terminal.glade2.h:86 +-msgid "_Transparent background" +-msgstr "_Afara tatera-pahazavana" ++msgid "Transparent background" ++msgstr "Afara tatera-pahazavana" + + #: ../src/gnome-terminal.glade2.h:87 + msgid "_Update login records when command is launched" +diff --git a/po/mk.po b/po/mk.po +index e31378a5726b..d2b74d4438d1 100644 +--- a/po/mk.po ++++ b/po/mk.po +@@ -1166,8 +1166,8 @@ msgid "_Text color:" + msgstr "_Боја на текстот:" + + #: ../src/profile-preferences.glade.h:77 +-msgid "_Transparent background" +-msgstr "_Транспарентна позадина" ++msgid "Transparent background" ++msgstr "Транспарентна позадина" + + #: ../src/profile-preferences.glade.h:78 + #| msgid "_Text color:" +diff --git a/po/ml.po b/po/ml.po +index cc1928dcda63..62abd2131499 100644 +--- a/po/ml.po ++++ b/po/ml.po +@@ -2751,8 +2751,8 @@ msgstr "ടെര്‍മിനല്‍ അ_ടയ്ക്കുക" + #~ msgid "_Solid color" + #~ msgstr "_സോളിഡ് നിറം" + +-#~ msgid "_Transparent background" +-#~ msgstr "_പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം" ++msgid "Transparent background" ++msgstr "പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം" + + #~ msgid "S/Key Challenge Response" + #~ msgstr "S/Key ചാലഞ്ച് മറുപടി" +diff --git a/po/mn.po b/po/mn.po +index 4922041e09f9..9696b7f981f1 100644 +--- a/po/mn.po ++++ b/po/mn.po +@@ -617,8 +617,8 @@ msgid "_Text color:" + msgstr "_Текстийн өнгө:" + + #: ../src/gnome-terminal.glade2.h:102 +-msgid "_Transparent background" +-msgstr "_Тунгалаг дэвсгэр" ++msgid "Transparent background" ++msgstr "Тунгалаг дэвсгэр" + + #: ../src/gnome-terminal.glade2.h:103 + msgid "_Update login records when command is launched" +diff --git a/po/mr.po b/po/mr.po +index 61997dafbd03..50451d7b8e60 100644 +--- a/po/mr.po ++++ b/po/mr.po +@@ -3015,8 +3015,8 @@ msgstr "चौकट बंद करा (_l)" + #~ msgid "_Solid color" + #~ msgstr "गडद रंग (_S)" + +-#~ msgid "_Transparent background" +-#~ msgstr "पारदर्शी पार्श्वभूमी(_T)" ++msgid "Transparent background" ++msgstr "पारदर्शी पार्श्वभूमी" + + #~ msgid "Disabled" + #~ msgstr "अकार्यान्वीतित" +diff --git a/po/ms.po b/po/ms.po +index 5b663aae2639..38a2afeecd2f 100644 +--- a/po/ms.po ++++ b/po/ms.po +@@ -630,8 +630,8 @@ msgid "_Text color:" + msgstr "Warna _Teks:" + + #: ../src/gnome-terminal.glade2.h:102 +-msgid "_Transparent background" +-msgstr "LatarBelakang _Telus" ++msgid "Transparent background" ++msgstr "LatarBelakang Telus" + + #: ../src/gnome-terminal.glade2.h:103 + msgid "_Update login records when command is launched" +diff --git a/po/nb.po b/po/nb.po +index eda809fab581..7ceaf06ca263 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -2046,3 +2046,6 @@ msgstr "" + #: ../src/terminal-window.c:3694 + msgid "C_lose Window" + msgstr "_Lukk vindu" ++ ++msgid "Transparent background" ++msgstr "Gjennomsiktig bakgrunn" +diff --git a/po/nds.po b/po/nds.po +index 98a12875e382..94fd757d3e5c 100644 +--- a/po/nds.po ++++ b/po/nds.po +@@ -995,8 +995,8 @@ msgid "_Text color:" + msgstr "_Textklöör:" + + #: ../src/profile-preferences.glade.h:73 +-msgid "_Transparent background" +-msgstr "_Döörschienenachtergrund:" ++msgid "Transparent background" ++msgstr "Döörschienenachtergrund:" + + #: ../src/profile-preferences.glade.h:74 + msgid "_Update login records when command is launched" +diff --git a/po/ne.po b/po/ne.po +index 4fe16cc88a9a..d9a90adbf693 100644 +--- a/po/ne.po ++++ b/po/ne.po +@@ -2398,8 +2398,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्" + #~ msgid "_None (use solid color)" + #~ msgstr "कुनै पनि होइन (एउटै रङ प्रयोग गर्नुहोस्)" + +-#~ msgid "_Transparent background" +-#~ msgstr "पारदर्शी पृष्ठभूमि" ++msgid "Transparent background" ++msgstr "पारदर्शी पृष्ठभूमि" + + #~ msgid "_Use the system fixed width font" + #~ msgstr "प्रणाली निश्चित गरिएको फन्ट चौडाइ प्रयोग गर्नुहोस्" +diff --git a/po/nl.po b/po/nl.po +index a51720be1610..111b032c89fa 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -2352,3 +2352,6 @@ msgstr "Venster sl_uiten" + + #~ msgid "Switch to Tab 12" + #~ msgstr "Ga naar tab 12" ++ ++msgid "Transparent background" ++msgstr "Transparante achtergrond" +diff --git a/po/nn.po b/po/nn.po +index 91cd6ab918c9..92844590fcbe 100644 +--- a/po/nn.po ++++ b/po/nn.po +@@ -1428,8 +1428,8 @@ msgid "_Text color:" + msgstr "_Tekstfarge:" + + #: ../src/profile-preferences.glade.h:73 +-msgid "_Transparent background" +-msgstr "_Gjennomskinleg bakgrunn" ++msgid "Transparent background" ++msgstr "Gjennomskinleg bakgrunn" + + #: ../src/profile-preferences.glade.h:74 + msgid "_Update login records when command is launched" +diff --git a/po/oc.po b/po/oc.po +index 194f13593def..04419c1e5ff9 100644 +--- a/po/oc.po ++++ b/po/oc.po +@@ -2106,11 +2106,11 @@ msgstr "Tampar _la fenèstra" + #~ msgid "Missing command" + #~ msgstr "Comanda mancanta" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Indica se cal utilizar una variante de tèma foncée" ++msgid "Whether to use a dark theme variant" ++msgstr "Indica se cal utilizar una variante de tèma foncée" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Utilizar una variante de tèma _foncée" ++msgid "Use _dark theme variant" ++msgstr "Utilizar una variante de tèma _foncée" + + #~ msgid "Palette for terminal applications" + #~ msgstr "Paleta per las aplicacions tèxte" +@@ -3195,8 +3195,8 @@ msgstr "Tampar _la fenèstra" + #~ msgid "Run;" + #~ msgstr "Executar;Consòla;Shell;" + +-#~ msgid "_Transparent background" +-#~ msgstr "Rèire plan _transparent" ++msgid "Transparent background" ++msgstr "Rèire plan transparent" + + #~ msgid "" + #~ "A subset of possible encodings are presented in the Encoding submenu. " +diff --git a/po/or.po b/po/or.po +index ec1e6bfb9a28..218acd712df6 100644 +--- a/po/or.po ++++ b/po/or.po +@@ -2705,8 +2705,8 @@ msgstr "ଶୀର୍ଷକ (_T):" + #~ msgid "Background image _scrolls" + #~ msgstr "ପୃଷ୍ଠଭୂମି ଚିତ୍ର ସ୍କ୍ରୋଲଗୁଡିକ (_s)" + +-#~ msgid "_Transparent background" +-#~ msgstr "ସ୍ବଚ୍ଛ ପୃଷ୍ଠଭୂମି (_T)" ++msgid "Transparent background" ++msgstr "ସ୍ବଚ୍ଛ ପୃଷ୍ଠଭୂମି" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "ଛାୟା ସ୍ବଚ୍ଛ କିମ୍ବା ଚିତ୍ର ପୃଷ୍ଠଭୂମି (_h):" +diff --git a/po/pa.po b/po/pa.po +index 9c95b66e7185..5e5b8ba4f104 100644 +--- a/po/pa.po ++++ b/po/pa.po +@@ -3008,8 +3008,8 @@ msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ(_l)" + #~ msgid "_Solid color" + #~ msgstr "ਇੱਕ ਰੰਗ ਵਰਤੋਂ(_S)" + +-#~ msgid "_Transparent background" +-#~ msgstr "ਪਾਰਦਰਸ਼ੀ ਬੈਕਗਰਾਊਂਡ(_T)" ++msgid "Transparent background" ++msgstr "ਪਾਰਦਰਸ਼ੀ ਬੈਕਗਰਾਊਂਡ" + + #~ msgid "S/Key Challenge Response" + #~ msgstr "S/ਸਵਿੱਚ ਚੈਲੰਜ਼ ਜਵਾਬ" +diff --git a/po/pl.po b/po/pl.po +index 609ffc36b5a4..f50b535b80fd 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -2106,3 +2106,6 @@ msgid "" + msgstr "" + "Wartość między 0 a 100, gdzie 0 oznacza nieprzezroczystość, a 100 oznacza " + "całkowitą przezroczystość." ++ ++msgid "Transparent background" ++msgstr "Przezroczyste tło" +diff --git a/po/ps.po b/po/ps.po +index b1de52c2ff34..a16ac4937d1a 100644 +--- a/po/ps.po ++++ b/po/ps.po +@@ -1052,8 +1052,8 @@ msgid "_Text color:" + msgstr ":د ليکنې رنګ_" + + #: ../src/profile-preferences.glade.h:69 +-msgid "_Transparent background" +-msgstr "روڼ شاليد_" ++msgid "Transparent background" ++msgstr "روڼ شاليد" + + #: ../src/profile-preferences.glade.h:70 + msgid "_Update login records when command is launched" +diff --git a/po/pt.po b/po/pt.po +index 2b37c0df18fa..ffd18b2d187b 100644 +--- a/po/pt.po ++++ b/po/pt.po +@@ -2077,11 +2077,11 @@ msgstr "Fechar jane_La" + #~ "Se verdadeiro, os registos de sistema de início de sessão utmp e wtmp " + #~ "serão atualizados ao iniciar um comando dentro do terminal." + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Se utilizar ou não uma variante escura do tema" ++msgid "Whether to use a dark theme variant" ++msgstr "Se utilizar ou não uma variante escura do tema" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Utilizar variante _escura de tema" ++msgid "Use _dark theme variant" ++msgstr "Utilizar variante _escura de tema" + + #~ msgid "_Update login records when command is launched" + #~ msgstr "_Atualizar os registos de início de sessão ao executar um comando" +@@ -2975,8 +2975,8 @@ msgstr "Fechar jane_La" + #~ msgid "Background image _scrolls" + #~ msgstr "Imagem de fundo _rola" + +-#~ msgid "_Transparent background" +-#~ msgstr "Fundo _transparente" ++msgid "Transparent background" ++msgstr "Fundo transparente" + + #~ 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 dee5c31593cd..3c0a7d09e1a2 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -2116,11 +2116,11 @@ msgstr "_Fechar janela" + #~ msgid "TITLE" + #~ msgstr "TÍTULO" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Se deve ou não usar uma variante de tema escuro" ++msgid "Whether to use a dark theme variant" ++msgstr "Se deve ou não usar uma variante de tema escuro" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Usar variante de tema es_curo" ++msgid "Use _dark theme variant" ++msgstr "Usar variante de tema es_curo" + + #~ msgid "COMMAND" + #~ msgstr "COMANDO" +@@ -2878,3 +2878,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\"" ++ ++msgid "Transparent background" ++msgstr "Fundo transparente" +diff --git a/po/ro.po b/po/ro.po +index 179dd77fd166..f7fc7ae070cf 100644 +--- a/po/ro.po ++++ b/po/ro.po +@@ -1576,8 +1576,8 @@ msgid "_Text color:" + msgstr "Culoare _text:" + + #: ../src/profile-preferences.glade.h:77 +-msgid "_Transparent background" +-msgstr "Fundal _transparent" ++msgid "Transparent background" ++msgstr "Fundal transparent" + + #: ../src/profile-preferences.glade.h:78 + msgid "_Underline color:" +diff --git a/po/ru.po b/po/ru.po +index 1a6fbd95b4ba..4551e12f255b 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -2065,3 +2065,6 @@ msgstr "" + #: ../src/terminal-window.c:3694 + msgid "C_lose Window" + msgstr "_Закрыть окно" ++ ++msgid "Transparent background" ++msgstr "Прозрачный фон" +diff --git a/po/rw.po b/po/rw.po +index 3f0223162995..b7fff4cb3ce4 100644 +--- a/po/rw.po ++++ b/po/rw.po +@@ -748,7 +748,7 @@ msgstr "Ibara ry'Inyandiko..." + + #: ../src/gnome-terminal.glade2.h:102 + #, fuzzy +-msgid "_Transparent background" ++msgid "Transparent background" + msgstr "Mbuganyuma" + + #: ../src/gnome-terminal.glade2.h:103 +diff --git a/po/si.po b/po/si.po +index 81dbf6589f89..5cb0e5ad52cc 100644 +--- a/po/si.po ++++ b/po/si.po +@@ -537,8 +537,8 @@ msgid "_Text color:" + msgstr "පෙළ වර්‍ණ: (_T)" + + #: ../src/gnome-terminal.glade2.h:86 +-msgid "_Transparent background" +-msgstr "විනිවිද පෙනෙන පසුබිම (_T)" ++msgid "Transparent background" ++msgstr "විනිවිද පෙනෙන පසුබිම" + + #: ../src/gnome-terminal.glade2.h:87 + msgid "_Update login records when command is launched" +diff --git a/po/sk.po b/po/sk.po +index 3a8ede3b61f4..b9744bc7c14c 100644 +--- a/po/sk.po ++++ b/po/sk.po +@@ -2165,11 +2165,11 @@ msgstr "_Zavrieť okno" + #~ msgstr "TITULOK" + + # gsetting summary +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Či použiť tmavú verziu témy" ++msgid "Whether to use a dark theme variant" ++msgstr "Či použiť tmavú verziu témy" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Použiť _tmavú verziu témy" ++msgid "Use _dark theme variant" ++msgstr "Použiť _tmavú verziu témy" + + #~ msgid "COMMAND" + #~ msgstr "PRÍKAZ" +@@ -2188,3 +2188,6 @@ msgstr "_Zavrieť okno" + #~ " shell Spustí použivateľský shell v novom termináli\n" + #~ "\n" + #~ "Viac informácii o jednotlivých príkazoch získate pomocou „%s PRÍKAZ --help“.\n" ++ ++msgid "Transparent background" ++msgstr "Priehľadné pozadie" +diff --git a/po/sl.po b/po/sl.po +index 72baf7b1e8ad..d7ff33ccfe8e 100644 +--- a/po/sl.po ++++ b/po/sl.po +@@ -2066,11 +2066,11 @@ msgstr "_Zapri okno" + #~ msgid "Missing command" + #~ msgstr "Manjka ukaz" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Ali naj se uporabi temna tema okna" ++msgid "Whether to use a dark theme variant" ++msgstr "Ali naj se uporabi temna tema okna" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Uporabi _temno temo" ++msgid "Use _dark theme variant" ++msgstr "Uporabi _temno temo" + + #~ msgid "Set the terminal title" + #~ msgstr "Nastavi naziv terminala" +@@ -2322,3 +2322,6 @@ msgstr "_Zapri okno" + + #~ msgid "_Profile Preferences…" + #~ msgstr "Možnosti _profila ..." ++ ++msgid "Transparent background" ++msgstr "Prosojno ozadje" +diff --git a/po/sq.po b/po/sq.po +index e59c0b69d8f8..6fb409043319 100644 +--- a/po/sq.po ++++ b/po/sq.po +@@ -567,8 +567,8 @@ msgstr "Ngjyra e _tekstit:" + + # (pofilter) simplecaps: checks the capitalisation of two strings isn't wildly different + #: ../src/gnome-terminal.glade2.h:85 +-msgid "_Transparent background" +-msgstr "Sfond _Trasparent" ++msgid "Transparent background" ++msgstr "Sfond Trasparent" + + #: ../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 0197b14ca932..be4956eeeed5 100644 +--- a/po/sr.po ++++ b/po/sr.po +@@ -2152,11 +2152,11 @@ msgstr "_Затвори прозор" + #~ msgid "Keyboard shortcut to set the terminal title" + #~ msgstr "Пречица за постављање наслова терминала" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Да ли ће бити коришћена варијанта тамне теме" ++msgid "Whether to use a dark theme variant" ++msgstr "Да ли ће бити коришћена варијанта тамне теме" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Користи варијанту _тамне теме" ++msgid "Use _dark theme variant" ++msgstr "Користи варијанту _тамне теме" + + #~ msgid "_Use the system fixed width font" + #~ msgstr "_Користи системски словни лик сталне ширине" +@@ -2208,3 +2208,6 @@ msgstr "_Затвори прозор" + + #~ msgid "Close Window" + #~ msgstr "Затвори прозор" ++ ++msgid "Transparent background" ++msgstr "Провидна позадина" +diff --git a/po/sr@latin.po b/po/sr@latin.po +index 12afab128229..e8ccf218695e 100644 +--- a/po/sr@latin.po ++++ b/po/sr@latin.po +@@ -2152,11 +2152,11 @@ msgstr "_Zatvori prozor" + #~ msgid "Keyboard shortcut to set the terminal title" + #~ msgstr "Prečica za postavljanje naslova terminala" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Da li će biti korišćena varijanta tamne teme" ++msgid "Whether to use a dark theme variant" ++msgstr "Da li će biti korišćena varijanta tamne teme" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Koristi varijantu _tamne teme" ++msgid "Use _dark theme variant" ++msgstr "Koristi varijantu _tamne teme" + + #~ msgid "_Use the system fixed width font" + #~ msgstr "_Koristi sistemski slovni lik stalne širine" +@@ -2208,3 +2208,6 @@ msgstr "_Zatvori prozor" + + #~ msgid "Close Window" + #~ msgstr "Zatvori prozor" ++ ++msgid "Transparent background" ++msgstr "Providna pozadina" +diff --git a/po/sv.po b/po/sv.po +index 745f7d985494..2cfce8bc6254 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -2073,5 +2073,8 @@ msgstr "Stän_g fönster" + #~ msgid "Unknown completion request for \"%s\"" + #~ msgstr "Okänd kompletteringsbegäran för \"%s\"" + ++msgid "Transparent background" ++msgstr "Genomskinlig bakgrund" ++ + #~ msgid "Missing command" + #~ msgstr "Kommando saknas" +diff --git a/po/ta.po b/po/ta.po +index 80aa2f684eec..61185b47f911 100644 +--- a/po/ta.po ++++ b/po/ta.po +@@ -3028,8 +3028,8 @@ msgstr "_l சாளரத்தை மூடவும்" + #~ msgid "_Solid color" + #~ msgstr "(_S) ஒரே வண்ணம்" + +-#~ msgid "_Transparent background" +-#~ msgstr "_T புலப்பாடு பின்னணி" ++msgid "Transparent background" ++msgstr "புலப்பாடு பின்னணி" + + #~ msgid "No such profile \"%s\", using default profile\n" + #~ msgstr "\"%s\" என்ற வரியுரு கிடையாது, முன்னிருப்பு வரியுரு பயன்படுத்தப்படும்\n" +diff --git a/po/te.po b/po/te.po +index 000cda30f86c..6dcf79399604 100644 +--- a/po/te.po ++++ b/po/te.po +@@ -2898,8 +2898,8 @@ msgstr "కిటికీని మూసివేయి (_l)" + #~ msgid "Background image _scrolls" + #~ msgstr "నేపథ్యచిత్రము స్క్రాల్స్ (_s)" + +-#~ msgid "_Transparent background" +-#~ msgstr "పారదర్శక నేపథ్యం (_T)" ++msgid "Transparent background" ++msgstr "పారదర్శక నేపథ్యం" + + #~ msgid "S_hade transparent or image background:" + #~ msgstr "పారదర్శకంగా మారు లేదా చిత్రము బ్యాక్‌గ్రౌండ్ కు మారు(_h):" +diff --git a/po/tg.po b/po/tg.po +index e3feef658e1e..a772744f269a 100644 +--- a/po/tg.po ++++ b/po/tg.po +@@ -2096,11 +2096,11 @@ msgstr "П_ӯшонидани равзана" + #~ msgid "Show server options" + #~ msgstr "Намоиши имконоти сервер" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Оё варианти мавзӯи торик истифода шавад" ++msgid "Whether to use a dark theme variant" ++msgstr "Оё варианти мавзӯи торик истифода шавад" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Истифодаи _варианти мавзӯи торик" ++msgid "Use _dark theme variant" ++msgstr "Истифодаи _варианти мавзӯи торик" + + #~ msgid "_Use the system fixed width font" + #~ msgstr "_Истифодаи шрифти бараш бо система таъиншуда" +diff --git a/po/th.po b/po/th.po +index f7a8d674657e..b0cc3a6014c2 100644 +--- a/po/th.po ++++ b/po/th.po +@@ -2040,11 +2040,11 @@ msgstr "ปิ_ดหน้าต่าง" + #~ msgid "Missing command" + #~ msgstr "ขาดคำสั่ง" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "ใช้ชุดตกแต่งแบบสีเข้มหรือไม่" ++msgid "Whether to use a dark theme variant" ++msgstr "ใช้ชุดตกแต่งแบบสีเข้มหรือไม่" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "ใช้ชุดตกแต่งแบบสีเ_ข้ม" ++msgid "Use _dark theme variant" ++msgstr "ใช้ชุดตกแต่งแบบสีเ_ข้ม" + + #~ msgid "_Use the system fixed width font" + #~ msgstr "ใ_ช้แบบอักษรความกว้างคงที่ของระบบ" +@@ -2622,8 +2622,8 @@ msgstr "ปิ_ดหน้าต่าง" + #~ msgid "_Solid color" + #~ msgstr "สี_ทึบ" + +-#~ msgid "_Transparent background" +-#~ msgstr "พื้นหลังโปร่งแ_สง" ++msgid "Transparent background" ++msgstr "พื้นหลังโปร่งแสง" + + #~ 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 f7c68e62d9da..316587c0a7b2 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -1963,3 +1963,6 @@ msgstr "Hala bir süreç bu uçbirimde çalışıyor. Uçbirimi kapatmak onu son + #: ../src/terminal-window.c:3694 + msgid "C_lose Window" + msgstr "_Pencereyi Kapat" ++ ++msgid "Transparent background" ++msgstr "Şeffaf arkaplan" +diff --git a/po/ug.po b/po/ug.po +index 1673bb32d9db..e21e61e829d7 100644 +--- a/po/ug.po ++++ b/po/ug.po +@@ -2616,8 +2616,8 @@ msgstr "ماۋزۇ (_T):" + #~ msgid "_Solid color" + #~ msgstr "ساپ رەڭ(_S)" + +-#~ msgid "_Transparent background" +-#~ msgstr "سۈزۈك تەگلىك(_T)" ++msgid "Transparent background" ++msgstr "سۈزۈك تەگلىك" + + #~ msgid "" + #~ "You already have a profile called “%s”. Do you want to create another " +diff --git a/po/uk.po b/po/uk.po +index a8db018e0a9d..4b90b5c5ad9b 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -2075,11 +2075,11 @@ msgstr "Закр_ити вікно" + #~ msgid "Missing command" + #~ msgstr "Бракує команди" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Чи використовувати темний варіант теми" ++msgid "Whether to use a dark theme variant" ++msgstr "Чи використовувати темний варіант теми" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Використовувати _темний варіант теми" ++msgid "Use _dark theme variant" ++msgstr "Використовувати _темний варіант теми" + + #~ msgid "COMMAND" + #~ msgstr "КОМАНДА" +@@ -2946,8 +2946,8 @@ msgstr "Закр_ити вікно" + #~ msgid "_Solid color" + #~ msgstr "_Суцільний колір" + +-#~ msgid "_Transparent background" +-#~ msgstr "П_розоре тло" ++msgid "Transparent background" ++msgstr "Прозоре тло" + + #~ msgid "Switch to Tab 2" + #~ msgstr "До вкладки 2" +diff --git a/po/vi.po b/po/vi.po +index e5db4fb757d1..4eed0ecc4b93 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -2080,11 +2080,11 @@ msgstr "Đón_g cửa sổ" + #~ msgid "Missing command" + #~ msgstr "Thiếu lệnh" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "Có nên dùng biến thể chủ đề tối hay không" ++msgid "Whether to use a dark theme variant" ++msgstr "Có nên dùng biến thể chủ đề tối hay không" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "Dùng biến thể chủ đề tố_i" ++msgid "Use _dark theme variant" ++msgstr "Dùng biến thể chủ đề tố_i" + + #~ msgid "Set the terminal title" + #~ msgstr "Đặt tựa đề thiết bị cuối" +@@ -2689,3 +2689,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." ++ ++msgid "Transparent background" ++msgstr "Nền trong suốt" +diff --git a/po/wa.po b/po/wa.po +index 285657194713..f068531c2928 100644 +--- a/po/wa.po ++++ b/po/wa.po +@@ -563,8 +563,8 @@ msgid "_Text color:" + msgstr "Coleur pol _tecse:" + + #: ../src/gnome-terminal.glade2.h:86 +-msgid "_Transparent background" +-msgstr "Fond k' on voet _houte" ++msgid "Transparent background" ++msgstr "Fond k' on voet houte" + + #: ../src/gnome-terminal.glade2.h:87 + msgid "_Update login records when command is launched" +diff --git a/po/xh.po b/po/xh.po +index e5981c6ec5bf..7f9f8049c3df 100644 +--- a/po/xh.po ++++ b/po/xh.po +@@ -620,8 +620,8 @@ msgid "_Text color:" + msgstr "_Umbala wombhalo:" + + #: ../src/gnome-terminal.glade2.h:102 +-msgid "_Transparent background" +-msgstr "_Okungasemva okucace gca" ++msgid "Transparent background" ++msgstr "Okungasemva okucace gca" + + #: ../src/gnome-terminal.glade2.h:103 + msgid "_Update login records when command is launched" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index abc13e1e3abe..f9bd6ec53cbb 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -2102,8 +2102,11 @@ msgstr "关闭窗口(_L)" + #~ msgid "Missing command" + #~ msgstr "遗漏命令" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "是否使用暗色主题" ++msgid "Whether to use a dark theme variant" ++msgstr "是否使用暗色主题" ++ ++msgid "Use _dark theme variant" ++msgstr "使用暗色主题(_D)" + + #~ msgid "COMMAND" + #~ msgstr "命令" +@@ -2336,3 +2339,6 @@ msgstr "关闭窗口(_L)" + + #~ msgid "_Find..." + #~ msgstr "查找(_F)..." ++ ++msgid "Transparent background" ++msgstr "透明背景" +diff --git a/po/zh_HK.po b/po/zh_HK.po +index eb0ede77e889..aceb184b2440 100644 +--- a/po/zh_HK.po ++++ b/po/zh_HK.po +@@ -2376,3 +2376,6 @@ msgstr "關閉視窗(_L)" + + #~ msgid "Show session management options" + #~ msgstr "顯示作業階段管理選項" ++ ++msgid "Transparent background" ++msgstr "透明背景" +diff --git a/po/zh_TW.po b/po/zh_TW.po +index 8326ad3b0171..a9062135a180 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -2034,11 +2034,11 @@ msgstr "關閉視窗(_L)" + #~ msgid "Missing command" + #~ msgstr "遺失指令" + +-#~ msgid "Whether to use a dark theme variant" +-#~ msgstr "是否使用暗色系布景主題變體" ++msgid "Whether to use a dark theme variant" ++msgstr "是否使用暗色系布景主題變體" + +-#~ msgid "Use _dark theme variant" +-#~ msgstr "使用暗色系布景主題變體(_D)" ++msgid "Use _dark theme variant" ++msgstr "使用暗色系布景主題變體(_D)" + + #~ msgid "_Use the system fixed width font" + #~ msgstr "使用系統的固定寬度字型(_U)" +@@ -2383,3 +2383,6 @@ msgstr "關閉視窗(_L)" + + #~ msgid "Show session management options" + #~ msgstr "顯示作業階段管理選項" ++ ++msgid "Transparent background" ++msgstr "透明背景" +-- +2.5.0 + diff --git a/gnome-terminal-restore-dark-transparency.patch b/gnome-terminal-restore-dark-transparency.patch deleted file mode 100644 index 5c186c2..0000000 --- a/gnome-terminal-restore-dark-transparency.patch +++ /dev/null @@ -1,2232 +0,0 @@ -From 0a97a742fc4153caa76548e075cb731e96376a67 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Mon, 12 May 2014 14:57:18 +0200 -Subject: [PATCH 1/5] Restore transparency - -The transparency settings were removed as a side effect of -2bff4b63ed3ceef6055e35563e9b0b33ad57349d - -This restores them and you will need a compositing window manager to -use it. The background image setting, also known as faux transparency, -was not restored. - -The transparency checkbox lost its mnemonic accelerator because 't' -is already taken and using any other letter would make it hard to -restore the translations of the string. ---- - src/org.gnome.Terminal.gschema.xml | 10 +++++ - src/profile-editor.c | 11 +++++ - src/profile-preferences.ui | 92 ++++++++++++++++++++++++++++++++++++++ - src/terminal-schemas.h | 3 ++ - src/terminal-screen.c | 22 ++++++++- - src/terminal-window.c | 7 +++ - 6 files changed, 144 insertions(+), 1 deletion(-) - -diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 6e24f564c91a..0a646370dd65 100644 ---- a/src/org.gnome.Terminal.gschema.xml -+++ b/src/org.gnome.Terminal.gschema.xml -@@ -334,6 +334,16 @@ - 'narrow' - Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding - -+ -+ false -+ Whether to use a transparent background -+ -+ -+ 50 -+ -+ Adjust the amount of transparency -+ A value between 0 and 100, where 0 is opaque and 100 is fully transparent. -+ - - - -diff --git a/src/profile-editor.c b/src/profile-editor.c -index c5019fd469ad..7ca953ef9ff4 100644 ---- a/src/profile-editor.c -+++ b/src/profile-editor.c -@@ -1097,7 +1097,18 @@ terminal_profile_edit (GSettings *profile, - "active-id", - G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); - -+ g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, -+ gtk_builder_get_object (builder, "use-transparent-background"), -+ "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); -+ g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, -+ gtk_builder_get_object (builder, "background-transparent-scale-box"), -+ "sensitive", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY); -+ g_settings_bind (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT, -+ gtk_builder_get_object (builder, "background-transparent-adjustment"), -+ "value", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); -+ - /* Finished! */ -+ - terminal_util_bind_mnemonic_label_sensitivity (editor); - - terminal_util_dialog_focus_widget (editor, widget_name); -diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui -index 579c28ff344f..edb264ba5d72 100644 ---- a/src/profile-preferences.ui -+++ b/src/profile-preferences.ui -@@ -23,6 +23,11 @@ - 1 - 100 - -+ -+ 100 -+ 1 -+ 10 -+ - - - -@@ -991,6 +996,93 @@ - 1 - - -+ -+ -+ True -+ False -+ horizontal -+ 12 -+ -+ -+ Transparent background -+ True -+ True -+ False -+ True -+ 0 -+ True -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ False -+ horizontal -+ 6 -+ -+ -+ True -+ False -+ 0.5 -+ none -+ -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ True -+ background-transparent-adjustment -+ False -+ -+ -+ True -+ True -+ 1 -+ -+ -+ -+ -+ True -+ False -+ 0.5 -+ full -+ -+ -+ -+ False -+ False -+ 2 -+ -+ -+ -+ -+ True -+ True -+ 1 -+ -+ -+ -+ -+ True -+ True -+ 2 -+ -+ - - - -diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index a8a0d908beea..e35990d728dc 100644 ---- a/src/terminal-schemas.h -+++ b/src/terminal-schemas.h -@@ -63,6 +63,9 @@ G_BEGIN_DECLS - #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" - #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions" - -+#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND "use-transparent-background" -+#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent" -+ - #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" - #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 a48de105e953..f5a70cdbcf81 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -765,7 +765,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, - prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR_KEY) || - prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY) || - prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_KEY) || -- prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY)) -+ prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) || -+ prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) || -+ prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT)) - update_color_scheme (screen); - - if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) -@@ -831,6 +833,8 @@ update_color_scheme (TerminalScreen *screen) - GdkRGBA fg, bg, bold, theme_fg, theme_bg; - GdkRGBA *boldp; - GtkStyleContext *context; -+ GtkWidget *toplevel; -+ gboolean transparent; - - context = gtk_widget_get_style_context (widget); - gtk_style_context_get_color (context, gtk_style_context_get_state (context), &theme_fg); -@@ -851,9 +855,25 @@ update_color_scheme (TerminalScreen *screen) - boldp = NULL; - - colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); -+ -+ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); -+ if (transparent) -+ { -+ gint transparency_percent; -+ -+ transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT); -+ bg.alpha = (100 - transparency_percent) / 100.0; -+ } -+ else -+ bg.alpha = 1.0; -+ - vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, - colors, n_colors); - vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); -+ -+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); -+ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) -+ gtk_widget_set_app_paintable (toplevel, transparent); - } - - static void -diff --git a/src/terminal-window.c b/src/terminal-window.c -index e065ac1de49d..a146a62fb098 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -2586,6 +2586,8 @@ terminal_window_init (TerminalWindow *window) - TerminalWindowPrivate *priv; - TerminalApp *app; - TerminalSettingsList *profiles_list; -+ GdkScreen *screen; -+ GdkVisual *visual; - GtkActionGroup *action_group; - GtkAction *action; - GtkUIManager *manager; -@@ -2601,6 +2603,11 @@ terminal_window_init (TerminalWindow *window) - - gtk_widget_init_template (GTK_WIDGET (window)); - -+ screen = gtk_widget_get_screen (GTK_WIDGET (window)); -+ visual = gdk_screen_get_rgba_visual (screen); -+ if (visual != NULL) -+ gtk_widget_set_visual (GTK_WIDGET (window), visual); -+ - uuid_generate (u); - uuid_unparse (u, uuidstr); - priv->uuid = g_strdup (uuidstr); --- -2.1.0 - - -From 9461b958aaf6bf40afa389850fc56cd087320a43 Mon Sep 17 00:00:00 2001 -From: Lars Uebernickel -Date: Wed, 28 May 2014 14:11:02 +0200 -Subject: [PATCH 2/5] 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 -is usually not a problem because GTK+ sets an opaque region on the -whole window and things without a background-color get drawn with the -theme's default background colour. However, to achieve transparency -we disable the opaque region by making the window app-paintable. This -can lead to transparent menubars or notebook tabs in some themes. We -can avoid this by ensuring that the window always renders a background. - -https://bugzilla.gnome.org/show_bug.cgi?id=730016 ---- - src/terminal-window.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/src/terminal-window.c b/src/terminal-window.c -index a146a62fb098..5117c06653c0 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -2225,6 +2225,26 @@ terminal_window_realize (GtkWidget *widget) - } - - static gboolean -+terminal_window_draw (GtkWidget *widget, -+ cairo_t *cr) -+{ -+ if (gtk_widget_get_app_paintable (widget)) -+ { -+ GtkStyleContext *context; -+ int width; -+ int height; -+ -+ context = gtk_widget_get_style_context (widget); -+ width = gtk_widget_get_allocated_width (widget); -+ height = gtk_widget_get_allocated_height (widget); -+ gtk_render_background (context, cr, 0, 0, width, height); -+ gtk_render_frame (context, cr, 0, 0, width, height); -+ } -+ -+ return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); -+} -+ -+static gboolean - terminal_window_state_event (GtkWidget *widget, - GdkEventWindowState *event) - { -@@ -2787,6 +2807,7 @@ terminal_window_class_init (TerminalWindowClass *klass) - - widget_class->show = terminal_window_show; - widget_class->realize = terminal_window_realize; -+ widget_class->draw = terminal_window_draw; - widget_class->window_state_event = terminal_window_state_event; - widget_class->screen_changed = terminal_window_screen_changed; - widget_class->style_updated = terminal_window_style_updated; --- -2.1.0 - - -From c1efbc4c8a1d018f3724a2ca494ea5b543130612 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Tue, 17 Feb 2015 13:22:11 +0100 -Subject: [PATCH 3/5] Revert "prefs: Remove dark theme pref" - -This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18. ---- - src/org.gnome.Terminal.gschema.xml | 5 +++++ - src/preferences.ui | 16 ++++++++++++++++ - src/terminal-app.c | 4 ++++ - src/terminal-prefs.c | 9 ++++++++- - src/terminal-schemas.h | 1 + - 5 files changed, 34 insertions(+), 1 deletion(-) - -diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 0a646370dd65..719a5f06ee33 100644 ---- a/src/org.gnome.Terminal.gschema.xml -+++ b/src/org.gnome.Terminal.gschema.xml -@@ -658,6 +658,11 @@ - Whether to show the menubar in new windows - - -+ -+ false -+ Whether to use a dark theme variant -+ -+ - - 'window' - Whether to open new terminals as windows or tabs -diff --git a/src/preferences.ui b/src/preferences.ui -index bdb643d992cb..a918b1b9f565 100644 ---- a/src/preferences.ui -+++ b/src/preferences.ui -@@ -99,6 +99,22 @@ - - - -+ -+ Use _dark theme variant -+ True -+ True -+ False -+ True -+ 0 -+ True -+ -+ -+ False -+ True -+ 3 -+ -+ -+ - - True - False -diff --git a/src/terminal-app.c b/src/terminal-app.c -index 0d2a0e61786e..96341e96cfad 100644 ---- a/src/terminal-app.c -+++ b/src/terminal-app.c -@@ -409,6 +409,10 @@ terminal_app_init (TerminalApp *app) - - /* Terminal global settings */ - app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA); -+ g_settings_bind (app->global_settings, TERMINAL_SETTING_DARK_THEME_KEY, -+ gtk_settings_get_default (), -+ "gtk-application-prefer-dark-theme", -+ G_SETTINGS_BIND_GET); - - /* Check if we need to migrate from gconf to dconf */ - maybe_migrate_settings (app); -diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c -index 230b0aec46f8..f2ce723771fe 100644 ---- a/src/terminal-prefs.c -+++ b/src/terminal-prefs.c -@@ -560,7 +560,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, - GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button; - GtkWidget *disable_shortcuts_button; - GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button; -- GtkWidget *new_terminal_mode_combo; -+ GtkWidget *dark_theme_button, *new_terminal_mode_combo; - GtkWidget *default_hbox, *default_label; - GtkWidget *close_button, *help_button; - GtkTreeSelection *selection; -@@ -584,6 +584,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, - "close-button", &close_button, - "help-button", &help_button, - "default-show-menubar-checkbutton", &show_menubar_button, -+ "dark-theme-checkbutton", &dark_theme_button, - "new-terminal-mode-combobox", &new_terminal_mode_combo, - "disable-mnemonics-checkbutton", &disable_mnemonics_button, - "disable-shortcuts-checkbutton", &disable_shortcuts_button, -@@ -614,6 +615,12 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent, - G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); - - g_settings_bind (settings, -+ TERMINAL_SETTING_DARK_THEME_KEY, -+ dark_theme_button, -+ "active", -+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); -+ -+ g_settings_bind (settings, - TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY, - new_terminal_mode_combo, - "active-id", -diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index e35990d728dc..d4f44d2f538e 100644 ---- a/src/terminal-schemas.h -+++ b/src/terminal-schemas.h -@@ -68,6 +68,7 @@ G_BEGIN_DECLS - - #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" - #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" -+#define TERMINAL_SETTING_DARK_THEME_KEY "dark-theme" - #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" - #define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY "mnemonics-enabled" - #define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY "shortcuts-enabled" --- -2.1.0 - - -From 4e92b51530a182aaf87a7b3ca8e1292078c86093 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Tue, 17 Feb 2015 13:22:21 +0100 -Subject: [PATCH 4/5] Revert "help: Remove dark theme pref" - -This reverts commit baaca6a4cc5ca78d7b0e02cfaee6c159bad7ce4b. ---- - help/C/pref-theme.page | 41 +++++++++++++++++++++++++++++++++++++++++ - help/Makefile.am | 1 + - 2 files changed, 42 insertions(+) - create mode 100644 help/C/pref-theme.page - -diff --git a/help/C/pref-theme.page b/help/C/pref-theme.page -new file mode 100644 -index 000000000000..a997d14c0dfd ---- /dev/null -+++ b/help/C/pref-theme.page -@@ -0,0 +1,41 @@ -+ -+ -+ -+ -+ -+ -+ -+ Ekaterina Gerasimova -+ kittykat3756@gmail.com -+ 2014 -+ -+ -+ -+ -+ -+ Use either the light or dark theme for Terminal. -+ -+ -+ Chose the window theme -+ -+

You can chose to use either the dark theme or the light theme for the -+ terminal window.

-+ -+ -+ -+

Select -+ EditPreferencesGeneral.

-+ -+ -+

To use the dark theme, select Use dark theme variant.

-+ -+ -+ -+ -diff --git a/help/Makefile.am b/help/Makefile.am -index e3ca62732cf6..4bacc91265de 100644 ---- a/help/Makefile.am -+++ b/help/Makefile.am -@@ -35,6 +35,7 @@ HELP_FILES = \ - pref-profile-encoding.page \ - pref-scrolling.page \ - pref-tab-window.page \ -+ pref-theme.page \ - pref-user-input.page \ - profile.page \ - prob-reset.page \ --- -2.1.0 - - -From 59a5e9751c868bfedd1ca19994760d3cf3768487 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Tue, 17 Feb 2015 17:06:17 +0100 -Subject: [PATCH 5/5] Restore translations for dark terminals and transparency - ---- - po/am.po | 4 ++-- - po/ar.po | 13 ++++++------- - po/as.po | 4 ++-- - po/ast.po | 4 ++-- - po/az.po | 4 ++-- - po/be.po | 3 +++ - po/be@latin.po | 4 ++-- - po/bg.po | 3 +++ - po/bn_IN.po | 3 +++ - po/bs.po | 4 ++++ - po/ca.po | 11 +++++++---- - po/ca@valencia.po | 3 +++ - po/cs.po | 3 +++ - po/cy.po | 4 ++-- - po/da.po | 12 ++++++------ - po/de.po | 12 ++++++------ - po/dz.po | 4 ++-- - po/el.po | 11 +++++++---- - po/en@shaw.po | 4 ++-- - po/en_CA.po | 4 ++-- - po/en_GB.po | 4 ++-- - po/es.po | 12 ++++++------ - po/et.po | 3 +++ - po/eu.po | 12 ++++++------ - po/fa.po | 3 +++ - po/fi.po | 11 +++++++---- - po/fr.po | 11 +++++++---- - po/fur.po | 4 ++++ - po/ga.po | 3 +++ - po/gd.po | 9 ++++----- - po/gl.po | 12 ++++++------ - po/gu.po | 4 ++-- - po/he.po | 12 ++++++------ - po/hi.po | 4 ++-- - po/hr.po | 4 ++-- - po/hu.po | 11 +++++++---- - po/hy.po | 4 ++-- - po/id.po | 3 +++ - po/it.po | 3 +++ - po/ja.po | 3 +++ - po/ka.po | 2 +- - po/kk.po | 11 +++++++---- - po/kn.po | 3 +++ - po/ko.po | 11 +++++++---- - po/ku.po | 4 ++-- - po/lt.po | 11 +++++++---- - po/lv.po | 3 +++ - po/mai.po | 4 ++-- - po/mg.po | 4 ++-- - po/mk.po | 4 ++-- - po/ml.po | 4 ++-- - po/mn.po | 4 ++-- - po/mr.po | 4 ++-- - po/ms.po | 4 ++-- - po/nb.po | 3 +++ - po/nds.po | 4 ++-- - po/ne.po | 4 ++-- - po/nl.po | 3 +++ - po/nn.po | 4 ++-- - po/oc.po | 12 ++++++------ - po/or.po | 4 ++-- - po/pa.po | 4 ++-- - po/pl.po | 3 +++ - po/ps.po | 4 ++-- - po/pt.po | 12 ++++++------ - po/pt_BR.po | 11 +++++++---- - po/ro.po | 4 ++-- - po/ru.po | 3 +++ - po/rw.po | 2 +- - po/si.po | 4 ++-- - po/sk.po | 11 +++++++---- - po/sl.po | 11 +++++++---- - po/sq.po | 4 ++-- - po/sr.po | 11 +++++++---- - po/sr@latin.po | 11 +++++++---- - po/sv.po | 3 +++ - po/ta.po | 4 ++-- - po/te.po | 4 ++-- - po/tg.po | 8 ++++---- - po/th.po | 12 ++++++------ - po/tr.po | 3 +++ - po/ug.po | 4 ++-- - po/uk.po | 12 ++++++------ - po/vi.po | 11 +++++++---- - po/wa.po | 4 ++-- - po/xh.po | 4 ++-- - po/zh_CN.po | 11 +++++++---- - po/zh_HK.po | 3 +++ - po/zh_TW.po | 11 +++++++---- - 89 files changed, 328 insertions(+), 214 deletions(-) - -diff --git a/po/am.po b/po/am.po -index 27a7e9640668..04a8ad9f36a3 100644 ---- a/po/am.po -+++ b/po/am.po -@@ -613,8 +613,8 @@ msgid "_Text color:" - msgstr "የ_ጽሑፍ ቀለም፦" - - #: ../src/gnome-terminal.glade2.h:102 --msgid "_Transparent background" --msgstr "_የሚያሳይ መደብ" -+msgid "Transparent background" -+msgstr "የሚያሳይ መደብ" - - #: ../src/gnome-terminal.glade2.h:103 - msgid "_Update login records when command is launched" -diff --git a/po/ar.po b/po/ar.po -index c27cd9cfc2b6..b882143bdd77 100644 ---- a/po/ar.po -+++ b/po/ar.po -@@ -2056,12 +2056,11 @@ msgstr "أغ_لق النافذة" - #~ msgid "Missing command" - #~ msgstr "خطأ أثناء تحليل الأمر: %s" - --#, fuzzy --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "فيما إذا سيستعمل خط النظام ثابت العرض" -+msgid "Whether to use a dark theme variant" -+msgstr "فيما إذا سيستعمل خط النظام ثابت العرض" - --#~ msgid "Use _dark theme variant" --#~ msgstr "استخدم سمة _داكنة" -+msgid "Use _dark theme variant" -+msgstr "استخدم سمة _داكنة" - - #~ msgid "COMMAND" - #~ msgstr "الأمر" -@@ -2914,8 +2913,8 @@ msgstr "أغ_لق النافذة" - #~ msgid "Background image _scrolls" - #~ msgstr "صورة الخلفية ت_لتف" - --#~ msgid "_Transparent background" --#~ msgstr "خلفية _شفافة" -+msgid "Transparent background" -+msgstr "خلفية شفافة" - - #~ msgid "S_hade transparent or image background:" - #~ msgstr "_ظلل شفافية أو صورة الخلفية:" -diff --git a/po/as.po b/po/as.po -index 0bd699d5e021..63fca0132a93 100644 ---- a/po/as.po -+++ b/po/as.po -@@ -2979,8 +2979,8 @@ msgstr "উইন্ডো বন্ধ কৰক (_l)" - #~ msgid "Background image _scrolls" - #~ msgstr "পটভূমিৰ ছবি স্ক্ৰল কৰক (_s)" - --#~ msgid "_Transparent background" --#~ msgstr "স্বচ্চ পটভূমি (_T)" -+msgid "Transparent background" -+msgstr "স্বচ্চ পটভূমি " - - #~ msgid "S_hade transparent or image background:" - #~ msgstr "স্বচ্ছ বা ছবিৰ সৈতে পটভূমি ছায়া আচ্ছন্ন কৰক (_h):" -diff --git a/po/ast.po b/po/ast.po -index d1c6e7b8174a..4210820a1429 100644 ---- a/po/ast.po -+++ b/po/ast.po -@@ -1598,8 +1598,8 @@ msgid "_Text color:" - msgstr "Color del _testu:" - - #: ../src/profile-preferences.glade.h:77 --msgid "_Transparent background" --msgstr "Fondu _tresparente" -+msgid "Transparent background" -+msgstr "Fondu tresparente" - - #: ../src/profile-preferences.glade.h:78 - msgid "_Underline color:" -diff --git a/po/az.po b/po/az.po -index b0f2e3eac8b8..877f114954e0 100644 ---- a/po/az.po -+++ b/po/az.po -@@ -619,8 +619,8 @@ msgid "_Text color:" - msgstr "_Mətn rəngi:" - - #: ../src/gnome-terminal.glade2.h:102 --msgid "_Transparent background" --msgstr "_Şəffaf arxa plan" -+msgid "Transparent background" -+msgstr "Şəffaf arxa plan" - - #: ../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 fca0ae4617d4..74ff3291321a 100644 ---- a/po/be.po -+++ b/po/be.po -@@ -2015,3 +2015,6 @@ msgstr "" - msgid "C_lose Window" - msgstr "_Закрыць акно" - -+msgid "Transparent background" -+msgstr "Празрысты фон" -+ -diff --git a/po/be@latin.po b/po/be@latin.po -index 1e057c74b152..1d22a58915af 100644 ---- a/po/be@latin.po -+++ b/po/be@latin.po -@@ -1425,8 +1425,8 @@ msgid "_Text color:" - msgstr "Koler _tekstu:" - - #: ../src/profile-preferences.glade.h:73 --msgid "_Transparent background" --msgstr "_Prazrysty fon" -+msgid "Transparent background" -+msgstr "Prazrysty fon" - - #: ../src/profile-preferences.glade.h:74 - msgid "_Update login records when command is launched" -diff --git a/po/bg.po b/po/bg.po -index 7e9c9be32700..241ef52bf50f 100644 ---- a/po/bg.po -+++ b/po/bg.po -@@ -2100,3 +2100,6 @@ msgstr "" - #: ../src/terminal-window.c:3652 - msgid "C_lose Window" - msgstr "_Затваряне на този прозорец" -+ -+msgid "Transparent background" -+msgstr "Прозрачен фон" -diff --git a/po/bn_IN.po b/po/bn_IN.po -index c74246a5a26d..d65b322ba88c 100644 ---- a/po/bn_IN.po -+++ b/po/bn_IN.po -@@ -2358,3 +2358,6 @@ msgstr "উইন্ডো বন্ধ করুন (_l)" - - #~ msgid "_Title:" - #~ msgstr "শিরোনাম: (_T)" -+ -+msgid "Transparent background" -+msgstr "স্বচ্চ পটভূমি " -diff --git a/po/bs.po b/po/bs.po -index 49e710859ac9..fccfa86de311 100644 ---- a/po/bs.po -+++ b/po/bs.po -@@ -680,6 +680,10 @@ msgstr "Kratica tastature za povećavanje fonta" - msgid "Keyboard shortcut to make font smaller" - msgstr "Kratica tastature za smanjivanje fonta" - -+#: ../src/gnome-terminal.glade2.h:102 -+msgid "Transparent background" -+msgstr "Providna pozadina" -+ - #: ../src/org.gnome.Terminal.gschema.xml.h:78 - msgid "Keyboard shortcut to make font normal-size" - msgstr "Kratica tastature za postavljanje fonta na normalnu veličinu" -diff --git a/po/ca.po b/po/ca.po -index 567b3445927f..68ec312dcb5c 100644 ---- a/po/ca.po -+++ b/po/ca.po -@@ -2106,8 +2106,11 @@ msgstr "Tanca la _finestra" - #~ msgid "Missing command" - #~ msgstr "Manca l'ordre" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Si s'ha d'utilitzar la variant de tema fosc" -+msgid "Whether to use a dark theme variant" -+msgstr "Si s'ha d'utilitzar la variant de tema fosc" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Utilitza la variant de tema _fosc" -+msgid "Use _dark theme variant" -+msgstr "Utilitza la variant de tema _fosc" -+ -+msgid "Transparent background" -+msgstr "Fons transparent" -diff --git a/po/ca@valencia.po b/po/ca@valencia.po -index 1c279a0bf09c..4073f719906a 100644 ---- a/po/ca@valencia.po -+++ b/po/ca@valencia.po -@@ -2092,3 +2092,6 @@ msgstr "" - #: ../src/terminal-window.c:3645 - msgid "C_lose Window" - msgstr "Tanca la _finestra" -+ -+msgid "Transparent background" -+msgstr "Fons transparent" -diff --git a/po/cs.po b/po/cs.po -index 8737182b80bf..542f8135590e 100644 ---- a/po/cs.po -+++ b/po/cs.po -@@ -2056,3 +2056,6 @@ msgstr "" - #: ../src/terminal-window.c:3694 - msgid "C_lose Window" - msgstr "_Zavřít okno" -+ -+msgid "Transparent background" -+msgstr "Průsvitné pozadí" -diff --git a/po/cy.po b/po/cy.po -index 0739e201f83b..8b1ff006857a 100644 ---- a/po/cy.po -+++ b/po/cy.po -@@ -1447,8 +1447,8 @@ msgid "_Text color:" - msgstr "Lliw'r _testun:" - - #: ../src/profile-preferences.glade.h:73 --msgid "_Transparent background" --msgstr "Cefndir _tryloyw" -+msgid "Transparent background" -+msgstr "Cefndir tryloyw" - - #: ../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 f420e1cdbbff..217b176092a9 100644 ---- a/po/da.po -+++ b/po/da.po -@@ -2094,11 +2094,11 @@ msgstr "_Luk vindue" - #~ msgid "Missing command" - #~ msgstr "Manglende kommando" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Om der skal bruges en mørk temavariant" -+msgid "Whether to use a dark theme variant" -+msgstr "Om der skal bruges en mørk temavariant" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Brug _mørk temavariant" -+msgid "Use _dark theme variant" -+msgstr "Brug _mørk temavariant" - - #~ msgid "COMMAND" - #~ msgstr "KOMMANDO" -@@ -2999,8 +2999,8 @@ msgstr "_Luk vindue" - #~ msgid "_Solid color" - #~ msgstr "_Ensfarvet" - --#~ msgid "_Transparent background" --#~ msgstr "_Gennemsigtig baggrund" -+msgid "Transparent background" -+msgstr "Gennemsigtig baggrund" - - #~ msgid "" - #~ "You already have a profile called “%s”. Do you want to create another " -diff --git a/po/de.po b/po/de.po -index 7fbad63bb009..9d376b53eec9 100644 ---- a/po/de.po -+++ b/po/de.po -@@ -2134,11 +2134,11 @@ msgstr "Fenster _schließen" - #~ msgid "Missing command" - #~ msgstr "Fehlender Befehl" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Legt fest, ob eine dunkle Themenvariante verwendet wird" -+msgid "Whether to use a dark theme variant" -+msgstr "Legt fest, ob eine dunkle Themenvariante verwendet wird" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Die _dunkle Themenvariante verwenden" -+msgid "Use _dark theme variant" -+msgstr "Die _dunkle Themenvariante verwenden" - - #~ msgid "Set the terminal title" - #~ msgstr "Den Titel des Terminals festlegen" -@@ -3066,8 +3066,8 @@ msgstr "Fenster _schließen" - #~ msgid "Background image _scrolls" - #~ msgstr "Hintergrundbild _folgt Bildlauf" - --#~ msgid "_Transparent background" --#~ msgstr "_Transparenter Hintergrund" -+msgid "Transparent background" -+msgstr "Transparenter Hintergrund" - - #~ msgid "S_hade transparent or image background:" - #~ msgstr "Transparenz und Bildhintergründe _abdunkeln:" -diff --git a/po/dz.po b/po/dz.po -index ecb8fd59329c..290934ad3e0f 100644 ---- a/po/dz.po -+++ b/po/dz.po -@@ -1551,8 +1551,8 @@ msgid "_Text color:" - msgstr "ཚིག་ཡིག་ཚོས་གཞི་:(_T)" - - #: ../src/profile-preferences.glade.h:77 --msgid "_Transparent background" --msgstr "དྭངས་གསལ་རྒྱབ་གཞི།(_T)" -+msgid "Transparent background" -+msgstr "དྭངས་གསལ་རྒྱབ་གཞི།" - - #: ../src/profile-preferences.glade.h:78 - #, fuzzy -diff --git a/po/el.po b/po/el.po -index 587527cb7a99..b0dbdd2a60a7 100644 ---- a/po/el.po -+++ b/po/el.po -@@ -2128,11 +2128,11 @@ msgstr "Κ_λείσιμο παραθύρου" - #~ msgid "Missing command" - #~ msgstr "Λείπει εντολή" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Εάν θα χρησιμοποιεί παραλλαγή σκοτεινού θέματος" -+msgid "Whether to use a dark theme variant" -+msgstr "Εάν θα χρησιμοποιεί παραλλαγή σκοτεινού θέματος" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Χρήση παραλλαγής _σκοτεινού θέματος" -+msgid "Use _dark theme variant" -+msgstr "Χρήση παραλλαγής _σκοτεινού θέματος" - - #~ msgid "_Use the system fixed width font" - #~ msgstr "_Χρήση της γραμματοσειράς σταθερού πλάτους του συστήματος" -@@ -2296,3 +2296,6 @@ msgstr "Κ_λείσιμο παραθύρου" - - #~ msgid "_Input Methods" - #~ msgstr "_Μέθοδοι εισαγωγής" -+ -+msgid "Transparent background" -+msgstr "Διάφανο παρασκήνιο" -diff --git a/po/en@shaw.po b/po/en@shaw.po -index 65f3d415e476..05dc99df5980 100644 ---- a/po/en@shaw.po -+++ b/po/en@shaw.po -@@ -1467,8 +1467,8 @@ msgid "_Text color:" - msgstr "_𐑑𐑧𐑒𐑕𐑑 𐑒𐑳𐑤𐑼:" - - #: ../src/profile-preferences.glade.h:78 --msgid "_Transparent background" --msgstr "_𐑑𐑮𐑨𐑯𐑕𐑐𐑸𐑩𐑯𐑑 𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛" -+msgid "Transparent background" -+msgstr "𐑑𐑮𐑨𐑯𐑕𐑐𐑸𐑩𐑯𐑑 𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛" - - #: ../src/profile-preferences.glade.h:79 - msgid "_Underline color:" -diff --git a/po/en_CA.po b/po/en_CA.po -index c79cbf5aa245..b8b14d2030e1 100644 ---- a/po/en_CA.po -+++ b/po/en_CA.po -@@ -556,8 +556,8 @@ msgid "_Text color:" - msgstr "_Text colour:" - - #: ../src/gnome-terminal.glade2.h:86 --msgid "_Transparent background" --msgstr "_Transparent background" -+msgid "Transparent background" -+msgstr "Transparent background" - - #: ../src/gnome-terminal.glade2.h:87 - msgid "_Update login records when command is launched" -diff --git a/po/en_GB.po b/po/en_GB.po -index 4d38486679fe..69e71135d75c 100644 ---- a/po/en_GB.po -+++ b/po/en_GB.po -@@ -2732,8 +2732,8 @@ msgstr "_Title:" - #~ msgid "Background image _scrolls" - #~ msgstr "Background image _scrolls" - --#~ msgid "_Transparent background" --#~ msgstr "_Transparent background" -+msgid "Transparent background" -+msgstr "Transparent background" - - #~ msgid "S_hade transparent or image background:" - #~ msgstr "S_hade transparent or image background:" -diff --git a/po/es.po b/po/es.po -index 39b3d7e5f1cb..b7c0cab8dae8 100644 ---- a/po/es.po -+++ b/po/es.po -@@ -2120,11 +2120,11 @@ msgstr "_Cerrar ventana" - #~ msgid "Missing command" - #~ msgstr "Falta el comando" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Indica si se debe usar la variante oscura del tema" -+msgid "Whether to use a dark theme variant" -+msgstr "Indica si se debe usar la variante oscura del tema" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Usar la variante _oscura del tema" -+msgid "Use _dark theme variant" -+msgstr "Usar la variante _oscura del tema" - - #~ msgid "Set the terminal title" - #~ msgstr "Establece el título de la terminal" -@@ -3103,8 +3103,8 @@ msgstr "_Cerrar ventana" - #~ msgid "_Solid color" - #~ msgstr "Color _sólido" - --#~ msgid "_Transparent background" --#~ msgstr "Fondo _transparente" -+msgid "Transparent background" -+msgstr "Fondo transparente" - - #~ msgid "No such profile \"%s\", using default profile\n" - #~ msgstr "No existe el perfil «%s», usando el perfil predeterminado\n" -diff --git a/po/et.po b/po/et.po -index 4b1c2a7c67e4..770761168806 100644 ---- a/po/et.po -+++ b/po/et.po -@@ -1747,3 +1747,6 @@ msgstr "Su_lge aken" - - #~ msgid "Choose base profile" - #~ msgstr "Vali põhiprofiil" -+ -+msgid "Transparent background" -+msgstr "Läbipaistev taust" -diff --git a/po/eu.po b/po/eu.po -index 97bb9762528f..9e32fb740c57 100644 ---- a/po/eu.po -+++ b/po/eu.po -@@ -2071,11 +2071,11 @@ msgstr "It_xi leihoa" - #~ msgid "Missing command" - #~ msgstr "Komandoa falta da" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Gai ilunaren aldaera erabili edo ez" -+msgid "Whether to use a dark theme variant" -+msgstr "Gai ilunaren aldaera erabili edo ez" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Erabili gai _ilunaren aldaera" -+msgid "Use _dark theme variant" -+msgstr "Erabili gai _ilunaren aldaera" - - #~ msgid "COMMAND" - #~ msgstr "KOMANDOA" -@@ -2972,8 +2972,8 @@ msgstr "It_xi leihoa" - #~ msgid "_Solid color" - #~ msgstr "_Kolore solidoa" - --#~ msgid "_Transparent background" --#~ msgstr "_Atzeko plano gardena" -+msgid "Transparent background" -+msgstr "Atzeko plano gardena" - - #~ msgid "" - #~ "You already have a profile called “%s”. Do you want to create another " -diff --git a/po/fa.po b/po/fa.po -index 882aae98a939..93007dc7450c 100644 ---- a/po/fa.po -+++ b/po/fa.po -@@ -2239,3 +2239,6 @@ msgstr "_بستن پنجره" - - #~ msgid "_Title:" - #~ msgstr "_عنوان:" -+ -+msgid "Transparent background" -+msgstr "پس‌زمینه‌ی شفاف" -diff --git a/po/fi.po b/po/fi.po -index f80a962e458a..ba11a5795b1c 100644 ---- a/po/fi.po -+++ b/po/fi.po -@@ -2069,6 +2069,9 @@ msgstr "" - msgid "C_lose Window" - msgstr "_Sulje ikkuna" - -+msgid "Transparent background" -+msgstr "Läpinäkyvä tausta" -+ - #~ msgid "Set the terminal title" - #~ msgstr "Aseta päätteen otsikko" - -@@ -2079,8 +2082,8 @@ msgstr "_Sulje ikkuna" - #~ msgid "Missing command" - #~ msgstr "Puuttuva komento" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Käytetäänkö teeman tummaan muunnelmaa" -+msgid "Whether to use a dark theme variant" -+msgstr "Käytetäänkö teeman tummaan muunnelmaa" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Käytä _teeman tummaa muunnelmaa" -+msgid "Use _dark theme variant" -+msgstr "Käytä _teeman tummaa muunnelmaa" -\ No newline at end of file -diff --git a/po/fr.po b/po/fr.po -index 15c8ecc86124..506f0fcb5c49 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -2136,8 +2136,11 @@ msgstr "Fermer _la fenêtre" - #~ msgid "Missing command" - #~ msgstr "Commande manquante" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Indique s'il faut utiliser une variante de thème foncée" -+msgid "Whether to use a dark theme variant" -+msgstr "Indique s'il faut utiliser une variante de thème foncée" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Utiliser une variante de thème _foncée" -+msgid "Use _dark theme variant" -+msgstr "Utiliser une variante de thème _foncée" -+ -+msgid "Transparent background" -+msgstr "Arrière-plan transparent" -diff --git a/po/fur.po b/po/fur.po -index 300ed8fbce71..4b5bfbc150f0 100644 ---- a/po/fur.po -+++ b/po/fur.po -@@ -562,6 +562,10 @@ msgstr "" - "Indiche se tornâ a adatâ in automatic i contignûts dal terminâl al modificâ " - "de dimension dal barcon" - -+#: ../src/gnome-terminal.glade2.h:86 -+msgid "Transparent background" -+msgstr "Fondâl trasparent" -+ - #: ../src/org.gnome.Terminal.gschema.xml.h:50 - msgid "Which encoding to use" - msgstr "Codifiche di doprâ" -diff --git a/po/ga.po b/po/ga.po -index 93d5fa9d1481..feb87dce3d6b 100644 ---- a/po/ga.po -+++ b/po/ga.po -@@ -1925,3 +1925,6 @@ msgstr "_Dún Fuinneog" - #: ../src/terminal-window.c:3582 - msgid "C_lose Terminal" - msgstr "_Dún Teirminéal" -+ -+msgid "Transparent background" -+msgstr "Cúlra trédhearcach" -diff --git a/po/gd.po b/po/gd.po -index 04a76e1de96a..4af1d80ececc 100644 ---- a/po/gd.po -+++ b/po/gd.po -@@ -2071,9 +2071,8 @@ msgstr "_Dùin an uinneag" - #~ msgid "Missing command" - #~ msgstr "Tha àithne a dhìth" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "" --#~ "Co-dhiù an tèid tionndadh dorcha dhen ùrlar a chleachdadh gus nach tèid" -+msgid "Whether to use a dark theme variant" -+msgstr "Co-dhiù an tèid tionndadh dorcha dhen ùrlar a chleachdadh gus nach tèid" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Cleachd tionndadh _dorcha dhen ùrlar" -+msgid "Use _dark theme variant" -+msgstr "Cleachd tionndadh _dorcha dhen ùrlar" -diff --git a/po/gl.po b/po/gl.po -index ad9af1ba5ddc..bdbfa91fcf13 100644 ---- a/po/gl.po -+++ b/po/gl.po -@@ -2106,11 +2106,11 @@ msgstr "P_echar a xanela" - #~ msgid "Missing command" - #~ msgstr "Falta a orde" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Indica se se usa a variante de tema escura" -+msgid "Whether to use a dark theme variant" -+msgstr "Indica se se usa a variante de tema escura" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Usar variante do tema _escuro" -+msgid "Use _dark theme variant" -+msgstr "Usar variante do tema _escuro" - - #~ msgid "_Use the system fixed width font" - #~ msgstr "_Usar o tipo de letra de largura fixa do sistema" -@@ -3060,8 +3060,8 @@ msgstr "P_echar a xanela" - #~ msgid "Background image _scrolls" - #~ msgstr "A imaxe de fondo _desprázase" - --#~ msgid "_Transparent background" --#~ msgstr "Fondo _transparente" -+msgid "Transparent background" -+msgstr "Fondo transparente" - - #~ msgid "S_hade transparent or image background:" - #~ msgstr "_Sombra transparente ou imaxe de fondo:" -diff --git a/po/gu.po b/po/gu.po -index 0bcb1954f634..f72a807d6e2b 100644 ---- a/po/gu.po -+++ b/po/gu.po -@@ -2944,8 +2944,8 @@ msgstr "વિન્ડો બંધ કરો (_l)" - #~ msgid "_Solid color" - #~ msgstr "ઘટ્ટ રંગ (_S)" - --#~ msgid "_Transparent background" --#~ msgstr "પારદર્શક પાશ્વ ભાગનો ભાગ (_T)" -+msgid "Transparent background" -+msgstr "પારદર્શક પાશ્વ ભાગનો ભાગ" - - #~ msgid "No such profile \"%s\", using default profile\n" - #~ msgstr "\"%s\" જેવી કોઈ રૂપરેખા નથી, મૂળભૂત રૂપરેખા વાપરી રહ્યા છે\n" -diff --git a/po/he.po b/po/he.po -index f3b83b93f20f..68008ceda2d5 100644 ---- a/po/he.po -+++ b/po/he.po -@@ -2054,11 +2054,11 @@ msgstr "סגירת ה_חלון" - #~ msgid "Missing command" - #~ msgstr "Missing command" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Whether to use a dark theme variant" -+msgid "Whether to use a dark theme variant" -+msgstr "Whether to use a dark theme variant" - --#~ msgid "Use _dark theme variant" --#~ msgstr "שימוש בערכת עיצוב בהגוון _כהה" -+msgid "Use _dark theme variant" -+msgstr "שימוש בערכת עיצוב בהגוון _כהה" - - #~ msgid "Set the terminal title" - #~ msgstr "Set the terminal title" -@@ -3013,8 +3013,8 @@ msgstr "סגירת ה_חלון" - #~ msgid "_Solid color" - #~ msgstr "צבע _אחיד" - --#~ msgid "_Transparent background" --#~ msgstr "רקע _שקוף" -+msgid "Transparent background" -+msgstr "רקע שקוף" - - #~ msgid "No such profile \"%s\", using default profile\n" - #~ msgstr "No such profile \"%s\", using default profile\n" -diff --git a/po/hi.po b/po/hi.po -index 2d7dc5b14008..adf8d35e8d3f 100644 ---- a/po/hi.po -+++ b/po/hi.po -@@ -2979,8 +2979,8 @@ msgstr "विंडो बंद करें (_l)" - #~ msgid "_Background image" - #~ msgstr "पृष्ठभूमि छवि (_B)" - --#~ msgid "_Transparent background" --#~ msgstr "पारदर्शी पृष्ठभूमि (_T)" -+msgid "Transparent background" -+msgstr "पारदर्शी पृष्ठभूमि" - - #~ msgid "S/Key Challenge Response" - #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया" -diff --git a/po/hr.po b/po/hr.po -index cb48c52f708c..747cf488e7b4 100644 ---- a/po/hr.po -+++ b/po/hr.po -@@ -1362,8 +1362,8 @@ msgid "_Text color:" - msgstr "_Boja teksta:" - - #: ../src/profile-preferences.glade.h:69 --msgid "_Transparent background" --msgstr "_Prozirna pozadina" -+msgid "Transparent background" -+msgstr "Prozirna pozadina" - - #: ../src/profile-preferences.glade.h:70 - msgid "_Update login records when command is launched" -diff --git a/po/hu.po b/po/hu.po -index 62f6b48de0b5..16fd9439489b 100644 ---- a/po/hu.po -+++ b/po/hu.po -@@ -2090,11 +2090,11 @@ msgstr "_Ablak bezárása" - #~ msgid "Missing command" - #~ msgstr "Hiányzó parancs" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Használja-e a sötét témaváltozatot" -+msgid "Whether to use a dark theme variant" -+msgstr "Használja-e a sötét témaváltozatot" - --#~ msgid "Use _dark theme variant" --#~ msgstr "_Sötét témaváltozat használata" -+msgid "Use _dark theme variant" -+msgstr "_Sötét témaváltozat használata" - - #~ msgid "Set the terminal title" - #~ msgstr "A terminál címének beállítása" -@@ -2513,3 +2513,6 @@ msgstr "_Ablak bezárása" - - #~ msgid "Background type" - #~ msgstr "Háttér típusa" -+ -+msgid "Transparent background" -+msgstr "Áttetsző háttér" -diff --git a/po/hy.po b/po/hy.po -index 558490157ada..caadbba37c5d 100644 ---- a/po/hy.po -+++ b/po/hy.po -@@ -1011,8 +1011,8 @@ msgid "_Text color:" - msgstr "_Տեքստի գույնը՝" - - #: ../src/profile-preferences.glade.h:73 --msgid "_Transparent background" --msgstr "_Թափանցիկ նախադրյալ" -+msgid "Transparent background" -+msgstr "Թափանցիկ նախադրյալ" - - #: ../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 595a325a574d..99c29b6d855b 100644 ---- a/po/id.po -+++ b/po/id.po -@@ -2058,3 +2058,6 @@ msgstr "" - #: ../src/terminal-window.c:3694 - msgid "C_lose Window" - msgstr "Tutup Jende_la" -+ -+msgid "Transparent background" -+msgstr "Latar belakang transparan" -diff --git a/po/it.po b/po/it.po -index 491303dfe349..af13ad9ca310 100644 ---- a/po/it.po -+++ b/po/it.po -@@ -2105,3 +2105,6 @@ msgstr "Chiudi _finestra" - - #~ msgid "_Update login records when command is launched" - #~ msgstr "_Aggiornare i record di login quando il comando viene eseguito" -+ -+msgid "Transparent background" -+msgstr "Sfondo trasparente" -diff --git a/po/ja.po b/po/ja.po -index f7235d9f4a0b..63d7fd7bb943 100644 ---- a/po/ja.po -+++ b/po/ja.po -@@ -1907,3 +1907,6 @@ msgstr "ウィンドウを閉じる(_L)" - - #~ msgid "_Update login records when command is launched" - #~ msgstr "コマンドを実行した時にログイン記録を更新する(_U)" -+ -+msgid "Transparent background" -+msgstr "透過な画像にする" -diff --git a/po/ka.po b/po/ka.po -index 8415e88f94ff..3717b7e75dcd 100644 ---- a/po/ka.po -+++ b/po/ka.po -@@ -568,7 +568,7 @@ msgstr "_ტექსტის ფერი:" - - #: ../src/gnome-terminal.glade2.h:86 - #, fuzzy --msgid "_Transparent background" -+msgid "Transparent background" - msgstr "გამჭირვალე" - - #: ../src/gnome-terminal.glade2.h:87 -diff --git a/po/kk.po b/po/kk.po -index ed86f1b70460..639411cfce86 100644 ---- a/po/kk.po -+++ b/po/kk.po -@@ -2024,14 +2024,17 @@ msgstr "Терезені жа_бу" - #~ msgid "Missing command" - #~ msgstr "Команда жоқ болып тұр" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Қараңғылау тема нұсқасын қолдану керек пе" -+msgid "Whether to use a dark theme variant" -+msgstr "Қараңғылау тема нұсқасын қолдану керек пе" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Теманың қ_араңғы нұсқасын қолдану" -+msgid "Use _dark theme variant" -+msgstr "Теманың қ_араңғы нұсқасын қолдану" - - #~ msgid "COMMAND" - #~ msgstr "КОМАНДА" - - #~ msgid "Be quiet" - #~ msgstr "Тыныш болу" -+ -+msgid "Transparent background" -+msgstr "Мөлдір фон" -diff --git a/po/kn.po b/po/kn.po -index c887f88a2c87..e899ef3ca8c1 100644 ---- a/po/kn.po -+++ b/po/kn.po -@@ -2344,3 +2344,6 @@ msgstr "ಕಿಟಕಿಯನ್ನು ಮುಚ್ಚು (_l)" - - #~ msgid "_Title:" - #~ msgstr "ಶೀರ್ಷಿಕೆ(_T):" -+ -+msgid "Transparent background" -+msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ" -diff --git a/po/ko.po b/po/ko.po -index 57c120389ac9..a41296a7fb0a 100644 ---- a/po/ko.po -+++ b/po/ko.po -@@ -2079,8 +2079,11 @@ msgstr "창 닫기(_L)" - #~ msgid "Missing command" - #~ msgstr "명령어 없음" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "어두운 테마를 사용할 지 여부" -+msgid "Whether to use a dark theme variant" -+msgstr "어두운 테마를 사용할 지 여부" - --#~ msgid "Use _dark theme variant" --#~ msgstr "어두운 테마 사용(_D)" -+msgid "Use _dark theme variant" -+msgstr "어두운 테마 사용(_D)" -+ -+msgid "Transparent background" -+msgstr "투명한 배경" -diff --git a/po/ku.po b/po/ku.po -index 221825b29cd9..96e35811337b 100644 ---- a/po/ku.po -+++ b/po/ku.po -@@ -557,8 +557,8 @@ msgid "_Text color:" - msgstr "Rengê _nivîsê:" - - #: ../src/gnome-terminal.glade2.h:86 --msgid "_Transparent background" --msgstr "Rûerdê _transparan" -+msgid "Transparent background" -+msgstr "Rûerdê transparan" - - #: ../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 8c9c9e660d28..71411ab7cf5b 100644 ---- a/po/lt.po -+++ b/po/lt.po -@@ -2085,8 +2085,11 @@ msgstr "_Užverti langą" - #~ msgid "Missing command" - #~ msgstr "Trūksta komandos" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Ar naudoti tamsų temos variantą" -+msgid "Whether to use a dark theme variant" -+msgstr "Ar naudoti tamsų temos variantą" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Nau_doti tamsų temos variantą" -+msgid "Use _dark theme variant" -+msgstr "Nau_doti tamsų temos variantą" -+ -+msgid "Transparent background" -+msgstr "Permatomas fonas" -diff --git a/po/lv.po b/po/lv.po -index 80a13ab6cac9..0360452e7b61 100644 ---- a/po/lv.po -+++ b/po/lv.po -@@ -2048,3 +2048,6 @@ msgstr "" - #: ../src/terminal-window.c:3694 - msgid "C_lose Window" - msgstr "Aizvērt _logu" -+ -+msgid "Transparent background" -+msgstr "Caurspīdīgs fons" -diff --git a/po/mai.po b/po/mai.po -index 9b984a068fda..a3c0e178ae67 100644 ---- a/po/mai.po -+++ b/po/mai.po -@@ -1290,8 +1290,8 @@ msgid "_Text color:" - msgstr "पाठ रँग (_T):" - - #: ../src/profile-preferences.glade.h:69 --msgid "_Transparent background" --msgstr "पारदर्शी पृष्ठभूमि (_T)" -+msgid "Transparent background" -+msgstr "पारदर्शी पृष्ठभूमि" - - #: ../src/profile-preferences.glade.h:70 - msgid "_Update login records when command is launched" -diff --git a/po/mg.po b/po/mg.po -index 1c1895c98ba9..a805417893ed 100644 ---- a/po/mg.po -+++ b/po/mg.po -@@ -566,8 +566,8 @@ msgid "_Text color:" - msgstr "Lokon'ny _soratra:" - - #: ../src/gnome-terminal.glade2.h:86 --msgid "_Transparent background" --msgstr "_Afara tatera-pahazavana" -+msgid "Transparent background" -+msgstr "Afara tatera-pahazavana" - - #: ../src/gnome-terminal.glade2.h:87 - msgid "_Update login records when command is launched" -diff --git a/po/mk.po b/po/mk.po -index e31378a5726b..d2b74d4438d1 100644 ---- a/po/mk.po -+++ b/po/mk.po -@@ -1166,8 +1166,8 @@ msgid "_Text color:" - msgstr "_Боја на текстот:" - - #: ../src/profile-preferences.glade.h:77 --msgid "_Transparent background" --msgstr "_Транспарентна позадина" -+msgid "Transparent background" -+msgstr "Транспарентна позадина" - - #: ../src/profile-preferences.glade.h:78 - #| msgid "_Text color:" -diff --git a/po/ml.po b/po/ml.po -index cc1928dcda63..62abd2131499 100644 ---- a/po/ml.po -+++ b/po/ml.po -@@ -2751,8 +2751,8 @@ msgstr "ടെര്‍മിനല്‍ അ_ടയ്ക്കുക" - #~ msgid "_Solid color" - #~ msgstr "_സോളിഡ് നിറം" - --#~ msgid "_Transparent background" --#~ msgstr "_പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം" -+msgid "Transparent background" -+msgstr "പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം" - - #~ msgid "S/Key Challenge Response" - #~ msgstr "S/Key ചാലഞ്ച് മറുപടി" -diff --git a/po/mn.po b/po/mn.po -index 4922041e09f9..9696b7f981f1 100644 ---- a/po/mn.po -+++ b/po/mn.po -@@ -617,8 +617,8 @@ msgid "_Text color:" - msgstr "_Текстийн өнгө:" - - #: ../src/gnome-terminal.glade2.h:102 --msgid "_Transparent background" --msgstr "_Тунгалаг дэвсгэр" -+msgid "Transparent background" -+msgstr "Тунгалаг дэвсгэр" - - #: ../src/gnome-terminal.glade2.h:103 - msgid "_Update login records when command is launched" -diff --git a/po/mr.po b/po/mr.po -index 61997dafbd03..50451d7b8e60 100644 ---- a/po/mr.po -+++ b/po/mr.po -@@ -3015,8 +3015,8 @@ msgstr "चौकट बंद करा (_l)" - #~ msgid "_Solid color" - #~ msgstr "गडद रंग (_S)" - --#~ msgid "_Transparent background" --#~ msgstr "पारदर्शी पार्श्वभूमी(_T)" -+msgid "Transparent background" -+msgstr "पारदर्शी पार्श्वभूमी" - - #~ msgid "Disabled" - #~ msgstr "अकार्यान्वीतित" -diff --git a/po/ms.po b/po/ms.po -index 5b663aae2639..38a2afeecd2f 100644 ---- a/po/ms.po -+++ b/po/ms.po -@@ -630,8 +630,8 @@ msgid "_Text color:" - msgstr "Warna _Teks:" - - #: ../src/gnome-terminal.glade2.h:102 --msgid "_Transparent background" --msgstr "LatarBelakang _Telus" -+msgid "Transparent background" -+msgstr "LatarBelakang Telus" - - #: ../src/gnome-terminal.glade2.h:103 - msgid "_Update login records when command is launched" -diff --git a/po/nb.po b/po/nb.po -index eda809fab581..7ceaf06ca263 100644 ---- a/po/nb.po -+++ b/po/nb.po -@@ -2046,3 +2046,6 @@ msgstr "" - #: ../src/terminal-window.c:3694 - msgid "C_lose Window" - msgstr "_Lukk vindu" -+ -+msgid "Transparent background" -+msgstr "Gjennomsiktig bakgrunn" -diff --git a/po/nds.po b/po/nds.po -index 98a12875e382..94fd757d3e5c 100644 ---- a/po/nds.po -+++ b/po/nds.po -@@ -995,8 +995,8 @@ msgid "_Text color:" - msgstr "_Textklöör:" - - #: ../src/profile-preferences.glade.h:73 --msgid "_Transparent background" --msgstr "_Döörschienenachtergrund:" -+msgid "Transparent background" -+msgstr "Döörschienenachtergrund:" - - #: ../src/profile-preferences.glade.h:74 - msgid "_Update login records when command is launched" -diff --git a/po/ne.po b/po/ne.po -index 4fe16cc88a9a..d9a90adbf693 100644 ---- a/po/ne.po -+++ b/po/ne.po -@@ -2398,8 +2398,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्" - #~ msgid "_None (use solid color)" - #~ msgstr "कुनै पनि होइन (एउटै रङ प्रयोग गर्नुहोस्)" - --#~ msgid "_Transparent background" --#~ msgstr "पारदर्शी पृष्ठभूमि" -+msgid "Transparent background" -+msgstr "पारदर्शी पृष्ठभूमि" - - #~ msgid "_Use the system fixed width font" - #~ msgstr "प्रणाली निश्चित गरिएको फन्ट चौडाइ प्रयोग गर्नुहोस्" -diff --git a/po/nl.po b/po/nl.po -index a51720be1610..111b032c89fa 100644 ---- a/po/nl.po -+++ b/po/nl.po -@@ -2352,3 +2352,6 @@ msgstr "Venster sl_uiten" - - #~ msgid "Switch to Tab 12" - #~ msgstr "Ga naar tab 12" -+ -+msgid "Transparent background" -+msgstr "Transparante achtergrond" -diff --git a/po/nn.po b/po/nn.po -index 91cd6ab918c9..92844590fcbe 100644 ---- a/po/nn.po -+++ b/po/nn.po -@@ -1428,8 +1428,8 @@ msgid "_Text color:" - msgstr "_Tekstfarge:" - - #: ../src/profile-preferences.glade.h:73 --msgid "_Transparent background" --msgstr "_Gjennomskinleg bakgrunn" -+msgid "Transparent background" -+msgstr "Gjennomskinleg bakgrunn" - - #: ../src/profile-preferences.glade.h:74 - msgid "_Update login records when command is launched" -diff --git a/po/oc.po b/po/oc.po -index 194f13593def..04419c1e5ff9 100644 ---- a/po/oc.po -+++ b/po/oc.po -@@ -2106,11 +2106,11 @@ msgstr "Tampar _la fenèstra" - #~ msgid "Missing command" - #~ msgstr "Comanda mancanta" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Indica se cal utilizar una variante de tèma foncée" -+msgid "Whether to use a dark theme variant" -+msgstr "Indica se cal utilizar una variante de tèma foncée" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Utilizar una variante de tèma _foncée" -+msgid "Use _dark theme variant" -+msgstr "Utilizar una variante de tèma _foncée" - - #~ msgid "Palette for terminal applications" - #~ msgstr "Paleta per las aplicacions tèxte" -@@ -3195,8 +3195,8 @@ msgstr "Tampar _la fenèstra" - #~ msgid "Run;" - #~ msgstr "Executar;Consòla;Shell;" - --#~ msgid "_Transparent background" --#~ msgstr "Rèire plan _transparent" -+msgid "Transparent background" -+msgstr "Rèire plan transparent" - - #~ msgid "" - #~ "A subset of possible encodings are presented in the Encoding submenu. " -diff --git a/po/or.po b/po/or.po -index ec1e6bfb9a28..218acd712df6 100644 ---- a/po/or.po -+++ b/po/or.po -@@ -2705,8 +2705,8 @@ msgstr "ଶୀର୍ଷକ (_T):" - #~ msgid "Background image _scrolls" - #~ msgstr "ପୃଷ୍ଠଭୂମି ଚିତ୍ର ସ୍କ୍ରୋଲଗୁଡିକ (_s)" - --#~ msgid "_Transparent background" --#~ msgstr "ସ୍ବଚ୍ଛ ପୃଷ୍ଠଭୂମି (_T)" -+msgid "Transparent background" -+msgstr "ସ୍ବଚ୍ଛ ପୃଷ୍ଠଭୂମି" - - #~ msgid "S_hade transparent or image background:" - #~ msgstr "ଛାୟା ସ୍ବଚ୍ଛ କିମ୍ବା ଚିତ୍ର ପୃଷ୍ଠଭୂମି (_h):" -diff --git a/po/pa.po b/po/pa.po -index 9c95b66e7185..5e5b8ba4f104 100644 ---- a/po/pa.po -+++ b/po/pa.po -@@ -3008,8 +3008,8 @@ msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ(_l)" - #~ msgid "_Solid color" - #~ msgstr "ਇੱਕ ਰੰਗ ਵਰਤੋਂ(_S)" - --#~ msgid "_Transparent background" --#~ msgstr "ਪਾਰਦਰਸ਼ੀ ਬੈਕਗਰਾਊਂਡ(_T)" -+msgid "Transparent background" -+msgstr "ਪਾਰਦਰਸ਼ੀ ਬੈਕਗਰਾਊਂਡ" - - #~ msgid "S/Key Challenge Response" - #~ msgstr "S/ਸਵਿੱਚ ਚੈਲੰਜ਼ ਜਵਾਬ" -diff --git a/po/pl.po b/po/pl.po -index 609ffc36b5a4..f50b535b80fd 100644 ---- a/po/pl.po -+++ b/po/pl.po -@@ -2106,3 +2106,6 @@ msgid "" - msgstr "" - "Wartość między 0 a 100, gdzie 0 oznacza nieprzezroczystość, a 100 oznacza " - "całkowitą przezroczystość." -+ -+msgid "Transparent background" -+msgstr "Przezroczyste tło" -diff --git a/po/ps.po b/po/ps.po -index b1de52c2ff34..a16ac4937d1a 100644 ---- a/po/ps.po -+++ b/po/ps.po -@@ -1052,8 +1052,8 @@ msgid "_Text color:" - msgstr ":د ليکنې رنګ_" - - #: ../src/profile-preferences.glade.h:69 --msgid "_Transparent background" --msgstr "روڼ شاليد_" -+msgid "Transparent background" -+msgstr "روڼ شاليد" - - #: ../src/profile-preferences.glade.h:70 - msgid "_Update login records when command is launched" -diff --git a/po/pt.po b/po/pt.po -index 2b37c0df18fa..ffd18b2d187b 100644 ---- a/po/pt.po -+++ b/po/pt.po -@@ -2077,11 +2077,11 @@ msgstr "Fechar jane_La" - #~ "Se verdadeiro, os registos de sistema de início de sessão utmp e wtmp " - #~ "serão atualizados ao iniciar um comando dentro do terminal." - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Se utilizar ou não uma variante escura do tema" -+msgid "Whether to use a dark theme variant" -+msgstr "Se utilizar ou não uma variante escura do tema" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Utilizar variante _escura de tema" -+msgid "Use _dark theme variant" -+msgstr "Utilizar variante _escura de tema" - - #~ msgid "_Update login records when command is launched" - #~ msgstr "_Atualizar os registos de início de sessão ao executar um comando" -@@ -2975,8 +2975,8 @@ msgstr "Fechar jane_La" - #~ msgid "Background image _scrolls" - #~ msgstr "Imagem de fundo _rola" - --#~ msgid "_Transparent background" --#~ msgstr "Fundo _transparente" -+msgid "Transparent background" -+msgstr "Fundo transparente" - - #~ 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 dee5c31593cd..3c0a7d09e1a2 100644 ---- a/po/pt_BR.po -+++ b/po/pt_BR.po -@@ -2116,11 +2116,11 @@ msgstr "_Fechar janela" - #~ msgid "TITLE" - #~ msgstr "TÍTULO" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Se deve ou não usar uma variante de tema escuro" -+msgid "Whether to use a dark theme variant" -+msgstr "Se deve ou não usar uma variante de tema escuro" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Usar variante de tema es_curo" -+msgid "Use _dark theme variant" -+msgstr "Usar variante de tema es_curo" - - #~ msgid "COMMAND" - #~ msgstr "COMANDO" -@@ -2878,3 +2878,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\"" -+ -+msgid "Transparent background" -+msgstr "Fundo transparente" -diff --git a/po/ro.po b/po/ro.po -index 179dd77fd166..f7fc7ae070cf 100644 ---- a/po/ro.po -+++ b/po/ro.po -@@ -1576,8 +1576,8 @@ msgid "_Text color:" - msgstr "Culoare _text:" - - #: ../src/profile-preferences.glade.h:77 --msgid "_Transparent background" --msgstr "Fundal _transparent" -+msgid "Transparent background" -+msgstr "Fundal transparent" - - #: ../src/profile-preferences.glade.h:78 - msgid "_Underline color:" -diff --git a/po/ru.po b/po/ru.po -index 1a6fbd95b4ba..4551e12f255b 100644 ---- a/po/ru.po -+++ b/po/ru.po -@@ -2065,3 +2065,6 @@ msgstr "" - #: ../src/terminal-window.c:3694 - msgid "C_lose Window" - msgstr "_Закрыть окно" -+ -+msgid "Transparent background" -+msgstr "Прозрачный фон" -diff --git a/po/rw.po b/po/rw.po -index 3f0223162995..b7fff4cb3ce4 100644 ---- a/po/rw.po -+++ b/po/rw.po -@@ -748,7 +748,7 @@ msgstr "Ibara ry'Inyandiko..." - - #: ../src/gnome-terminal.glade2.h:102 - #, fuzzy --msgid "_Transparent background" -+msgid "Transparent background" - msgstr "Mbuganyuma" - - #: ../src/gnome-terminal.glade2.h:103 -diff --git a/po/si.po b/po/si.po -index 81dbf6589f89..5cb0e5ad52cc 100644 ---- a/po/si.po -+++ b/po/si.po -@@ -537,8 +537,8 @@ msgid "_Text color:" - msgstr "පෙළ වර්‍ණ: (_T)" - - #: ../src/gnome-terminal.glade2.h:86 --msgid "_Transparent background" --msgstr "විනිවිද පෙනෙන පසුබිම (_T)" -+msgid "Transparent background" -+msgstr "විනිවිද පෙනෙන පසුබිම" - - #: ../src/gnome-terminal.glade2.h:87 - msgid "_Update login records when command is launched" -diff --git a/po/sk.po b/po/sk.po -index 3a8ede3b61f4..b9744bc7c14c 100644 ---- a/po/sk.po -+++ b/po/sk.po -@@ -2165,11 +2165,11 @@ msgstr "_Zavrieť okno" - #~ msgstr "TITULOK" - - # gsetting summary --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Či použiť tmavú verziu témy" -+msgid "Whether to use a dark theme variant" -+msgstr "Či použiť tmavú verziu témy" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Použiť _tmavú verziu témy" -+msgid "Use _dark theme variant" -+msgstr "Použiť _tmavú verziu témy" - - #~ msgid "COMMAND" - #~ msgstr "PRÍKAZ" -@@ -2188,3 +2188,6 @@ msgstr "_Zavrieť okno" - #~ " shell Spustí použivateľský shell v novom termináli\n" - #~ "\n" - #~ "Viac informácii o jednotlivých príkazoch získate pomocou „%s PRÍKAZ --help“.\n" -+ -+msgid "Transparent background" -+msgstr "Priehľadné pozadie" -diff --git a/po/sl.po b/po/sl.po -index 72baf7b1e8ad..d7ff33ccfe8e 100644 ---- a/po/sl.po -+++ b/po/sl.po -@@ -2066,11 +2066,11 @@ msgstr "_Zapri okno" - #~ msgid "Missing command" - #~ msgstr "Manjka ukaz" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Ali naj se uporabi temna tema okna" -+msgid "Whether to use a dark theme variant" -+msgstr "Ali naj se uporabi temna tema okna" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Uporabi _temno temo" -+msgid "Use _dark theme variant" -+msgstr "Uporabi _temno temo" - - #~ msgid "Set the terminal title" - #~ msgstr "Nastavi naziv terminala" -@@ -2322,3 +2322,6 @@ msgstr "_Zapri okno" - - #~ msgid "_Profile Preferences…" - #~ msgstr "Možnosti _profila ..." -+ -+msgid "Transparent background" -+msgstr "Prosojno ozadje" -diff --git a/po/sq.po b/po/sq.po -index e59c0b69d8f8..6fb409043319 100644 ---- a/po/sq.po -+++ b/po/sq.po -@@ -567,8 +567,8 @@ msgstr "Ngjyra e _tekstit:" - - # (pofilter) simplecaps: checks the capitalisation of two strings isn't wildly different - #: ../src/gnome-terminal.glade2.h:85 --msgid "_Transparent background" --msgstr "Sfond _Trasparent" -+msgid "Transparent background" -+msgstr "Sfond Trasparent" - - #: ../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 fce0f63524ce..89111b19d08d 100644 ---- a/po/sr.po -+++ b/po/sr.po -@@ -2174,11 +2174,11 @@ msgstr "_Затвори прозор" - #~ msgid "Keyboard shortcut to set the terminal title" - #~ msgstr "Пречица за постављање наслова терминала" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Да ли ће бити коришћена варијанта тамне теме" -+msgid "Whether to use a dark theme variant" -+msgstr "Да ли ће бити коришћена варијанта тамне теме" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Користи варијанту _тамне теме" -+msgid "Use _dark theme variant" -+msgstr "Користи варијанту _тамне теме" - - #~ msgid "_Use the system fixed width font" - #~ msgstr "_Користи системски словни лик сталне ширине" -@@ -2230,3 +2230,6 @@ msgstr "_Затвори прозор" - - #~ msgid "Close Window" - #~ msgstr "Затвори прозор" -+ -+msgid "Transparent background" -+msgstr "Провидна позадина" -diff --git a/po/sr@latin.po b/po/sr@latin.po -index c82646ca4451..4ba3d9588643 100644 ---- a/po/sr@latin.po -+++ b/po/sr@latin.po -@@ -2174,11 +2174,11 @@ msgstr "_Zatvori prozor" - #~ msgid "Keyboard shortcut to set the terminal title" - #~ msgstr "Prečica za postavljanje naslova terminala" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Da li će biti korišćena varijanta tamne teme" -+msgid "Whether to use a dark theme variant" -+msgstr "Da li će biti korišćena varijanta tamne teme" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Koristi varijantu _tamne teme" -+msgid "Use _dark theme variant" -+msgstr "Koristi varijantu _tamne teme" - - #~ msgid "_Use the system fixed width font" - #~ msgstr "_Koristi sistemski slovni lik stalne širine" -@@ -2230,3 +2230,6 @@ msgstr "_Zatvori prozor" - - #~ msgid "Close Window" - #~ msgstr "Zatvori prozor" -+ -+msgid "Transparent background" -+msgstr "Providna pozadina" -diff --git a/po/sv.po b/po/sv.po -index 745f7d985494..2cfce8bc6254 100644 ---- a/po/sv.po -+++ b/po/sv.po -@@ -2073,5 +2073,8 @@ msgstr "Stän_g fönster" - #~ msgid "Unknown completion request for \"%s\"" - #~ msgstr "Okänd kompletteringsbegäran för \"%s\"" - -+msgid "Transparent background" -+msgstr "Genomskinlig bakgrund" -+ - #~ msgid "Missing command" - #~ msgstr "Kommando saknas" -diff --git a/po/ta.po b/po/ta.po -index 80aa2f684eec..61185b47f911 100644 ---- a/po/ta.po -+++ b/po/ta.po -@@ -3028,8 +3028,8 @@ msgstr "_l சாளரத்தை மூடவும்" - #~ msgid "_Solid color" - #~ msgstr "(_S) ஒரே வண்ணம்" - --#~ msgid "_Transparent background" --#~ msgstr "_T புலப்பாடு பின்னணி" -+msgid "Transparent background" -+msgstr "புலப்பாடு பின்னணி" - - #~ msgid "No such profile \"%s\", using default profile\n" - #~ msgstr "\"%s\" என்ற வரியுரு கிடையாது, முன்னிருப்பு வரியுரு பயன்படுத்தப்படும்\n" -diff --git a/po/te.po b/po/te.po -index 000cda30f86c..6dcf79399604 100644 ---- a/po/te.po -+++ b/po/te.po -@@ -2898,8 +2898,8 @@ msgstr "కిటికీని మూసివేయి (_l)" - #~ msgid "Background image _scrolls" - #~ msgstr "నేపథ్యచిత్రము స్క్రాల్స్ (_s)" - --#~ msgid "_Transparent background" --#~ msgstr "పారదర్శక నేపథ్యం (_T)" -+msgid "Transparent background" -+msgstr "పారదర్శక నేపథ్యం" - - #~ msgid "S_hade transparent or image background:" - #~ msgstr "పారదర్శకంగా మారు లేదా చిత్రము బ్యాక్‌గ్రౌండ్ కు మారు(_h):" -diff --git a/po/tg.po b/po/tg.po -index e3feef658e1e..a772744f269a 100644 ---- a/po/tg.po -+++ b/po/tg.po -@@ -2096,11 +2096,11 @@ msgstr "П_ӯшонидани равзана" - #~ msgid "Show server options" - #~ msgstr "Намоиши имконоти сервер" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Оё варианти мавзӯи торик истифода шавад" -+msgid "Whether to use a dark theme variant" -+msgstr "Оё варианти мавзӯи торик истифода шавад" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Истифодаи _варианти мавзӯи торик" -+msgid "Use _dark theme variant" -+msgstr "Истифодаи _варианти мавзӯи торик" - - #~ msgid "_Use the system fixed width font" - #~ msgstr "_Истифодаи шрифти бараш бо система таъиншуда" -diff --git a/po/th.po b/po/th.po -index f7a8d674657e..b0cc3a6014c2 100644 ---- a/po/th.po -+++ b/po/th.po -@@ -2040,11 +2040,11 @@ msgstr "ปิ_ดหน้าต่าง" - #~ msgid "Missing command" - #~ msgstr "ขาดคำสั่ง" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "ใช้ชุดตกแต่งแบบสีเข้มหรือไม่" -+msgid "Whether to use a dark theme variant" -+msgstr "ใช้ชุดตกแต่งแบบสีเข้มหรือไม่" - --#~ msgid "Use _dark theme variant" --#~ msgstr "ใช้ชุดตกแต่งแบบสีเ_ข้ม" -+msgid "Use _dark theme variant" -+msgstr "ใช้ชุดตกแต่งแบบสีเ_ข้ม" - - #~ msgid "_Use the system fixed width font" - #~ msgstr "ใ_ช้แบบอักษรความกว้างคงที่ของระบบ" -@@ -2622,8 +2622,8 @@ msgstr "ปิ_ดหน้าต่าง" - #~ msgid "_Solid color" - #~ msgstr "สี_ทึบ" - --#~ msgid "_Transparent background" --#~ msgstr "พื้นหลังโปร่งแ_สง" -+msgid "Transparent background" -+msgstr "พื้นหลังโปร่งแสง" - - #~ 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 f7c68e62d9da..316587c0a7b2 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -1963,3 +1963,6 @@ msgstr "Hala bir süreç bu uçbirimde çalışıyor. Uçbirimi kapatmak onu son - #: ../src/terminal-window.c:3694 - msgid "C_lose Window" - msgstr "_Pencereyi Kapat" -+ -+msgid "Transparent background" -+msgstr "Şeffaf arkaplan" -diff --git a/po/ug.po b/po/ug.po -index 1673bb32d9db..e21e61e829d7 100644 ---- a/po/ug.po -+++ b/po/ug.po -@@ -2616,8 +2616,8 @@ msgstr "ماۋزۇ (_T):" - #~ msgid "_Solid color" - #~ msgstr "ساپ رەڭ(_S)" - --#~ msgid "_Transparent background" --#~ msgstr "سۈزۈك تەگلىك(_T)" -+msgid "Transparent background" -+msgstr "سۈزۈك تەگلىك" - - #~ msgid "" - #~ "You already have a profile called “%s”. Do you want to create another " -diff --git a/po/uk.po b/po/uk.po -index a8db018e0a9d..4b90b5c5ad9b 100644 ---- a/po/uk.po -+++ b/po/uk.po -@@ -2075,11 +2075,11 @@ msgstr "Закр_ити вікно" - #~ msgid "Missing command" - #~ msgstr "Бракує команди" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Чи використовувати темний варіант теми" -+msgid "Whether to use a dark theme variant" -+msgstr "Чи використовувати темний варіант теми" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Використовувати _темний варіант теми" -+msgid "Use _dark theme variant" -+msgstr "Використовувати _темний варіант теми" - - #~ msgid "COMMAND" - #~ msgstr "КОМАНДА" -@@ -2946,8 +2946,8 @@ msgstr "Закр_ити вікно" - #~ msgid "_Solid color" - #~ msgstr "_Суцільний колір" - --#~ msgid "_Transparent background" --#~ msgstr "П_розоре тло" -+msgid "Transparent background" -+msgstr "Прозоре тло" - - #~ msgid "Switch to Tab 2" - #~ msgstr "До вкладки 2" -diff --git a/po/vi.po b/po/vi.po -index e9439179d514..e22040ac3233 100644 ---- a/po/vi.po -+++ b/po/vi.po -@@ -2059,11 +2059,11 @@ msgstr "Đón_g cửa sổ" - #~ msgid "Missing command" - #~ msgstr "Thiếu lệnh" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "Có nên dùng biến thể chủ đề tối hay không" -+msgid "Whether to use a dark theme variant" -+msgstr "Có nên dùng biến thể chủ đề tối hay không" - --#~ msgid "Use _dark theme variant" --#~ msgstr "Dùng biến thể chủ đề tố_i" -+msgid "Use _dark theme variant" -+msgstr "Dùng biến thể chủ đề tố_i" - - #~ msgid "Set the terminal title" - #~ msgstr "Đặt tựa đề thiết bị cuối" -@@ -2671,3 +2671,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." -+ -+msgid "Transparent background" -+msgstr "Nền trong suốt" -diff --git a/po/wa.po b/po/wa.po -index 285657194713..f068531c2928 100644 ---- a/po/wa.po -+++ b/po/wa.po -@@ -563,8 +563,8 @@ msgid "_Text color:" - msgstr "Coleur pol _tecse:" - - #: ../src/gnome-terminal.glade2.h:86 --msgid "_Transparent background" --msgstr "Fond k' on voet _houte" -+msgid "Transparent background" -+msgstr "Fond k' on voet houte" - - #: ../src/gnome-terminal.glade2.h:87 - msgid "_Update login records when command is launched" -diff --git a/po/xh.po b/po/xh.po -index e5981c6ec5bf..7f9f8049c3df 100644 ---- a/po/xh.po -+++ b/po/xh.po -@@ -620,8 +620,8 @@ msgid "_Text color:" - msgstr "_Umbala wombhalo:" - - #: ../src/gnome-terminal.glade2.h:102 --msgid "_Transparent background" --msgstr "_Okungasemva okucace gca" -+msgid "Transparent background" -+msgstr "Okungasemva okucace gca" - - #: ../src/gnome-terminal.glade2.h:103 - msgid "_Update login records when command is launched" -diff --git a/po/zh_CN.po b/po/zh_CN.po -index b18a9e78cf05..c861d33895f5 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -2037,11 +2037,11 @@ msgstr "关闭窗口(_L)" - #~ msgid "Missing command" - #~ msgstr "遗漏命令" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "是否使用暗色主题" -+msgid "Whether to use a dark theme variant" -+msgstr "是否使用暗色主题" - --#~ msgid "Use _dark theme variant" --#~ msgstr "使用暗色主题(_D)" -+msgid "Use _dark theme variant" -+msgstr "使用暗色主题(_D)" - - #~ msgid "COMMAND" - #~ msgstr "命令" -@@ -2280,3 +2280,6 @@ msgstr "关闭窗口(_L)" - - #~ msgid "_Find..." - #~ msgstr "查找(_F)..." -+ -+msgid "Transparent background" -+msgstr "透明背景" -diff --git a/po/zh_HK.po b/po/zh_HK.po -index eb0ede77e889..aceb184b2440 100644 ---- a/po/zh_HK.po -+++ b/po/zh_HK.po -@@ -2376,3 +2376,6 @@ msgstr "關閉視窗(_L)" - - #~ msgid "Show session management options" - #~ msgstr "顯示作業階段管理選項" -+ -+msgid "Transparent background" -+msgstr "透明背景" -diff --git a/po/zh_TW.po b/po/zh_TW.po -index 8326ad3b0171..a9062135a180 100644 ---- a/po/zh_TW.po -+++ b/po/zh_TW.po -@@ -2034,11 +2034,11 @@ msgstr "關閉視窗(_L)" - #~ msgid "Missing command" - #~ msgstr "遺失指令" - --#~ msgid "Whether to use a dark theme variant" --#~ msgstr "是否使用暗色系布景主題變體" -+msgid "Whether to use a dark theme variant" -+msgstr "是否使用暗色系布景主題變體" - --#~ msgid "Use _dark theme variant" --#~ msgstr "使用暗色系布景主題變體(_D)" -+msgid "Use _dark theme variant" -+msgstr "使用暗色系布景主題變體(_D)" - - #~ msgid "_Use the system fixed width font" - #~ msgstr "使用系統的固定寬度字型(_U)" -@@ -2383,3 +2383,6 @@ msgstr "關閉視窗(_L)" - - #~ msgid "Show session management options" - #~ msgstr "顯示作業階段管理選項" -+ -+msgid "Transparent background" -+msgstr "透明背景" --- -2.1.0 - diff --git a/gnome-terminal-wayland-transparency.patch b/gnome-terminal-wayland-transparency.patch deleted file mode 100644 index 18ca359..0000000 --- a/gnome-terminal-wayland-transparency.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff -up gnome-terminal-3.18.1/src/terminal-screen.c.wayland-transparency gnome-terminal-3.18.1/src/terminal-screen.c ---- gnome-terminal-3.18.1/src/terminal-screen.c.wayland-transparency 2015-10-20 16:36:08.388459536 -0400 -+++ gnome-terminal-3.18.1/src/terminal-screen.c 2015-10-20 16:40:49.236462437 -0400 -@@ -137,6 +137,8 @@ static void terminal_screen_system_font_ - static gboolean terminal_screen_popup_menu (GtkWidget *widget); - static gboolean terminal_screen_button_press (GtkWidget *widget, - GdkEventButton *event); -+static void terminal_screen_hierarchy_changed (GtkWidget *widget, -+ GtkWidget *previous_toplevel); - static gboolean terminal_screen_focus_in (GtkWidget *widget, - GdkEventFocus *event); - static gboolean terminal_screen_do_exec (TerminalScreen *screen, -@@ -461,6 +463,7 @@ terminal_screen_class_init (TerminalScre - 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; -+ widget_class->hierarchy_changed = terminal_screen_hierarchy_changed; - - terminal_class->child_exited = terminal_screen_child_exited; - terminal_class->notification_received = terminal_screen_notification_received; -@@ -836,6 +839,30 @@ terminal_screen_profile_changed_cb (GSet - } - - static void -+update_toplevel_transparency (TerminalScreen *screen) -+{ -+ GtkWidget *widget = GTK_WIDGET (screen); -+ TerminalScreenPrivate *priv = screen->priv; -+ GSettings *profile = priv->profile; -+ GtkWidget *toplevel; -+ -+ toplevel = gtk_widget_get_toplevel (widget); -+ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) -+ { -+ gboolean transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); -+ if (gtk_widget_get_app_paintable (toplevel) != transparent) -+ { -+ gtk_widget_set_app_paintable (toplevel, transparent); -+ -+ /* The opaque region of the toplevel isn't updated until the toplevel is allocated; -+ * set_app_paintable() doesn't force an allocation, so do that manually. -+ */ -+ gtk_widget_queue_resize (toplevel); -+ } -+ } -+} -+ -+static void - update_color_scheme (TerminalScreen *screen) - { - GtkWidget *widget = GTK_WIDGET (screen); -@@ -884,9 +911,7 @@ update_color_scheme (TerminalScreen *scr - colors, n_colors); - vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); - -- toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); -- if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) -- gtk_widget_set_app_paintable (toplevel, transparent); -+ update_toplevel_transparency (screen); - } - - static void -@@ -1545,6 +1570,13 @@ terminal_screen_button_press (GtkWidget - return FALSE; - } - -+static void -+terminal_screen_hierarchy_changed (GtkWidget *widget, -+ GtkWidget *previous_toplevel) -+{ -+ update_toplevel_transparency (TERMINAL_SCREEN (widget)); -+} -+ - static gboolean - terminal_screen_focus_in (GtkWidget *widget, - GdkEventFocus *event) -diff -up gnome-terminal-3.18.1/src/terminal-window.c.wayland-transparency gnome-terminal-3.18.1/src/terminal-window.c ---- gnome-terminal-3.18.1/src/terminal-window.c.wayland-transparency 2015-10-20 16:36:08.334460484 -0400 -+++ gnome-terminal-3.18.1/src/terminal-window.c 2015-10-20 16:36:08.392459466 -0400 -@@ -2235,14 +2235,19 @@ terminal_window_draw (GtkWidget *widget, - if (gtk_widget_get_app_paintable (widget)) - { - GtkStyleContext *context; -- int width; -- int height; -+ -+ /* Get the *child* allocation, so we don't overwrite window borders */ -+ GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget)); -+ GtkAllocation child_allocation; -+ gtk_widget_get_allocation (child, &child_allocation); - - context = gtk_widget_get_style_context (widget); -- width = gtk_widget_get_allocated_width (widget); -- height = gtk_widget_get_allocated_height (widget); -- gtk_render_background (context, cr, 0, 0, width, height); -- gtk_render_frame (context, cr, 0, 0, width, height); -+ gtk_render_background (context, cr, -+ child_allocation.x, child_allocation.y, -+ child_allocation.width, child_allocation.height); -+ gtk_render_frame (context, cr, -+ child_allocation.x, child_allocation.y, -+ child_allocation.width, child_allocation.height); - } - - return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); diff --git a/gnome-terminal.spec b/gnome-terminal.spec index c460b2c..e2e66a7 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -7,8 +7,8 @@ Summary: Terminal emulator for GNOME Name: gnome-terminal -Version: 3.18.1 -Release: 3%{?dist} +Version: 3.18.2 +Release: 1%{?dist} License: GPLv3+ and GFDL Group: User Interface/Desktops URL: http://www.gnome.org/ @@ -20,9 +20,7 @@ Patch0: 0001-build-Don-t-treat-warnings-as-errors.patch # https://bugzilla.gnome.org/show_bug.cgi?id=755825 Patch1: gnome-terminal-symbolic-new-tab-icon.patch -Patch100: gnome-terminal-restore-dark-transparency.patch -Patch101: gnome-terminal-command-notify.patch -Patch102: gnome-terminal-wayland-transparency.patch +Patch100: gnome-terminal-dark-transparency-notify.patch BuildRequires: dbus-x11 BuildRequires: glib2-devel >= %{glib2_version} @@ -65,9 +63,7 @@ option to the right-click context menu in Nautilus. %setup -q %patch0 -p1 -b .warnings %patch1 -p1 -b .new-tab-icon -%patch100 -p1 -b .dark-transparency -%patch101 -p1 -b .command-notify -%patch102 -p1 -b .wayland-transparency +%patch100 -p1 -b .dark-transparency-notify %build autoreconf -f -i @@ -113,6 +109,11 @@ fi %{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so %changelog +* Fri Nov 13 2015 Debarshi Ray - 3.18.2-1 +- Update to 3.18.2 +- Consolidate all downstream features into a single patch to avoid conflicts +- Rebase the translations + * Thu Nov 12 2015 Owen Taylor - 3.18.1-3 - Add patch fixing transparent mode under Wayland diff --git a/sources b/sources index 4e07bc8..9991f0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81a8fb9ef56b963c7db55e5624d4561e gnome-terminal-3.18.1.tar.xz +74013bb2077367d9fed17c300820f093 gnome-terminal-3.18.2.tar.xz