diff options
author | Peter Weber | 2016-10-20 22:33:39 +0200 |
---|---|---|
committer | Peter Weber | 2016-10-20 22:33:39 +0200 |
commit | f0ece7805dd7273807eed48757032e53c043ba51 (patch) | |
tree | f8a962ca2e44803c695f12acdd70d5d747c05aa9 | |
parent | 67d17dae35e901ac529b25548ec0aef499330dcb (diff) | |
download | aur-f0ece7805dd7273807eed48757032e53c043ba51.tar.gz |
upstream upgrade
-rw-r--r-- | .SRCINFO | 17 | ||||
-rw-r--r-- | PKGBUILD | 38 | ||||
-rw-r--r-- | dnd-crash.patch | 39 | ||||
-rw-r--r-- | gnome-terminal-transparency.changelog | 4 | ||||
-rw-r--r-- | gnome-terminal-transparency.patch | 397 | ||||
-rw-r--r-- | palette-color.patch | 40 |
6 files changed, 226 insertions, 309 deletions
@@ -1,7 +1,7 @@ pkgbase = gnome-terminal-transparency pkgdesc = The GNOME Terminal Emulator, with background transparency - pkgver = 3.20.2 - pkgrel = 2 + pkgver = 3.22.0+4+g87e36d3 + pkgrel = 1 url = https://wiki.gnome.org/Apps/Terminal changelog = gnome-terminal-transparency.changelog arch = i686 @@ -17,20 +17,17 @@ pkgbase = gnome-terminal-transparency makedepends = gconf makedepends = vala makedepends = yelp-tools + makedepends = git depends = vte3 depends = gsettings-desktop-schemas depends = dconf - provides = gnome-terminal=3.20.2 + provides = gnome-terminal=3.22.0+4+g87e36d3 conflicts = gnome-terminal options = !emptydirs - source = https://download.gnome.org/sources/gnome-terminal/3.20/gnome-terminal-3.20.2.tar.xz - source = dnd-crash.patch - source = palette-color.patch + source = git://git.gnome.org/gnome-terminal#commit=87e36d320ff9819948a2c8398c71f8b57075063a source = gnome-terminal-transparency.patch - sha256sums = f5383060730f1de70af35e917f82d5b6a14d963ad9cfd6a0e705f90011645a23 - sha256sums = 0bb1021b01ed0cdc1b598289de707221ebea0be46cba32301c32477dfd4cb166 - sha256sums = 1d98a84fa8ce0e93e2e3e36c6cd50d86965d3fb120d2d6a42305b402be1df573 - sha256sums = b28361f4606f495ade3035fcabb5525d4561f2dd2458e25a7e79da8b8634c20d + sha256sums = SKIP + sha256sums = 5d893e75f973bf2d639cc56e9dad685a76495eb8c55c88a1c2ad4338799a0e51 pkgname = gnome-terminal-transparency @@ -5,39 +5,39 @@ pkgname=gnome-terminal-transparency _pkgname=gnome-terminal -pkgver=3.20.2 -pkgrel=2 +pkgver=3.22.0+4+g87e36d3 +pkgrel=1 pkgdesc="The GNOME Terminal Emulator, with background transparency" url="https://wiki.gnome.org/Apps/Terminal" arch=(i686 x86_64) license=(GPL) depends=(vte3 gsettings-desktop-schemas dconf) makedepends=(intltool itstool docbook-xsl libnautilus-extension appdata-tools - gnome-shell gconf vala yelp-tools) + gnome-shell gconf vala yelp-tools git) provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") options=(!emptydirs) groups=(gnome) changelog=$pkgname.changelog -source=(https://download.gnome.org/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz - dnd-crash.patch - palette-color.patch - gnome-terminal-transparency.patch) -sha256sums=('f5383060730f1de70af35e917f82d5b6a14d963ad9cfd6a0e705f90011645a23' - '0bb1021b01ed0cdc1b598289de707221ebea0be46cba32301c32477dfd4cb166' - '1d98a84fa8ce0e93e2e3e36c6cd50d86965d3fb120d2d6a42305b402be1df573' - 'b28361f4606f495ade3035fcabb5525d4561f2dd2458e25a7e79da8b8634c20d') +_commit=87e36d320ff9819948a2c8398c71f8b57075063a # gnome-3-22 +source=("git://git.gnome.org/gnome-terminal#commit=$_commit" + gnome-terminal-transparency.patch) +sha256sums=('SKIP' # current official package from Archlinux does this + '5d893e75f973bf2d639cc56e9dad685a76495eb8c55c88a1c2ad4338799a0e51') -prepare () { - cd $_pkgname-$pkgver - patch -Np1 -i ../dnd-crash.patch - patch -Np1 -i ../palette-color.patch +pkgver() { + cd $_pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd $_pkgname patch -Np1 -i ../gnome-terminal-transparency.patch - autoreconf -f -i + NOCONFIGURE=1 ./autogen.sh } build() { - cd $_pkgname-$pkgver + cd $_pkgname ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/$_pkgname --disable-static --with-nautilus-extension sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool @@ -45,11 +45,11 @@ build() { } check() { - cd $_pkgname-$pkgver + cd $_pkgname make check } package() { - cd $_pkgname-$pkgver + cd $_pkgname make DESTDIR="$pkgdir" install } diff --git a/dnd-crash.patch b/dnd-crash.patch deleted file mode 100644 index baa66e5195fc..000000000000 --- a/dnd-crash.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 69e82e354de26cd7e6957b95740c724ed1c31c10 Mon Sep 17 00:00:00 2001 -From: Andreas Henriksson <andreas@fatal.se> -Date: Mon, 25 Jul 2016 19:38:18 +0200 -Subject: notebook: avoid crash on tab DND - -See "gtk_notebook_detach_tab" API documentation. Using it instead -of gtk_container_remove avoids an assertion crash in gtk+ when -dragging and dropping a tab between terminal windows. - -See also original bug report at -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=825818 - -https://bugzilla.gnome.org/show_bug.cgi?id=769161 -(cherry picked from commit 85b448f7c9e219e82d4d8abafe405d73349c08c1) ---- - src/terminal-notebook.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/terminal-notebook.c b/src/terminal-notebook.c -index 9d488fc..b054676 100644 ---- a/src/terminal-notebook.c -+++ b/src/terminal-notebook.c -@@ -152,8 +152,13 @@ terminal_notebook_remove_screen (TerminalMdiContainer *container, - update_tab_visibility (notebook, -1); - - screen_container = terminal_screen_container_get_from_screen (screen); -+#if GTK_CHECK_VERSION(3, 16, 0) -+ gtk_notebook_detach_tab (GTK_NOTEBOOK (notebook), -+ GTK_WIDGET (screen_container)); -+#else - gtk_container_remove (GTK_CONTAINER (notebook), - GTK_WIDGET (screen_container)); -+#endif - } - - static TerminalScreen * --- -cgit v0.12 - diff --git a/gnome-terminal-transparency.changelog b/gnome-terminal-transparency.changelog index eb6793c3937b..eb9d7c8ed32f 100644 --- a/gnome-terminal-transparency.changelog +++ b/gnome-terminal-transparency.changelog @@ -1,3 +1,7 @@ +2016-10-20 + upstream upgrade: 3.20.2 -> 3.22.0 + use current patches from fedora + 2016-08-09 apply upstream patches from from 3.20 branch diff --git a/gnome-terminal-transparency.patch b/gnome-terminal-transparency.patch index 90d6ab367d2f..8ddacedd5b5d 100644 --- a/gnome-terminal-transparency.patch +++ b/gnome-terminal-transparency.patch @@ -1,4 +1,4 @@ -From b87c1302d9335dc867f0382a6463b0026e38f6dc Mon Sep 17 00:00:00 2001 +From 628b464a3045bc68a20b892f8514e9ef7fb588e4 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir@gnome.org> Date: Mon, 12 May 2014 14:57:18 +0200 Subject: [PATCH 1/6] Restore transparency @@ -23,7 +23,7 @@ restore the translations of the string. 6 files changed, 144 insertions(+), 1 deletion(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index c031c8a..7bdd156 100644 +index c031c8ace24a..7bdd156e36aa 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -370,6 +370,16 @@ @@ -44,10 +44,10 @@ index c031c8a..7bdd156 100644 <!-- Keybinding settings --> diff --git a/src/profile-editor.c b/src/profile-editor.c -index ff26df6..b8c1c78 100644 +index 002561d77dcb..1a758a9243ec 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c -@@ -1218,7 +1218,18 @@ terminal_profile_edit (GSettings *profile, +@@ -1215,7 +1215,18 @@ terminal_profile_edit (GSettings *profile, "active-id", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); @@ -67,7 +67,7 @@ index ff26df6..b8c1c78 100644 terminal_util_dialog_focus_widget (editor, widget_name); diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui -index 9c00946..9caf72d 100644 +index 5adcb5317e01..b7decb284946 100644 --- a/src/profile-preferences.ui +++ b/src/profile-preferences.ui @@ -23,6 +23,11 @@ @@ -82,7 +82,7 @@ index 9c00946..9caf72d 100644 <object class="GtkListStore" id="cjk-ambiguous-width-model"> <columns> <!-- column-name gchararray --> -@@ -1035,6 +1040,93 @@ +@@ -1036,6 +1041,93 @@ <property name="position">1</property> </packing> </child> @@ -177,7 +177,7 @@ index 9c00946..9caf72d 100644 </child> </object> diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index 4b734a3..e434075 100644 +index 4b734a3961d1..e434075d86af 100644 --- a/src/terminal-schemas.h +++ b/src/terminal-schemas.h @@ -69,6 +69,9 @@ G_BEGIN_DECLS @@ -191,10 +191,10 @@ index 4b734a3..e434075 100644 #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 33a34ab..92e8bb3 100644 +index 9a0b450bd310..eab0cec3fc90 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -855,7 +855,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -827,7 +827,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) || prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) || prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOREGROUND_COLOR_KEY) || @@ -205,7 +205,7 @@ index 33a34ab..92e8bb3 100644 update_color_scheme (screen); if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) -@@ -925,6 +927,8 @@ update_color_scheme (TerminalScreen *screen) +@@ -897,6 +899,8 @@ update_color_scheme (TerminalScreen *screen) GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL; GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL; GtkStyleContext *context; @@ -214,7 +214,7 @@ index 33a34ab..92e8bb3 100644 gboolean use_theme_colors; context = gtk_widget_get_style_context (widget); -@@ -966,6 +970,18 @@ update_color_scheme (TerminalScreen *screen) +@@ -938,6 +942,18 @@ update_color_scheme (TerminalScreen *screen) } colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); @@ -233,7 +233,7 @@ index 33a34ab..92e8bb3 100644 vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, colors, n_colors); vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); -@@ -973,6 +989,10 @@ update_color_scheme (TerminalScreen *screen) +@@ -945,6 +961,10 @@ update_color_scheme (TerminalScreen *screen) vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen), cursor_fgp); vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); @@ -245,19 +245,19 @@ index 33a34ab..92e8bb3 100644 static void diff --git a/src/terminal-window.c b/src/terminal-window.c -index 8b78849..eb75b42 100644 +index a290d9fda733..020c6f00787f 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -2616,6 +2616,8 @@ terminal_window_init (TerminalWindow *window) +@@ -2621,6 +2621,8 @@ terminal_window_init (TerminalWindow *window) TerminalWindowPrivate *priv; TerminalApp *app; TerminalSettingsList *profiles_list; + GdkScreen *screen; + GdkVisual *visual; + GSettings *gtk_debug_settings; GtkActionGroup *action_group; GtkAction *action; - GtkUIManager *manager; -@@ -2630,6 +2632,11 @@ terminal_window_init (TerminalWindow *window) +@@ -2637,6 +2639,11 @@ terminal_window_init (TerminalWindow *window) gtk_widget_init_template (GTK_WIDGET (window)); @@ -270,10 +270,10 @@ index 8b78849..eb75b42 100644 uuid_unparse (u, uuidstr); priv->uuid = g_strdup (uuidstr); -- -2.5.0 +2.7.4 -From a160731760b90fa566017dd0212fa1239eadc72c Mon Sep 17 00:00:00 2001 +From bed8e7d05915b96206db06bf07e04f7498d5b38e Mon Sep 17 00:00:00 2001 From: Lars Uebernickel <lars.uebernickel@canonical.com> Date: Wed, 28 May 2014 14:11:02 +0200 Subject: [PATCH 2/6] window: Make the drawing robust across all themes @@ -293,10 +293,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=730016 1 file changed, 21 insertions(+) diff --git a/src/terminal-window.c b/src/terminal-window.c -index eb75b42..58ec94a 100644 +index 020c6f00787f..a9f3ff7d67e2 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -2288,6 +2288,26 @@ terminal_window_realize (GtkWidget *widget) +@@ -2295,6 +2295,26 @@ terminal_window_realize (GtkWidget *widget) } static gboolean @@ -323,7 +323,7 @@ index eb75b42..58ec94a 100644 terminal_window_state_event (GtkWidget *widget, GdkEventWindowState *event) { -@@ -2816,6 +2836,7 @@ terminal_window_class_init (TerminalWindowClass *klass) +@@ -2832,6 +2852,7 @@ terminal_window_class_init (TerminalWindowClass *klass) widget_class->show = terminal_window_show; widget_class->realize = terminal_window_realize; @@ -332,10 +332,10 @@ index eb75b42..58ec94a 100644 widget_class->screen_changed = terminal_window_screen_changed; widget_class->style_updated = terminal_window_style_updated; -- -2.5.0 +2.7.4 -From c2d5533c8973f04f66eafe919d1fc4740d66c106 Mon Sep 17 00:00:00 2001 +From 3cc6743972870157e5a61ebc3d5579c46b43e5b1 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" <otaylor@fishsoup.net> Date: Fri, 13 Nov 2015 15:16:42 +0100 Subject: [PATCH 3/6] screen, window: Extra padding around transparent @@ -348,10 +348,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 92e8bb3..1718d42 100644 +index eab0cec3fc90..5d321a7c238b 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -140,6 +140,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *, +@@ -137,6 +137,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); @@ -360,7 +360,7 @@ index 92e8bb3..1718d42 100644 static gboolean terminal_screen_do_exec (TerminalScreen *screen, FDSetupData *data, GError **error); -@@ -510,6 +512,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -482,6 +484,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; @@ -368,7 +368,7 @@ index 92e8bb3..1718d42 100644 terminal_class->child_exited = terminal_screen_child_exited; -@@ -913,6 +916,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -885,6 +888,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, } static void @@ -401,7 +401,7 @@ index 92e8bb3..1718d42 100644 update_color_scheme (TerminalScreen *screen) { GtkWidget *widget = GTK_WIDGET (screen); -@@ -990,9 +1019,7 @@ update_color_scheme (TerminalScreen *screen) +@@ -962,9 +991,7 @@ update_color_scheme (TerminalScreen *screen) vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); @@ -412,7 +412,7 @@ index 92e8bb3..1718d42 100644 } static void -@@ -1595,6 +1622,13 @@ terminal_screen_do_popup (TerminalScreen *screen, +@@ -1567,6 +1594,13 @@ terminal_screen_do_popup (TerminalScreen *screen, terminal_screen_popup_info_unref (info); } @@ -427,10 +427,10 @@ index 92e8bb3..1718d42 100644 terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event) diff --git a/src/terminal-window.c b/src/terminal-window.c -index 58ec94a..49cb3dc 100644 +index a9f3ff7d67e2..d09484e40e66 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c -@@ -2293,15 +2293,21 @@ terminal_window_draw (GtkWidget *widget, +@@ -2300,15 +2300,21 @@ terminal_window_draw (GtkWidget *widget, { if (gtk_widget_get_app_paintable (widget)) { @@ -459,10 +459,10 @@ index 58ec94a..49cb3dc 100644 return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); -- -2.5.0 +2.7.4 -From 36d6de88a47083e5593c41335af52aca3f3479f1 Mon Sep 17 00:00:00 2001 +From 39d52982904c6d0245031e20d22ee3edc363b28a Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir@gnome.org> Date: Tue, 17 Feb 2015 17:06:17 +0100 Subject: [PATCH 6/6] Restore translations for transparency @@ -513,7 +513,7 @@ Subject: [PATCH 6/6] Restore translations for transparency po/ko.po | 3 +++ po/ku.po | 4 ++-- po/lt.po | 3 +++ - po/lv.po | 3 +++ + po/lv.po | 2 ++ po/mai.po | 4 ++-- po/mg.po | 4 ++-- po/mk.po | 4 ++-- @@ -554,13 +554,13 @@ Subject: [PATCH 6/6] Restore translations for transparency po/zh_CN.po | 3 +++ po/zh_HK.po | 3 +++ po/zh_TW.po | 3 +++ - 86 files changed, 209 insertions(+), 96 deletions(-) + 86 files changed, 208 insertions(+), 96 deletions(-) diff --git a/po/am.po b/po/am.po -index 27a7e96..04a8ad9 100644 +index 3445d96da657..a5fadb3a8d48 100644 --- a/po/am.po +++ b/po/am.po -@@ -613,8 +613,8 @@ msgid "_Text color:" +@@ -614,8 +614,8 @@ msgid "_Text color:" msgstr "የ_ጽሑፍ ቀለም፦" #: ../src/gnome-terminal.glade2.h:102 @@ -572,10 +572,10 @@ index 27a7e96..04a8ad9 100644 #: ../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 f8582ed..85ff6cc 100644 +index fa2b4b54ff13..22eff853c6d2 100644 --- a/po/ar.po +++ b/po/ar.po -@@ -3104,8 +3104,8 @@ msgstr "أغ_لق النافذة" +@@ -3108,8 +3108,8 @@ msgstr "أغ_لق النافذة" #~ msgid "Background image _scrolls" #~ msgstr "صورة الخلفية ت_لتف" @@ -587,7 +587,7 @@ index f8582ed..85ff6cc 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "_ظلل شفافية أو صورة الخلفية:" diff --git a/po/as.po b/po/as.po -index 0bd699d..63fca01 100644 +index 3fade2b8cb12..7532b1deec68 100644 --- a/po/as.po +++ b/po/as.po @@ -2979,8 +2979,8 @@ msgstr "উইন্ডো বন্ধ কৰক (_l)" @@ -602,7 +602,7 @@ index 0bd699d..63fca01 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "স্বচ্ছ বা ছবিৰ সৈতে পটভূমি ছায়া আচ্ছন্ন কৰক (_h):" diff --git a/po/ast.po b/po/ast.po -index d1c6e7b..4210820 100644 +index d1c6e7b8174a..4210820a1429 100644 --- a/po/ast.po +++ b/po/ast.po @@ -1598,8 +1598,8 @@ msgid "_Text color:" @@ -617,10 +617,10 @@ index d1c6e7b..4210820 100644 #: ../src/profile-preferences.glade.h:78 msgid "_Underline color:" diff --git a/po/az.po b/po/az.po -index b0f2e3e..877f114 100644 +index 586c1e4d827b..6bed64a15ddc 100644 --- a/po/az.po +++ b/po/az.po -@@ -619,8 +619,8 @@ msgid "_Text color:" +@@ -620,8 +620,8 @@ msgid "_Text color:" msgstr "_Mətn rəngi:" #: ../src/gnome-terminal.glade2.h:102 @@ -632,7 +632,7 @@ index b0f2e3e..877f114 100644 #: ../src/gnome-terminal.glade2.h:103 msgid "_Update login records when command is launched" diff --git a/po/be.po b/po/be.po -index fca0ae4..74ff329 100644 +index 1e45906547be..cd3fe0b7b6b2 100644 --- a/po/be.po +++ b/po/be.po @@ -2015,3 +2015,6 @@ msgstr "" @@ -643,10 +643,10 @@ index fca0ae4..74ff329 100644 +msgstr "Празрысты фон" + diff --git a/po/be@latin.po b/po/be@latin.po -index 1e057c7..1d22a58 100644 +index 82ef0664ae1e..73d74fbeb124 100644 --- a/po/be@latin.po +++ b/po/be@latin.po -@@ -1425,8 +1425,8 @@ msgid "_Text color:" +@@ -1426,8 +1426,8 @@ msgid "_Text color:" msgstr "Koler _tekstu:" #: ../src/profile-preferences.glade.h:73 @@ -658,18 +658,18 @@ index 1e057c7..1d22a58 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/bg.po b/po/bg.po -index 0b8dd8e..5d45919 100644 +index f42c22c94678..e2fc98cadddb 100644 --- a/po/bg.po +++ b/po/bg.po -@@ -2167,3 +2167,6 @@ msgstr "" - #: ../src/terminal-window.c:3726 +@@ -2281,3 +2281,6 @@ msgstr "" + #: ../src/terminal-window.c:3727 msgid "C_lose Window" msgstr "_Затваряне на този прозорец" + +msgid "Transparent background" +msgstr "Прозрачен фон" diff --git a/po/bn_IN.po b/po/bn_IN.po -index c74246a..d65b322 100644 +index f196e5084797..ae8e577d23db 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -2358,3 +2358,6 @@ msgstr "উইন্ডো বন্ধ করুন (_l)" @@ -680,7 +680,7 @@ index c74246a..d65b322 100644 +msgid "Transparent background" +msgstr "স্বচ্চ পটভূমি " diff --git a/po/bs.po b/po/bs.po -index 49e7108..fccfa86 100644 +index 49e710859ac9..fccfa86de311 100644 --- a/po/bs.po +++ b/po/bs.po @@ -680,6 +680,10 @@ msgstr "Kratica tastature za povećavanje fonta" @@ -695,7 +695,7 @@ index 49e7108..fccfa86 100644 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 55caef1..d201f40 100644 +index c80c2572d11e..abe75f0ba7f1 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2304,3 +2304,6 @@ msgstr "Tanca la _finestra" @@ -706,7 +706,7 @@ index 55caef1..d201f40 100644 +msgid "Transparent background" +msgstr "Fons transparent" diff --git a/po/ca@valencia.po b/po/ca@valencia.po -index 1c279a0..4073f71 100644 +index 2dafab8ca90d..1c129291a084 100644 --- a/po/ca@valencia.po +++ b/po/ca@valencia.po @@ -2092,3 +2092,6 @@ msgstr "" @@ -717,21 +717,21 @@ index 1c279a0..4073f71 100644 +msgid "Transparent background" +msgstr "Fons transparent" diff --git a/po/cs.po b/po/cs.po -index 784fe2f..ef0d7cc 100644 +index f87b88f9bb3a..c8824ff6677a 100644 --- a/po/cs.po +++ b/po/cs.po -@@ -2245,3 +2245,6 @@ msgstr "" - #: ../src/terminal-window.c:3727 +@@ -2253,3 +2253,6 @@ msgstr "" + #: ../src/terminal-window.c:3849 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 0739e20..8b1ff00 100644 +index 644df82363f1..f0c96e7aa85b 100644 --- a/po/cy.po +++ b/po/cy.po -@@ -1447,8 +1447,8 @@ msgid "_Text color:" +@@ -1448,8 +1448,8 @@ msgid "_Text color:" msgstr "Lliw'r _testun:" #: ../src/profile-preferences.glade.h:73 @@ -743,10 +743,10 @@ index 0739e20..8b1ff00 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/da.po b/po/da.po -index 68f20ab..1e7acbe 100644 +index 193a58c0fd14..b4f06171a842 100644 --- a/po/da.po +++ b/po/da.po -@@ -3195,8 +3195,8 @@ msgstr "_Luk vindue" +@@ -3183,8 +3183,8 @@ msgstr "_Luk vindue" #~ msgid "_Solid color" #~ msgstr "_Ensfarvet" @@ -758,10 +758,10 @@ index 68f20ab..1e7acbe 100644 #~ 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 f0f16e0..48efa8f 100644 +index 7e098bd312ac..0f7883d58df4 100644 --- a/po/de.po +++ b/po/de.po -@@ -3259,8 +3259,8 @@ msgstr "Fenster _schließen" +@@ -3263,8 +3263,8 @@ msgstr "Fenster _schließen" #~ msgid "Background image _scrolls" #~ msgstr "Hintergrundbild _folgt Bildlauf" @@ -773,7 +773,7 @@ index f0f16e0..48efa8f 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "Transparenz und Bildhintergründe _abdunkeln:" diff --git a/po/dz.po b/po/dz.po -index ecb8fd5..290934a 100644 +index d97e6102b850..061a09dc9edb 100644 --- a/po/dz.po +++ b/po/dz.po @@ -1551,8 +1551,8 @@ msgid "_Text color:" @@ -788,10 +788,10 @@ index ecb8fd5..290934a 100644 #: ../src/profile-preferences.glade.h:78 #, fuzzy diff --git a/po/el.po b/po/el.po -index 2b0d1de..5bf36a9 100644 +index 911f7bd0483b..658b2e3201a7 100644 --- a/po/el.po +++ b/po/el.po -@@ -2510,3 +2510,6 @@ msgstr "Κ_λείσιμο παραθύρου" +@@ -2515,3 +2515,6 @@ msgstr "Κ_λείσιμο παραθύρου" #~ msgid "_Input Methods" #~ msgstr "_Μέθοδοι εισαγωγής" @@ -799,10 +799,10 @@ index 2b0d1de..5bf36a9 100644 +msgid "Transparent background" +msgstr "Διάφανο παρασκήνιο" diff --git a/po/en@shaw.po b/po/en@shaw.po -index 65f3d41..05dc99d 100644 +index 82b2d53401b2..67b429810d40 100644 --- a/po/en@shaw.po +++ b/po/en@shaw.po -@@ -1467,8 +1467,8 @@ msgid "_Text color:" +@@ -1468,8 +1468,8 @@ msgid "_Text color:" msgstr "_𐑑𐑧𐑒𐑕𐑑 𐑒𐑳𐑤𐑼:" #: ../src/profile-preferences.glade.h:78 @@ -814,10 +814,10 @@ index 65f3d41..05dc99d 100644 #: ../src/profile-preferences.glade.h:79 msgid "_Underline color:" diff --git a/po/en_CA.po b/po/en_CA.po -index c79cbf5..b8b14d2 100644 +index 6c9e0cd73d63..3ffa89b7cfee 100644 --- a/po/en_CA.po +++ b/po/en_CA.po -@@ -556,8 +556,8 @@ msgid "_Text color:" +@@ -557,8 +557,8 @@ msgid "_Text color:" msgstr "_Text colour:" #: ../src/gnome-terminal.glade2.h:86 @@ -829,10 +829,10 @@ index c79cbf5..b8b14d2 100644 #: ../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 4d38486..69e7113 100644 +index 2fb1448eccbe..33e1e221bd10 100644 --- a/po/en_GB.po +++ b/po/en_GB.po -@@ -2732,8 +2732,8 @@ msgstr "_Title:" +@@ -3176,8 +3176,8 @@ msgstr "C_lose Window" #~ msgid "Background image _scrolls" #~ msgstr "Background image _scrolls" @@ -844,10 +844,10 @@ index 4d38486..69e7113 100644 #~ 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 d339099..e8b4159 100644 +index 70fc6fcf9a88..6b13f2449992 100644 --- a/po/es.po +++ b/po/es.po -@@ -3303,8 +3303,8 @@ msgstr "_Cerrar ventana" +@@ -3291,8 +3291,8 @@ msgstr "_Cerrar ventana" #~ msgid "_Solid color" #~ msgstr "Color _sólido" @@ -859,7 +859,7 @@ index d339099..e8b4159 100644 #~ 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 4b1c2a7..7707611 100644 +index 4b1c2a7c67e4..770761168806 100644 --- a/po/et.po +++ b/po/et.po @@ -1747,3 +1747,6 @@ msgstr "Su_lge aken" @@ -870,10 +870,10 @@ index 4b1c2a7..7707611 100644 +msgid "Transparent background" +msgstr "Läbipaistev taust" diff --git a/po/eu.po b/po/eu.po -index 786f9e2..a731d99 100644 +index c7b9e2b4529e..551a9ba789ce 100644 --- a/po/eu.po +++ b/po/eu.po -@@ -3011,8 +3011,8 @@ msgstr "It_xi leihoa" +@@ -3169,8 +3169,8 @@ msgstr "It_xi leihoa" #~ msgid "_Solid color" #~ msgstr "_Kolore solidoa" @@ -885,10 +885,10 @@ index 786f9e2..a731d99 100644 #~ 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 52856cb..2a89999 100644 +index cb551a1ecd07..820987339fdf 100644 --- a/po/fa.po +++ b/po/fa.po -@@ -2240,3 +2240,6 @@ msgstr "_بستن پنجره" +@@ -2449,3 +2449,6 @@ msgstr "_بستن پنجره" #~ msgid "_Title:" #~ msgstr "_عنوان:" @@ -896,7 +896,7 @@ index 52856cb..2a89999 100644 +msgid "Transparent background" +msgstr "پسزمینهی شفاف" diff --git a/po/fi.po b/po/fi.po -index 02bddc5..cf84950 100644 +index a8cd6e1cb1f1..db7df1010def 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2294,6 +2294,9 @@ msgstr "_Sulje ikkuna" @@ -910,10 +910,10 @@ index 02bddc5..cf84950 100644 #~ msgid "Missing command" #~ msgstr "Puuttuva komento" diff --git a/po/fr.po b/po/fr.po -index d230aa2..9771335 100644 +index 40019d1a82ec..71b1e9fff5e4 100644 --- a/po/fr.po +++ b/po/fr.po -@@ -2303,3 +2303,6 @@ msgstr "Fermer _la fenêtre" +@@ -2309,3 +2309,6 @@ msgstr "Fermer _la fenêtre" #~ msgid "_Same as text color" #~ msgstr "_Même couleur que le texte" @@ -921,10 +921,10 @@ index d230aa2..9771335 100644 +msgid "Transparent background" +msgstr "Arrière-plan transparent" diff --git a/po/fur.po b/po/fur.po -index 39fe0bb..bc471ab 100644 +index ef6034af61cb..b11b3e977395 100644 --- a/po/fur.po +++ b/po/fur.po -@@ -651,6 +651,10 @@ msgstr "" +@@ -652,6 +652,10 @@ msgstr "" msgid "Which encoding to use" msgstr "Codifiche di doprâ" @@ -936,7 +936,7 @@ index 39fe0bb..bc471ab 100644 msgid "" "Whether ambiguous-width characters are narrow or wide when using UTF-8 " diff --git a/po/ga.po b/po/ga.po -index 93d5fa9..feb87dc 100644 +index 93d5fa9d1481..feb87dce3d6b 100644 --- a/po/ga.po +++ b/po/ga.po @@ -1925,3 +1925,6 @@ msgstr "_Dún Fuinneog" @@ -947,10 +947,10 @@ index 93d5fa9..feb87dc 100644 +msgid "Transparent background" +msgstr "Cúlra trédhearcach" diff --git a/po/gl.po b/po/gl.po -index a858849..7fadccd 100644 +index 910f98611ab5..0abf9b4ef9d1 100644 --- a/po/gl.po +++ b/po/gl.po -@@ -3241,8 +3241,8 @@ msgstr "P_echar a xanela" +@@ -3246,8 +3246,8 @@ msgstr "P_echar a xanela" #~ msgid "Background image _scrolls" #~ msgstr "A imaxe de fondo _desprázase" @@ -962,7 +962,7 @@ index a858849..7fadccd 100644 #~ 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 0bcb195..f72a807 100644 +index 76b459cf8dc5..5a0efa46233e 100644 --- a/po/gu.po +++ b/po/gu.po @@ -2944,8 +2944,8 @@ msgstr "વિન્ડો બંધ કરો (_l)" @@ -977,10 +977,10 @@ index 0bcb195..f72a807 100644 #~ msgid "No such profile \"%s\", using default profile\n" #~ msgstr "\"%s\" જેવી કોઈ રૂપરેખા નથી, મૂળભૂત રૂપરેખા વાપરી રહ્યા છે\n" diff --git a/po/he.po b/po/he.po -index 0c2420e..7a25a26 100644 +index 57cb2d0d110f..adca960ec997 100644 --- a/po/he.po +++ b/po/he.po -@@ -3189,8 +3189,8 @@ msgstr "סגירת ה_חלון" +@@ -3194,8 +3194,8 @@ msgstr "סגירת ה_חלון" #~ msgid "_Solid color" #~ msgstr "צבע _אחיד" @@ -992,7 +992,7 @@ index 0c2420e..7a25a26 100644 #~ 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 2d7dc5b..adf8d35 100644 +index 2d7dc5b14008..adf8d35e8d3f 100644 --- a/po/hi.po +++ b/po/hi.po @@ -2979,8 +2979,8 @@ msgstr "विंडो बंद करें (_l)" @@ -1007,25 +1007,22 @@ index 2d7dc5b..adf8d35 100644 #~ msgid "S/Key Challenge Response" #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया" diff --git a/po/hr.po b/po/hr.po -index cb48c52..747cf48 100644 +index c80fbe9..487ffe4 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" +@@ -2271,3 +2271,7 @@ msgstr "" + #: ../src/terminal-window.c:3864 + msgid "C_lose Window" + msgstr "_Zatvori prozor" ++ ++#: ../src/profile-preferences.glade.h:69 +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 381dd15..500c08a 100644 +index 8fc02debf569..b766d5ecf196 100644 --- a/po/hu.po +++ b/po/hu.po -@@ -2713,3 +2713,6 @@ msgstr "_Ablak bezárása" +@@ -2699,3 +2699,6 @@ msgstr "_Ablak bezárása" #~ msgid "Background image" #~ msgstr "Háttérkép" @@ -1033,10 +1030,10 @@ index 381dd15..500c08a 100644 +msgid "Transparent background" +msgstr "Áttetsző háttér" diff --git a/po/hy.po b/po/hy.po -index 5584901..caadbba 100644 +index aaf2d9b292da..c8f14dfd4280 100644 --- a/po/hy.po +++ b/po/hy.po -@@ -1011,8 +1011,8 @@ msgid "_Text color:" +@@ -1012,8 +1012,8 @@ msgid "_Text color:" msgstr "_Տեքստի գույնը՝" #: ../src/profile-preferences.glade.h:73 @@ -1048,30 +1045,29 @@ index 5584901..caadbba 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/id.po b/po/id.po -index 595a325..99c29b6 100644 +index b27605c49b9b..b05f2d0ecc43 100644 --- a/po/id.po +++ b/po/id.po -@@ -2058,3 +2058,6 @@ msgstr "" - #: ../src/terminal-window.c:3694 +@@ -2252,3 +2252,6 @@ msgstr "" + #: ../src/terminal-window.c:3849 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 909a8c9..2c46e9c 100644 +index b7bdc71451b0..c5033f2c2e24 100644 --- a/po/it.po +++ b/po/it.po -@@ -2284,3 +2284,7 @@ msgstr "" - #: ../src/terminal-window.c:3727 +@@ -2289,3 +2289,6 @@ msgstr "" + #: ../src/terminal-window.c:3849 msgid "C_lose Window" msgstr "Chiudi _finestra" + -+#, fuzzy +msgid "Transparent background" +msgstr "Sfondo trasparente" diff --git a/po/ja.po b/po/ja.po -index f7235d9..63d7fd7 100644 +index f7235d9f4a0b..63d7fd7bb943 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1907,3 +1907,6 @@ msgstr "ウィンドウを閉じる(_L)" @@ -1082,10 +1078,10 @@ index f7235d9..63d7fd7 100644 +msgid "Transparent background" +msgstr "透過な画像にする" diff --git a/po/ka.po b/po/ka.po -index 8415e88..3717b7e 100644 +index 2a0bc91fad40..10a833ad4cad 100644 --- a/po/ka.po +++ b/po/ka.po -@@ -568,7 +568,7 @@ msgstr "_ტექსტის ფერი:" +@@ -569,7 +569,7 @@ msgstr "_ტექსტის ფერი:" #: ../src/gnome-terminal.glade2.h:86 #, fuzzy @@ -1095,10 +1091,10 @@ index 8415e88..3717b7e 100644 #: ../src/gnome-terminal.glade2.h:87 diff --git a/po/kk.po b/po/kk.po -index 3573937..862b095 100644 +index 70caf943e846..5228536b9272 100644 --- a/po/kk.po +++ b/po/kk.po -@@ -2208,3 +2208,6 @@ msgstr "Терезені жа_бу" +@@ -2213,3 +2213,6 @@ msgstr "Терезені жа_бу" #~ msgid "Be quiet" #~ msgstr "Тыныш болу" @@ -1106,7 +1102,7 @@ index 3573937..862b095 100644 +msgid "Transparent background" +msgstr "Мөлдір фон" diff --git a/po/kn.po b/po/kn.po -index c887f88..e899ef3 100644 +index c887f88a2c87..e899ef3ca8c1 100644 --- a/po/kn.po +++ b/po/kn.po @@ -2344,3 +2344,6 @@ msgstr "ಕಿಟಕಿಯನ್ನು ಮುಚ್ಚು (_l)" @@ -1117,10 +1113,10 @@ index c887f88..e899ef3 100644 +msgid "Transparent background" +msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ" diff --git a/po/ko.po b/po/ko.po -index eba5008..72ebbe7 100644 +index 366a5122c251..1ea4c7f519d4 100644 --- a/po/ko.po +++ b/po/ko.po -@@ -2304,3 +2304,6 @@ msgstr "창 닫기(_L)" +@@ -2281,3 +2281,6 @@ msgstr "창 닫기(_L)" #~ msgid "Whether to use a dark theme variant" #~ msgstr "어두운 테마를 사용할 지 여부" @@ -1128,10 +1124,10 @@ index eba5008..72ebbe7 100644 +msgid "Transparent background" +msgstr "투명한 배경" diff --git a/po/ku.po b/po/ku.po -index 221825b..96e3581 100644 +index bc2bb7f03de4..226d9942f23a 100644 --- a/po/ku.po +++ b/po/ku.po -@@ -557,8 +557,8 @@ msgid "_Text color:" +@@ -558,8 +558,8 @@ msgid "_Text color:" msgstr "Rengê _nivîsê:" #: ../src/gnome-terminal.glade2.h:86 @@ -1143,10 +1139,10 @@ index 221825b..96e3581 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/lt.po b/po/lt.po -index 974c353..6b16746 100644 +index c1c3ce0bfbab..20771d86cb86 100644 --- a/po/lt.po +++ b/po/lt.po -@@ -2310,3 +2310,6 @@ msgstr "_Užverti langą" +@@ -2280,3 +2280,6 @@ msgstr "_Užverti langą" #~ msgid "Whether to use a dark theme variant" #~ msgstr "Ar naudoti tamsų temos variantą" @@ -1154,20 +1150,20 @@ index 974c353..6b16746 100644 +msgid "Transparent background" +msgstr "Permatomas fonas" diff --git a/po/lv.po b/po/lv.po -index 0892f4b..a6aec64 100644 +index 959d1c3531fd..eb12a845f3bc 100644 --- a/po/lv.po +++ b/po/lv.po -@@ -2231,3 +2231,5 @@ msgstr "" +@@ -2236,3 +2236,5 @@ msgstr "" 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 9b984a0..a3c0e17 100644 +index 715d0b9e1c82..881fd5a2cce9 100644 --- a/po/mai.po +++ b/po/mai.po -@@ -1290,8 +1290,8 @@ msgid "_Text color:" +@@ -1291,8 +1291,8 @@ msgid "_Text color:" msgstr "पाठ रँग (_T):" #: ../src/profile-preferences.glade.h:69 @@ -1179,10 +1175,10 @@ index 9b984a0..a3c0e17 100644 #: ../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 1c1895c..a805417 100644 +index 99fa0f5e4059..bf4ac34d09c1 100644 --- a/po/mg.po +++ b/po/mg.po -@@ -566,8 +566,8 @@ msgid "_Text color:" +@@ -567,8 +567,8 @@ msgid "_Text color:" msgstr "Lokon'ny _soratra:" #: ../src/gnome-terminal.glade2.h:86 @@ -1194,10 +1190,10 @@ index 1c1895c..a805417 100644 #: ../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 e31378a..d2b74d4 100644 +index 4fe43192fe57..6160ede0d0d3 100644 --- a/po/mk.po +++ b/po/mk.po -@@ -1166,8 +1166,8 @@ msgid "_Text color:" +@@ -1167,8 +1167,8 @@ msgid "_Text color:" msgstr "_Боја на текстот:" #: ../src/profile-preferences.glade.h:77 @@ -1209,7 +1205,7 @@ index e31378a..d2b74d4 100644 #: ../src/profile-preferences.glade.h:78 #| msgid "_Text color:" diff --git a/po/ml.po b/po/ml.po -index cc1928d..62abd21 100644 +index cc1928dcda63..62abd2131499 100644 --- a/po/ml.po +++ b/po/ml.po @@ -2751,8 +2751,8 @@ msgstr "ടെര്മിനല് അ_ടയ്ക്കുക" @@ -1224,10 +1220,10 @@ index cc1928d..62abd21 100644 #~ msgid "S/Key Challenge Response" #~ msgstr "S/Key ചാലഞ്ച് മറുപടി" diff --git a/po/mn.po b/po/mn.po -index 4922041..9696b7f 100644 +index 2f9d86072d1c..8f8850b7ec0b 100644 --- a/po/mn.po +++ b/po/mn.po -@@ -617,8 +617,8 @@ msgid "_Text color:" +@@ -618,8 +618,8 @@ msgid "_Text color:" msgstr "_Текстийн өнгө:" #: ../src/gnome-terminal.glade2.h:102 @@ -1239,7 +1235,7 @@ index 4922041..9696b7f 100644 #: ../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 61997da..50451d7 100644 +index 61997dafbd03..50451d7b8e60 100644 --- a/po/mr.po +++ b/po/mr.po @@ -3015,8 +3015,8 @@ msgstr "चौकट बंद करा (_l)" @@ -1254,10 +1250,10 @@ index 61997da..50451d7 100644 #~ msgid "Disabled" #~ msgstr "अकार्यान्वीतित" diff --git a/po/ms.po b/po/ms.po -index 5b663aa..38a2afe 100644 +index f2ebd4851d3b..a20bae29a8e8 100644 --- a/po/ms.po +++ b/po/ms.po -@@ -630,8 +630,8 @@ msgid "_Text color:" +@@ -631,8 +631,8 @@ msgid "_Text color:" msgstr "Warna _Teks:" #: ../src/gnome-terminal.glade2.h:102 @@ -1269,21 +1265,21 @@ index 5b663aa..38a2afe 100644 #: ../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 ff66807..8ea486c 100644 +index d2a9a7b099f5..b8d4cc54272b 100644 --- a/po/nb.po +++ b/po/nb.po -@@ -2101,3 +2101,6 @@ msgstr "" - #: ../src/terminal-window.c:3726 +@@ -2238,3 +2238,6 @@ msgstr "" + #: ../src/terminal-window.c:3736 msgid "C_lose Window" msgstr "_Lukk vindu" + +msgid "Transparent background" +msgstr "Gjennomsiktig bakgrunn" diff --git a/po/nds.po b/po/nds.po -index 98a1287..94fd757 100644 +index 82f930b1cc0c..da1d6d0c9342 100644 --- a/po/nds.po +++ b/po/nds.po -@@ -995,8 +995,8 @@ msgid "_Text color:" +@@ -996,8 +996,8 @@ msgid "_Text color:" msgstr "_Textklöör:" #: ../src/profile-preferences.glade.h:73 @@ -1295,7 +1291,7 @@ index 98a1287..94fd757 100644 #: ../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 4fe16cc..d9a90ad 100644 +index 4fe16cc88a9a..d9a90adbf693 100644 --- a/po/ne.po +++ b/po/ne.po @@ -2398,8 +2398,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्" @@ -1310,7 +1306,7 @@ index 4fe16cc..d9a90ad 100644 #~ msgid "_Use the system fixed width font" #~ msgstr "प्रणाली निश्चित गरिएको फन्ट चौडाइ प्रयोग गर्नुहोस्" diff --git a/po/nl.po b/po/nl.po -index a51720b..111b032 100644 +index a51720be1610..111b032c89fa 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2352,3 +2352,6 @@ msgstr "Venster sl_uiten" @@ -1321,10 +1317,10 @@ index a51720b..111b032 100644 +msgid "Transparent background" +msgstr "Transparante achtergrond" diff --git a/po/nn.po b/po/nn.po -index 91cd6ab..9284459 100644 +index 5aa43b113ed9..33aff8b1d52a 100644 --- a/po/nn.po +++ b/po/nn.po -@@ -1428,8 +1428,8 @@ msgid "_Text color:" +@@ -1429,8 +1429,8 @@ msgid "_Text color:" msgstr "_Tekstfarge:" #: ../src/profile-preferences.glade.h:73 @@ -1336,10 +1332,10 @@ index 91cd6ab..9284459 100644 #: ../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 29a9030..87f6f9e 100644 +index b1befba5b372..0491601ab3b6 100644 --- a/po/oc.po +++ b/po/oc.po -@@ -3419,8 +3419,8 @@ msgstr "Tampar _la fenèstra" +@@ -3352,8 +3352,8 @@ msgstr "Tampar _la fenèstra" #~ msgid "Run;" #~ msgstr "Executar;Consòla;Shell;" @@ -1351,7 +1347,7 @@ index 29a9030..87f6f9e 100644 #~ msgid "" #~ "A subset of possible encodings are presented in the Encoding submenu. " diff --git a/po/or.po b/po/or.po -index ec1e6bf..218acd7 100644 +index ec1e6bfb9a28..218acd712df6 100644 --- a/po/or.po +++ b/po/or.po @@ -2705,8 +2705,8 @@ msgstr "ଶୀର୍ଷକ (_T):" @@ -1366,7 +1362,7 @@ index ec1e6bf..218acd7 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "ଛାୟା ସ୍ବଚ୍ଛ କିମ୍ବା ଚିତ୍ର ପୃଷ୍ଠଭୂମି (_h):" diff --git a/po/pa.po b/po/pa.po -index 9c95b66..5e5b8ba 100644 +index 9c95b66e7185..5e5b8ba4f104 100644 --- a/po/pa.po +++ b/po/pa.po @@ -3008,8 +3008,8 @@ msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ(_l)" @@ -1381,10 +1377,10 @@ index 9c95b66..5e5b8ba 100644 #~ msgid "S/Key Challenge Response" #~ msgstr "S/ਸਵਿੱਚ ਚੈਲੰਜ਼ ਜਵਾਬ" diff --git a/po/ps.po b/po/ps.po -index b1de52c..a16ac49 100644 +index b25a2cb41712..dcbaf0bc6c8c 100644 --- a/po/ps.po +++ b/po/ps.po -@@ -1052,8 +1052,8 @@ msgid "_Text color:" +@@ -1053,8 +1053,8 @@ msgid "_Text color:" msgstr ":د ليکنې رنګ_" #: ../src/profile-preferences.glade.h:69 @@ -1396,10 +1392,10 @@ index b1de52c..a16ac49 100644 #: ../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 a361c66..ac7297e 100644 +index 5181419ad973..2e1b84d09c52 100644 --- a/po/pt.po +++ b/po/pt.po -@@ -3033,8 +3033,8 @@ msgstr "Fechar jane_La" +@@ -3160,8 +3160,8 @@ msgstr "Fechar jane_la" #~ msgid "Background image _scrolls" #~ msgstr "Imagem de fundo _rola" @@ -1411,18 +1407,18 @@ index a361c66..ac7297e 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "Transparente som_breado ou imagem de fundo:" diff --git a/po/pt_BR.po b/po/pt_BR.po -index 25cfa6e..94a8df6 100644 +index d3e6c538a640..c56753f96ba0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po -@@ -3056,3 +3056,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 " +@@ -3057,3 +3057,6 @@ msgstr "_Fechar janela" + #~ "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 179dd77..f7fc7ae 100644 +index 179dd77fd166..f7fc7ae070cf 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1576,8 +1576,8 @@ msgid "_Text color:" @@ -1437,10 +1433,10 @@ index 179dd77..f7fc7ae 100644 #: ../src/profile-preferences.glade.h:78 msgid "_Underline color:" diff --git a/po/ru.po b/po/ru.po -index 8ff3d59..9b3342d 100644 +index 6cd2cd49fb12..2477bfee5442 100644 --- a/po/ru.po +++ b/po/ru.po -@@ -2318,3 +2318,6 @@ msgstr "_Закрыть окно" +@@ -2271,3 +2271,6 @@ msgstr "_Закрыть окно" #~ msgid "_Same as text color" #~ msgstr "_Цвет как у обычного текста" @@ -1448,10 +1444,10 @@ index 8ff3d59..9b3342d 100644 +msgid "Transparent background" +msgstr "Прозрачный фон" diff --git a/po/rw.po b/po/rw.po -index 3f02231..b7fff4c 100644 +index 012f64e325c3..7072fa97af5d 100644 --- a/po/rw.po +++ b/po/rw.po -@@ -748,7 +748,7 @@ msgstr "Ibara ry'Inyandiko..." +@@ -749,7 +749,7 @@ msgstr "Ibara ry'Inyandiko..." #: ../src/gnome-terminal.glade2.h:102 #, fuzzy @@ -1461,10 +1457,10 @@ index 3f02231..b7fff4c 100644 #: ../src/gnome-terminal.glade2.h:103 diff --git a/po/si.po b/po/si.po -index 81dbf65..5cb0e5a 100644 +index adca7d5acba9..64c05665429b 100644 --- a/po/si.po +++ b/po/si.po -@@ -537,8 +537,8 @@ msgid "_Text color:" +@@ -538,8 +538,8 @@ msgid "_Text color:" msgstr "පෙළ වර්ණ: (_T)" #: ../src/gnome-terminal.glade2.h:86 @@ -1476,10 +1472,10 @@ index 81dbf65..5cb0e5a 100644 #: ../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 03ac832..e97eb61 100644 +index 1ad43ae0cbec..f31ecee58845 100644 --- a/po/sk.po +++ b/po/sk.po -@@ -2585,3 +2585,6 @@ msgstr "_Zavrieť okno" +@@ -2590,3 +2590,6 @@ msgstr "_Zavrieť okno" #~ "\n" #~ "Viac informácii o jednotlivých príkazoch získate pomocou „%s PRÍKAZ --" #~ "help“.\n" @@ -1487,10 +1483,10 @@ index 03ac832..e97eb61 100644 +msgid "Transparent background" +msgstr "Priehľadné pozadie" diff --git a/po/sl.po b/po/sl.po -index 72baf7b..83ad04a 100644 +index 754abb4ba4a2..4315da71bda5 100644 --- a/po/sl.po +++ b/po/sl.po -@@ -2322,3 +2322,6 @@ msgstr "_Zapri okno" +@@ -2525,3 +2525,6 @@ msgstr "_Zapri okno" #~ msgid "_Profile Preferences…" #~ msgstr "Možnosti _profila ..." @@ -1498,10 +1494,10 @@ index 72baf7b..83ad04a 100644 +msgid "Transparent background" +msgstr "Prosojno ozadje" diff --git a/po/sq.po b/po/sq.po -index e59c0b6..6fb4090 100644 +index 158f6cb167cc..96afc9b98fd4 100644 --- a/po/sq.po +++ b/po/sq.po -@@ -567,8 +567,8 @@ msgstr "Ngjyra e _tekstit:" +@@ -568,8 +568,8 @@ msgstr "Ngjyra e _tekstit:" # (pofilter) simplecaps: checks the capitalisation of two strings isn't wildly different #: ../src/gnome-terminal.glade2.h:85 @@ -1513,10 +1509,10 @@ index e59c0b6..6fb4090 100644 #: ../src/gnome-terminal.glade2.h:86 msgid "_Update login records when command is launched" diff --git a/po/sr.po b/po/sr.po -index 799352b..bad0c4e 100644 +index e229e742a550..9d0d123eacca 100644 --- a/po/sr.po +++ b/po/sr.po -@@ -2424,3 +2424,6 @@ msgstr "_Затвори прозор" +@@ -2387,3 +2387,6 @@ msgstr "_Затвори прозор" #~ msgid "Close Window" #~ msgstr "Затвори прозор" @@ -1524,10 +1520,10 @@ index 799352b..bad0c4e 100644 +msgid "Transparent background" +msgstr "Провидна позадина" diff --git a/po/sr@latin.po b/po/sr@latin.po -index 318a7a1..aa759aa 100644 +index c1d3f5c94811..906cf1652a73 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po -@@ -2424,3 +2424,6 @@ msgstr "_Zatvori prozor" +@@ -2387,3 +2387,6 @@ msgstr "_Zatvori prozor" #~ msgid "Close Window" #~ msgstr "Zatvori prozor" @@ -1535,10 +1531,10 @@ index 318a7a1..aa759aa 100644 +msgid "Transparent background" +msgstr "Providna pozadina" diff --git a/po/sv.po b/po/sv.po -index 38b9426..0ad3def 100644 +index c5da2a0487a8..ef20882c9e2c 100644 --- a/po/sv.po +++ b/po/sv.po -@@ -2281,5 +2281,8 @@ msgstr "Stän_g fönster" +@@ -2288,5 +2288,8 @@ msgstr "Stän_g fönster" #~ msgid "Unknown completion request for \"%s\"" #~ msgstr "Okänd kompletteringsbegäran för \"%s\"" @@ -1548,7 +1544,7 @@ index 38b9426..0ad3def 100644 #~ msgid "Missing command" #~ msgstr "Kommando saknas" diff --git a/po/ta.po b/po/ta.po -index 80aa2f6..61185b4 100644 +index 80aa2f684eec..61185b47f911 100644 --- a/po/ta.po +++ b/po/ta.po @@ -3028,8 +3028,8 @@ msgstr "_l சாளரத்தை மூடவும்" @@ -1563,7 +1559,7 @@ index 80aa2f6..61185b4 100644 #~ msgid "No such profile \"%s\", using default profile\n" #~ msgstr "\"%s\" என்ற வரியுரு கிடையாது, முன்னிருப்பு வரியுரு பயன்படுத்தப்படும்\n" diff --git a/po/te.po b/po/te.po -index 000cda3..6dcf793 100644 +index 82c0e0fc8f54..c60e1bc4a9c3 100644 --- a/po/te.po +++ b/po/te.po @@ -2898,8 +2898,8 @@ msgstr "కిటికీని మూసివేయి (_l)" @@ -1578,10 +1574,10 @@ index 000cda3..6dcf793 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "పారదర్శకంగా మారు లేదా చిత్రము బ్యాక్గ్రౌండ్ కు మారు(_h):" diff --git a/po/th.po b/po/th.po -index 91c78cc..1f1fa48 100644 +index 63263749655c..cfe13fc93211 100644 --- a/po/th.po +++ b/po/th.po -@@ -2676,8 +2676,8 @@ msgstr "ปิ_ดหน้าต่าง" +@@ -2803,8 +2803,8 @@ msgstr "ปิ_ดหน้าต่าง" #~ msgid "_Solid color" #~ msgstr "สี_ทึบ" @@ -1593,18 +1589,18 @@ index 91c78cc..1f1fa48 100644 #~ msgid "" #~ "You already have a profile called “%s”. Do you want to create another " diff --git a/po/tr.po b/po/tr.po -index f7c68e6..316587c 100644 +index 85a5c59ed059..e4d3ba4524e7 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" +@@ -2307,3 +2307,6 @@ msgstr "_Pencereyi Kapat" + + #~ msgid "_Same as text color" + #~ msgstr "_Metin rengiyle aynı" + +msgid "Transparent background" +msgstr "Şeffaf arkaplan" diff --git a/po/ug.po b/po/ug.po -index 1673bb3..e21e61e 100644 +index 313f76b98eae..be6089762082 100644 --- a/po/ug.po +++ b/po/ug.po @@ -2616,8 +2616,8 @@ msgstr "ماۋزۇ (_T):" @@ -1619,10 +1615,10 @@ index 1673bb3..e21e61e 100644 #~ 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 0a04bc6..c097f0c 100644 +index a08f25914d12..62e872aa770f 100644 --- a/po/uk.po +++ b/po/uk.po -@@ -3126,8 +3126,8 @@ msgstr "Закр_ити вікно" +@@ -3134,8 +3134,8 @@ msgstr "Закр_ити вікно" #~ msgid "_Solid color" #~ msgstr "_Суцільний колір" @@ -1634,10 +1630,10 @@ index 0a04bc6..c097f0c 100644 #~ msgid "Switch to Tab 2" #~ msgstr "До вкладки 2" diff --git a/po/vi.po b/po/vi.po -index 9036f38..5cbcc8c 100644 +index 01db48d95bf2..4fd74197deb8 100644 --- a/po/vi.po +++ b/po/vi.po -@@ -2690,3 +2690,6 @@ msgstr "Đón_g cửa sổ" +@@ -2867,3 +2867,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." @@ -1645,10 +1641,10 @@ index 9036f38..5cbcc8c 100644 +msgid "Transparent background" +msgstr "Nền trong suốt" diff --git a/po/wa.po b/po/wa.po -index 2856571..f068531 100644 +index 0e0a6a752b6d..7be7bcc04a93 100644 --- a/po/wa.po +++ b/po/wa.po -@@ -563,8 +563,8 @@ msgid "_Text color:" +@@ -564,8 +564,8 @@ msgid "_Text color:" msgstr "Coleur pol _tecse:" #: ../src/gnome-terminal.glade2.h:86 @@ -1660,10 +1656,10 @@ index 2856571..f068531 100644 #: ../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 e5981c6..7f9f804 100644 +index 44a8e21c7842..999efa7b4322 100644 --- a/po/xh.po +++ b/po/xh.po -@@ -620,8 +620,8 @@ msgid "_Text color:" +@@ -621,8 +621,8 @@ msgid "_Text color:" msgstr "_Umbala wombhalo:" #: ../src/gnome-terminal.glade2.h:102 @@ -1675,7 +1671,7 @@ index e5981c6..7f9f804 100644 #: ../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 e9a540f..8473524 100644 +index e9a540f2963a..8473524960e6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2357,3 +2357,6 @@ msgstr "关闭窗口(_L)" @@ -1686,7 +1682,7 @@ index e9a540f..8473524 100644 +msgid "Transparent background" +msgstr "透明背景" diff --git a/po/zh_HK.po b/po/zh_HK.po -index eb0ede7..aceb184 100644 +index 61153529f0c7..61d01db9fd0f 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -2376,3 +2376,6 @@ msgstr "關閉視窗(_L)" @@ -1697,7 +1693,7 @@ index eb0ede7..aceb184 100644 +msgid "Transparent background" +msgstr "透明背景" diff --git a/po/zh_TW.po b/po/zh_TW.po -index e85dda1..f69fd98 100644 +index e85dda1047a6..f69fd98ef82c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2558,3 +2558,6 @@ msgstr "關閉視窗(_L)" @@ -1708,5 +1704,4 @@ index e85dda1..f69fd98 100644 +msgid "Transparent background" +msgstr "透明背景" -- -2.5.0 - +2.7.4 diff --git a/palette-color.patch b/palette-color.patch deleted file mode 100644 index f5924094e62a..000000000000 --- a/palette-color.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 2a10e0ed7d6210b0522ffc2faf8483c64f1d183d Mon Sep 17 00:00:00 2001 -From: Egmont Koblinger <egmont@gmail.com> -Date: Fri, 22 Jul 2016 16:42:14 +0200 -Subject: profile: editor: Properly initialize the first palette color - -https://bugzilla.gnome.org/show_bug.cgi?id=768850 -(cherry picked from commit 6447aded26416e49bf5fdce8a8fd13c16c0ebb44) ---- - src/profile-editor.c | 11 +++-------- - 1 file changed, 3 insertions(+), 8 deletions(-) - -diff --git a/src/profile-editor.c b/src/profile-editor.c -index ff26df6..82cc7a9 100644 ---- a/src/profile-editor.c -+++ b/src/profile-editor.c -@@ -405,18 +405,13 @@ profile_palette_notify_colorpickers_cb (GSettings *profile, - for (i = 0; i < n_colors; i++) - { - char name[32]; -- GdkRGBA old_color; - - g_snprintf (name, sizeof (name), "palette-colorpicker-%" G_GSIZE_FORMAT, i + 1); - w = (GtkWidget *) gtk_builder_get_object (builder, name); - -- gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (w), &old_color); -- if (!rgba_equal (&old_color, &colors[i])) -- { -- g_signal_handlers_block_by_func (w, G_CALLBACK (palette_color_notify_cb), profile); -- gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (w), &colors[i]); -- g_signal_handlers_unblock_by_func (w, G_CALLBACK (palette_color_notify_cb), profile); -- } -+ g_signal_handlers_block_by_func (w, G_CALLBACK (palette_color_notify_cb), profile); -+ gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (w), &colors[i]); -+ g_signal_handlers_unblock_by_func (w, G_CALLBACK (palette_color_notify_cb), profile); - } - } - --- -cgit v0.12 - |