From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 17 Apr 2021 10:19:15 +0000 (+0200)
Subject: - rediffed
X-Git-Tag: auto/th/gnome-terminal-3.40.0-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgnome-terminal.git;a=commitdiff_plain;h=8a5b6f76053b3bdbfa3b2363c07d1cf6251e3883

- rediffed
---

diff --git a/gnome-terminal-transparency.patch b/gnome-terminal-transparency.patch
index 3879cc1..3db145f 100644
--- a/gnome-terminal-transparency.patch
+++ b/gnome-terminal-transparency.patch
@@ -137,11 +137,9 @@ index eaad9182fed2..e03e35fc1bea 100644
    w = (GtkWidget *) gtk_builder_get_object (builder, "enable-sixel-checkbutton");
    profile_prefs_settings_bind (profile, TERMINAL_PROFILE_ENABLE_SIXEL_KEY, w,
                                 "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
-diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
-index 5b0d8c3ed416..4da44232e491 100644
---- a/src/terminal-schemas.h
-+++ b/src/terminal-schemas.h
-@@ -73,6 +73,9 @@ G_BEGIN_DECLS
+--- gnome-terminal-3.40.0/src/terminal-schemas.h.orig	2021-04-17 08:51:31.266561277 +0200
++++ gnome-terminal-3.40.0/src/terminal-schemas.h	2021-04-17 09:04:42.797545957 +0200
+@@ -76,6 +76,9 @@ G_BEGIN_DECLS
  #define TERMINAL_PROFILE_VISIBLE_NAME_KEY               "visible-name"
  #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY       "word-char-exceptions"
  
@@ -149,8 +147,8 @@ index 5b0d8c3ed416..4da44232e491 100644
 +#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent"
 +
  #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY              "confirm-close"
+ #define TERMINAL_SETTING_CONTEXT_INFO_KEY               "context-info"
  #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 a85fcefd40e1..26202e4555ea 100644
 --- a/src/terminal-screen.c
@@ -826,22 +824,20 @@ index 4906009cf46f..f97d43b0e515 100644
  
  #: ../src/profile-preferences.glade.h:77
  msgid "_Unlimited"
-diff --git a/po/bn_IN.po b/po/bn_IN.po
-index f196e5084797..0ac3caf77e73 100644
---- a/po/bn_IN.po
-+++ b/po/bn_IN.po
-@@ -2296,8 +2296,8 @@ msgstr "উইন্ডো বন্ধ করুন (_l)"
- #~ msgid "Close Window"
- #~ msgstr "উইন্ডো বন্ধ করুন"
+--- gnome-terminal-3.40.0/po/bn_IN.po.orig	2021-02-22 17:08:51.000000000 +0100
++++ gnome-terminal-3.40.0/po/bn_IN.po	2021-04-17 09:13:12.663952116 +0200
+@@ -2894,8 +2894,8 @@ msgstr "উইন্ডো বন্ধ
+ #~ msgid "_Unlimited"
+ #~ msgstr "সীমাহীন (_U)"
  
 -#~ msgid "Set Title"
 -#~ msgstr "শিরোনাম নির্ধারণ করুন"
 +msgid "Set Title"
 +msgstr "শিরোনাম নির্ধারণ করুন"
  
- #~ msgid "Switch to Tab 2"
- #~ msgstr "ট্যাব ২-এ পরিবর্তন করুন"
-@@ -2356,5 +2356,8 @@ msgstr "উইন্ডো বন্ধ করুন (_l)"
+ #~ msgid "Switch to Tab 3"
+ #~ msgstr "ট্যাব ৩-এ পরিবর্তন করুন"
+@@ -2936,5 +2936,8 @@ msgstr "উইন্ডো বন্ধ
  #~ msgid "_Input Methods"
  #~ msgstr "ইনপুট পদ্ধতি (_I)"
  
@@ -916,12 +912,10 @@ index a6e8fb4250dc..c9ed8508228d 100644
 +
 +msgid "Transparent background"
 +msgstr "Fons transparent"
-diff --git a/po/cs.po b/po/cs.po
-index ee33ed2a0103..2acf2aa99656 100644
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -2310,3 +2310,6 @@ msgstr ""
- #: ../src/terminal-window.c:3353
+--- gnome-terminal-3.40.0/po/cs.po.orig	2021-04-17 09:13:42.492163594 +0200
++++ gnome-terminal-3.40.0/po/cs.po	2021-04-17 09:15:32.217846326 +0200
+@@ -2432,3 +2432,6 @@ msgstr ""
+ #: src/terminal-window.c:3242
  msgid "C_lose Window"
  msgstr "_Zavřít okno"
 +
@@ -967,20 +961,18 @@ index 65cfb20d9ad3..8c5c97c7465a 100644
  
  #~ msgid "Whether to allow bold text"
  #~ msgstr "Om fed tekst skal tillades"
-diff --git a/po/de.po b/po/de.po
-index 205f69111437..61b0214daf5b 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -2373,6 +2373,9 @@
+--- gnome-terminal-3.40.0/po/de.po.orig	2021-04-17 09:15:55.582389716 +0200
++++ gnome-terminal-3.40.0/po/de.po	2021-04-17 09:16:52.815353833 +0200
+@@ -2503,6 +2503,9 @@ msgstr ""
  msgid "C_lose Window"
  msgstr "Fenster _schließen"
  
 +msgid "Transparent background"
 +msgstr "Transparenter Hintergrund"
 +
- #~ msgid "Whether to show menubar in new windows/tabs"
- #~ msgstr ""
- #~ "Legt fest, ob in Fenstern/Reitern per Vorgabe die Menüleiste angezeigt "
+ # missing accelerator
+ #~ msgid "Whether to allow bold text"
+ #~ msgstr "Fetten Text erlauben?"
 diff --git a/po/dz.po b/po/dz.po
 index d97e6102b850..a768fe4adc54 100644
 --- a/po/dz.po
@@ -1142,22 +1134,20 @@ index c9999e204f33..dfbff85bf907 100644
  
  #~ msgid "S_hade transparent or image background:"
  #~ msgstr "S_hade transparent or image background:"
-diff --git a/po/eo.po b/po/eo.po
-index 567c08dc1da8..c59f57c6a8d5 100644
---- a/po/eo.po
-+++ b/po/eo.po
-@@ -2215,8 +2215,8 @@ msgstr "_Fermi la fenestron"
- #~ msgid "Close Window"
- #~ msgstr "Fermi la fenestron"
+--- gnome-terminal-3.40.0/po/eo.po.orig	2021-02-22 17:08:51.000000000 +0100
++++ gnome-terminal-3.40.0/po/eo.po	2021-04-17 11:16:42.667994998 +0200
+@@ -2827,8 +2827,8 @@ msgstr "_Fermi la fenestron"
+ #~ msgid "_Font:"
+ #~ msgstr "_Tiparo:"
  
 -#~ msgid "Set Title"
 -#~ msgstr "Agordi titolon"
 +msgid "Set Title"
 +msgstr "Agordi titolon"
  
- #~ msgid "Switch to Tab 2"
- #~ msgstr "Ŝalti al langeto 2"
-@@ -2299,8 +2299,8 @@ msgstr "_Fermi la fenestron"
+ #~ msgid "Switch to Tab 3"
+ #~ msgstr "Ŝalti al langeto 3"
+@@ -2890,8 +2890,8 @@ msgstr "_Fermi la fenestron"
  #~ msgid "_Input Methods"
  #~ msgstr "_Enigmetodoj"
  
@@ -1232,11 +1222,9 @@ index f3aab7879a6f..543a121f6aac 100644
  #~ msgid "Whether to allow bold text"
  #~ msgstr "Testu-formatu lodia onartzen den"
  
-diff --git a/po/fa.po b/po/fa.po
-index 8b0ca26eebe5..6079d0c40a1d 100644
---- a/po/fa.po
-+++ b/po/fa.po
-@@ -2402,8 +2402,8 @@ msgstr "_بستن پنجره"
+--- gnome-terminal-3.40.0/po/fa.po.orig	2021-03-19 22:43:50.000000000 +0100
++++ gnome-terminal-3.40.0/po/fa.po	2021-04-17 11:23:51.866939429 +0200
+@@ -2782,8 +2782,8 @@ msgstr "_بستن پنجره"
  #~ msgid "Use custom default terminal si_ze"
  #~ msgstr "استفاده از اندازه‌ی _سفارشی پایانه‌ی پیش‌فرض"
  
@@ -1247,18 +1235,18 @@ index 8b0ca26eebe5..6079d0c40a1d 100644
  
  #~ msgid "When terminal commands set their o_wn titles:"
  #~ msgstr "وقتی که فرمان‌های پایانه عنوان‌های _خودشان را تنظیم می‌کنند:"
-@@ -2426,8 +2426,8 @@ msgstr "_بستن پنجره"
- #~ msgid "Close Window"
- #~ msgstr "بستن پنجره"
+@@ -2797,8 +2797,8 @@ msgstr "_بستن پنجره"
+ #~ msgid "_Unlimited"
+ #~ msgstr "_نامحدود"
  
 -#~ msgid "Set Title"
 -#~ msgstr "تنظیم عنوان"
 +msgid "Set Title"
 +msgstr "تنظیم عنوان"
  
- #~ msgid "Switch to Tab 2"
- #~ msgstr "تعویض به زبانه‌ی ۲"
-@@ -2486,5 +2486,8 @@ msgstr "_بستن پنجره"
+ #~ msgid "Switch to Tab 3"
+ #~ msgstr "تعویض به زبانه‌ی ۳"
+@@ -2839,5 +2839,8 @@ msgstr "_بستن پنجره"
  #~ msgid "_Input Methods"
  #~ msgstr "روش‌های _ورودی"
  
@@ -1341,12 +1329,10 @@ index 93d5fa9d1481..feb87dce3d6b 100644
 +
 +msgid "Transparent background"
 +msgstr "Cúlra trédhearcach"
-diff --git a/po/gl.po b/po/gl.po
-index 4ae0f6a0935c..fa643dc89659 100644
---- a/po/gl.po
-+++ b/po/gl.po
-@@ -2418,3 +2418,6 @@ msgstr ""
- #: src/terminal-window.c:3224
+--- gnome-terminal-3.40.0/po/gl.po.orig	2021-04-17 11:24:17.591609307 +0200
++++ gnome-terminal-3.40.0/po/gl.po	2021-04-17 11:24:36.055901966 +0200
+@@ -2454,3 +2454,6 @@ msgstr ""
+ #: src/terminal-window.c:3245
  msgid "C_lose Window"
  msgstr "P_echar a xanela"
 +
@@ -1500,12 +1486,10 @@ index aec2eaa8bac1..207b5c774b32 100644
 +#: ../src/profile-preferences.glade.h:69
 +msgid "Transparent background"
 +msgstr "Prozirna pozadina"
-diff --git a/po/hu.po b/po/hu.po
-index 401ae619d5d2..b6e96230111b 100644
---- a/po/hu.po
-+++ b/po/hu.po
-@@ -2318,3 +2318,6 @@
- #: ../src/terminal-window.c:3256
+--- gnome-terminal-3.40.0/po/hu.po.orig	2021-04-17 11:24:59.037095972 +0200
++++ gnome-terminal-3.40.0/po/hu.po	2021-04-17 11:28:58.849555608 +0200
+@@ -2442,3 +2442,6 @@ msgstr ""
+ #: src/terminal-window.c:3245
  msgid "C_lose Window"
  msgstr "_Ablak bezárása"
 +
@@ -1551,37 +1535,31 @@ index 9198218c5aaa..9f2fbd0c9d4c 100644
  #~ msgid "Hindi"
  #~ msgstr "Hindi"
  
-diff --git a/po/it.po b/po/it.po
-index 632667207c17..2cd93716f4f9 100644
---- a/po/it.po
-+++ b/po/it.po
-@@ -2348,3 +2348,6 @@ msgstr ""
- #: ../src/terminal-window.c:3354
+--- gnome-terminal-3.40.0/po/it.po.orig	2021-04-17 11:29:23.354162096 +0200
++++ gnome-terminal-3.40.0/po/it.po	2021-04-17 12:02:02.886015004 +0200
+@@ -2468,3 +2468,6 @@ msgstr ""
+ #: src/terminal-window.c:3245
  msgid "C_lose Window"
  msgstr "Chiudi _finestra"
 +
 +msgid "Transparent background"
 +msgstr "Sfondo trasparente"
-diff --git a/po/ja.po b/po/ja.po
-index 9a18d3db624f..bbfd18e6ab24 100644
---- a/po/ja.po
-+++ b/po/ja.po
-@@ -2294,6 +2294,9 @@
+--- gnome-terminal-3.40.0/po/ja.po.orig	2021-04-17 12:02:26.077220372 +0200
++++ gnome-terminal-3.40.0/po/ja.po	2021-04-17 12:07:39.686853629 +0200
+@@ -2431,6 +2431,9 @@ msgstr ""
  msgid "C_lose Window"
  msgstr "ウィンドウを閉じる(_L)"
  
 +msgid "Transparent background"
 +msgstr "透過な画像にする"
 +
- #~ msgid "Verbose output"
- #~ msgstr "詳細な出力"
+ #~ msgid "Whether to allow bold text"
+ #~ msgstr "太字のフォントを許可するかどうか"
  
-diff --git a/po/ka.po b/po/ka.po
-index 2a0bc91fad40..c289e30eb4fa 100644
---- a/po/ka.po
-+++ b/po/ka.po
+--- gnome-terminal-3.40.0/po/ka.po.orig	2021-02-22 17:08:51.000000000 +0100
++++ gnome-terminal-3.40.0/po/ka.po	2021-04-17 12:12:38.605723333 +0200
 @@ -219,8 +219,8 @@ msgid "<b>Background</b>"
- msgstr "b>ფონი</b>"
+ msgstr "<b>ფონი</b>"
  
  #: ../src/gnome-terminal.glade2.h:3
 -msgid "<b>Command</b>"
@@ -1591,7 +1569,7 @@ index 2a0bc91fad40..c289e30eb4fa 100644
  
  #: ../src/gnome-terminal.glade2.h:4
  msgid "<b>Compatibility</b>"
-@@ -569,7 +569,7 @@ msgstr "_ტექსტის ფერი:"
+@@ -569,7 +569,7 @@ msgstr "_ტექსტის ფერ
  
  #: ../src/gnome-terminal.glade2.h:86
  #, fuzzy
@@ -1899,12 +1877,10 @@ index f2ebd4851d3b..f3d44c9c6294 100644
  #~ msgid "Accelerator key"
  #~ msgstr "Kekunci pemecut"
  
-diff --git a/po/nb.po b/po/nb.po
-index 683acfe5221e..3dc97ee17fec 100644
---- a/po/nb.po
-+++ b/po/nb.po
-@@ -2261,3 +2261,6 @@ msgstr ""
- #: ../src/terminal-window.c:3210
+--- gnome-terminal-3.40.0/po/nb.po.orig	2021-04-17 12:13:02.850316782 +0200
++++ gnome-terminal-3.40.0/po/nb.po	2021-04-17 12:13:27.591601923 +0200
+@@ -2406,3 +2406,6 @@ msgstr ""
+ #: src/terminal-window.c:3224
  msgid "C_lose Window"
  msgstr "_Lukk vindu"
 +
@@ -2723,12 +2699,10 @@ index 313f76b98eae..be6089762082 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 a08f25914d12..a4fbcbe6e474 100644
---- a/po/uk.po
-+++ b/po/uk.po
-@@ -2399,3 +2399,6 @@ msgstr ""
- #: src/terminal-window.c:3224
+--- gnome-terminal-3.40.0/po/uk.po.orig	2021-04-17 12:13:49.869425706 +0200
++++ gnome-terminal-3.40.0/po/uk.po	2021-04-17 12:17:37.387909749 +0200
+@@ -2431,3 +2431,6 @@ msgstr ""
+ #: src/terminal-window.c:3242
  msgid "C_lose Window"
  msgstr "Закр_ити вікно"
 +