diff --git a/.gitignore b/.gitignore index 135d90e..1957c1b 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.14.2.tar.xz /gnome-terminal-3.15.90.tar.xz /gnome-terminal-3.15.92.tar.xz +/gnome-terminal-3.16.0.tar.xz diff --git a/gnome-terminal-restore-transparency.patch b/gnome-terminal-restore-transparency.patch index 94267db..94585d8 100644 --- a/gnome-terminal-restore-transparency.patch +++ b/gnome-terminal-restore-transparency.patch @@ -1,4 +1,4 @@ -From 8ea762f5d96275e322490081d6fe7324484534a1 Mon Sep 17 00:00:00 2001 +From 2155e115d5fe25cbb7a4c52ab52d82d69a12f480 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 12 May 2014 14:57:18 +0200 Subject: [PATCH 1/3] Restore transparency @@ -23,10 +23,10 @@ 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 e480155..051bdc4 100644 +index 0f8433f..104e662 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml -@@ -332,6 +332,16 @@ +@@ -333,6 +333,16 @@ 'narrow' Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding @@ -269,7 +269,7 @@ index 12cae4f..366e4f8 100644 2.1.0 -From 662fba4310abed796250e7acab64bce7545096df Mon Sep 17 00:00:00 2001 +From a2ad67f5b0b98b22b71bd28aeb8eda369fc21a3b Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 28 May 2014 14:11:02 +0200 Subject: [PATCH 2/3] window: Make the drawing robust across all themes @@ -331,7 +331,7 @@ index 366e4f8..2458656 100644 2.1.0 -From f6a4b0b297d987ce3bc53ade36dae84ab3fad612 Mon Sep 17 00:00:00 2001 +From cb436cf1327f77915d0e1df6ba24bb9f2d32ff48 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 17 Feb 2015 17:06:17 +0100 Subject: [PATCH 3/3] Restore translations for transparency @@ -362,7 +362,7 @@ Subject: [PATCH 3/3] Restore translations for transparency po/et.po | 3 +++ po/eu.po | 4 ++-- po/fa.po | 3 +++ - po/fi.po | 3 +++ + po/fi.po | 5 ++++- po/fr.po | 3 +++ po/fur.po | 4 ++-- po/ga.po | 3 +++ @@ -375,7 +375,7 @@ Subject: [PATCH 3/3] Restore translations for transparency po/hy.po | 4 ++-- po/id.po | 3 +++ po/it.po | 3 +++ - po/ja.po | 4 ++-- + po/ja.po | 3 +++ po/ka.po | 2 +- po/kk.po | 3 +++ po/kn.po | 3 +++ @@ -424,7 +424,7 @@ Subject: [PATCH 3/3] Restore translations for transparency po/zh_CN.po | 3 +++ po/zh_HK.po | 3 +++ po/zh_TW.po | 3 +++ - 87 files changed, 208 insertions(+), 102 deletions(-) + 87 files changed, 210 insertions(+), 101 deletions(-) diff --git a/po/am.po b/po/am.po index 27a7e96..04a8ad9 100644 @@ -528,10 +528,10 @@ 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 1a0d446..f16200a 100644 +index 7e9c9be..241ef52 100644 --- a/po/bg.po +++ b/po/bg.po -@@ -2101,3 +2101,6 @@ msgstr "" +@@ -2100,3 +2100,6 @@ msgstr "" #: ../src/terminal-window.c:3652 msgid "C_lose Window" msgstr "_Затваряне на този прозорец" @@ -628,10 +628,10 @@ index 74b7d0b..af69a6b 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 d4ac23f..81c7149 100644 +index 6b2bb19..2b814c0 100644 --- a/po/de.po +++ b/po/de.po -@@ -3045,8 +3045,8 @@ msgstr "Fenster _schließen" +@@ -3060,8 +3060,8 @@ msgstr "Fenster _schließen" #~ msgid "Background image _scrolls" #~ msgstr "Hintergrundbild _folgt Bildlauf" @@ -714,10 +714,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 be73e63..a0d5e7f 100644 +index c8b47fe..4d33066 100644 --- a/po/es.po +++ b/po/es.po -@@ -3101,8 +3101,8 @@ msgstr "_Cerrar ventana" +@@ -3095,8 +3095,8 @@ msgstr "_Cerrar ventana" #~ msgid "_Solid color" #~ msgstr "Color _sólido" @@ -740,10 +740,10 @@ index 4b1c2a7..7707611 100644 +msgid "Transparent background" +msgstr "Läbipaistev taust" diff --git a/po/eu.po b/po/eu.po -index 9d47c54..3ce1d91 100644 +index 97bb976..b53f33c 100644 --- a/po/eu.po +++ b/po/eu.po -@@ -2957,8 +2957,8 @@ msgstr "It_xi leihoa" +@@ -2972,8 +2972,8 @@ msgstr "It_xi leihoa" #~ msgid "_Solid color" #~ msgstr "_Kolore solidoa" @@ -766,16 +766,26 @@ index 2090863..b9a05af 100644 +msgid "Transparent background" +msgstr "پس‌زمینه‌ی شفاف" diff --git a/po/fi.po b/po/fi.po -index 3954f3f..11d7e6e 100644 +index f80a962..dacd609 100644 --- a/po/fi.po +++ b/po/fi.po -@@ -2090,3 +2090,6 @@ msgstr "" - #: ../src/terminal-window.c:3645 +@@ -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" + +@@ -2083,4 +2086,4 @@ msgstr "_Sulje ikkuna" + #~ msgstr "Käytetäänkö teeman tummaan muunnelmaa" + + #~ msgid "Use _dark theme variant" +-#~ msgstr "Käytä _teeman tummaa muunnelmaa" ++#~ msgstr "Käytä _teeman tummaa muunnelmaa" +\ No newline at end of file diff --git a/po/fr.po b/po/fr.po index fd28f38..babd28d 100644 --- a/po/fr.po @@ -814,7 +824,7 @@ index 93d5fa9..feb87dc 100644 +msgid "Transparent background" +msgstr "Cúlra trédhearcach" diff --git a/po/gl.po b/po/gl.po -index 5c5792a..ebad883 100644 +index 1429c66..6820190 100644 --- a/po/gl.po +++ b/po/gl.po @@ -3055,8 +3055,8 @@ msgstr "P_echar a xanela" @@ -915,42 +925,38 @@ 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 1339d3a..d897ef9 100644 +index 346b5d8..2448444 100644 --- a/po/id.po +++ b/po/id.po @@ -2068,3 +2068,6 @@ msgstr "" - #: ../src/terminal-window.c:3645 + #: ../src/terminal-window.c:3652 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 ae4b26b..ff727df 100644 +index 5a1847f..2eb1d62 100644 --- a/po/it.po +++ b/po/it.po -@@ -2081,3 +2081,6 @@ msgstr "Chiudi _finestra" - - #~ msgid "_Detach tab" - #~ msgstr "St_acca scheda" +@@ -2093,3 +2093,6 @@ msgstr "" + #: ../src/terminal-window.c:3652 + msgid "C_lose Window" + msgstr "Chiudi _finestra" + +msgid "Transparent background" +msgstr "Sfondo trasparente" diff --git a/po/ja.po b/po/ja.po -index 529b672..fda6fb1 100644 +index 4f8f4de..ce2ec95 100644 --- a/po/ja.po +++ b/po/ja.po -@@ -2472,8 +2472,8 @@ msgstr "ウィンドウを閉じる(_L)" - #~ msgid "_Solid color" - #~ msgstr "単色にする(_S)" - --#~ msgid "_Transparent background" --#~ msgstr "透過な画像にする(_T)" +@@ -1902,3 +1902,6 @@ msgstr "この端末には未だ実行中のプロセスが存在しています + #: ../src/terminal-window.c:3652 + msgid "C_lose Window" + msgstr "ウィンドウを閉じる(_L)" ++ +msgid "Transparent background" +msgstr "透過な画像にする" - - #~ msgid "No such profile \"%s\", using default profile\n" - #~ msgstr "\"%s\" というプロファイルはありません (デフォルトのプロファイルを使用します)\n" diff --git a/po/ka.po b/po/ka.po index 8415e88..3717b7e 100644 --- a/po/ka.po @@ -987,10 +993,10 @@ index c887f88..e899ef3 100644 +msgid "Transparent background" +msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ" diff --git a/po/ko.po b/po/ko.po -index 947c613..9d03cdd 100644 +index 0700e25..912e940 100644 --- a/po/ko.po +++ b/po/ko.po -@@ -2079,3 +2079,6 @@ msgstr "창 닫기(_L)" +@@ -2078,3 +2078,6 @@ msgstr "창 닫기(_L)" #~ msgid "Use _dark theme variant" #~ msgstr "어두운 테마 사용(_D)" @@ -1013,10 +1019,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 6189d72..d355f78 100644 +index c906132..aa1403f 100644 --- a/po/lt.po +++ b/po/lt.po -@@ -2087,3 +2087,6 @@ msgstr "_Užverti langą" +@@ -2083,3 +2083,6 @@ msgstr "_Užverti langą" #~ msgid "Use _dark theme variant" #~ msgstr "Nau_doti tamsų temos variantą" @@ -1144,7 +1150,7 @@ 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 2894433..145589e 100644 +index c14ae58..f5a590e 100644 --- a/po/nb.po +++ b/po/nb.po @@ -2054,3 +2054,6 @@ msgstr "" @@ -1362,7 +1368,7 @@ 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 0c6911a..d9d067d 100644 +index 9bef0bf..52e4af2 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2354,3 +2354,6 @@ msgstr "_Zavrieť okno" @@ -1399,10 +1405,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 26c317e..674c469 100644 +index fce0f63..22f129a 100644 --- a/po/sr.po +++ b/po/sr.po -@@ -2080,3 +2080,6 @@ msgstr "_Затвори прозор" +@@ -2230,3 +2230,6 @@ msgstr "_Затвори прозор" #~ msgid "Close Window" #~ msgstr "Затвори прозор" @@ -1410,10 +1416,10 @@ index 26c317e..674c469 100644 +msgid "Transparent background" +msgstr "Провидна позадина" diff --git a/po/sr@latin.po b/po/sr@latin.po -index 6b55abb..cfe6baa 100644 +index c82646c..55f6a0e 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po -@@ -2082,3 +2082,6 @@ msgstr "_Zatvori prozor" +@@ -2230,3 +2230,6 @@ msgstr "_Zatvori prozor" #~ msgid "Close Window" #~ msgstr "Zatvori prozor" @@ -1464,10 +1470,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 bf1cc56..a269244 100644 +index be9b0cb..482907f 100644 --- a/po/th.po +++ b/po/th.po -@@ -2601,8 +2601,8 @@ msgstr "ปิ_ดหน้าต่าง" +@@ -2616,8 +2616,8 @@ msgstr "ปิ_ดหน้าต่าง" #~ msgid "_Solid color" #~ msgstr "สี_ทึบ" @@ -1479,11 +1485,11 @@ index bf1cc56..a269244 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 a8cfcb3..3580986 100644 +index 02a704a..78f26ba 100644 --- a/po/tr.po +++ b/po/tr.po -@@ -1971,3 +1971,6 @@ msgstr "Hala bir süreç bu uçbirimde çalışıyor. Uçbirimi kapatmak onu son - #: ../src/terminal-window.c:3645 +@@ -1968,3 +1968,6 @@ msgstr "Hala bir süreç bu uçbirimde çalışıyor. Uçbirimi kapatmak onu son + #: ../src/terminal-window.c:3652 msgid "C_lose Window" msgstr "_Pencereyi Kapat" + @@ -1583,10 +1589,10 @@ index eb0ede7..aceb184 100644 +msgid "Transparent background" +msgstr "透明背景" diff --git a/po/zh_TW.po b/po/zh_TW.po -index e009290..f208482 100644 +index a32a539..f0674dc 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po -@@ -2381,3 +2381,6 @@ msgstr "關閉視窗(_L)" +@@ -2379,3 +2379,6 @@ msgstr "關閉視窗(_L)" #~ msgid "Show session management options" #~ msgstr "顯示作業階段管理選項" diff --git a/gnome-terminal.spec b/gnome-terminal.spec index f94809b..e827fb8 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -7,13 +7,13 @@ Summary: Terminal emulator for GNOME Name: gnome-terminal -Version: 3.15.92 +Version: 3.16.0 Release: 1%{?dist} License: GPLv3+ and GFDL Group: User Interface/Desktops URL: http://www.gnome.org/ #VCS: git:git://git.gnome.org/gnome-terminal -Source0: http://download.gnome.org/sources/gnome-terminal/3.15/gnome-terminal-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-terminal/3.16/gnome-terminal-%{version}.tar.xz Source1: org.gnome.Terminal.gschema.override Patch0: 0001-build-Don-t-treat-warnings-as-errors.patch @@ -107,6 +107,10 @@ fi %{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so %changelog +* Tue Mar 24 2015 Debarshi Ray - 3.16.0-1 +- Update to 3.16.0 +- Rebase the translations for transparency strings + * Tue Mar 17 2015 Debarshi Ray - 3.15.92-1 - Update to 3.15.92 - Drop upstreamed patch diff --git a/sources b/sources index 6b0c018..8651961 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c97dd6f9532f652434e0d4455df3861c gnome-terminal-3.15.92.tar.xz +518f11b8bcba3fe9be5a005c4a3155f4 gnome-terminal-3.16.0.tar.xz