September 2015 - tor-commits - lists.torproject.org

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 28 Sep '15

28 Sep '15

commit 9b9ac166f4d58fd851c952ec723e8b1ff4643f4d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 28 13:46:35 2015 +0000 Update translations for tor-messenger-ircproperties --- th/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/th/irc.properties b/th/irc.properties index 3fd93d9..95b50dc 100644 --- a/th/irc.properties +++ b/th/irc.properties @@ -26,7 +26,7 @@ joinChat.password=_Password # These are the protocol specific options shown in the account manager and # account wizard windows. options.server=Server -options.port=Port +options.port=พอร์ต: options.ssl=Use SSL options.encoding=Character Set options.quitMessage=Quit message

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 28 Sep '15

28 Sep '15

commit 8bc137a3a1d89b85e4b0733cdbf821f701b428d4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 28 13:45:24 2015 +0000 Update translations for https_everywhere_completed --- th/https-everywhere.dtd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/th/https-everywhere.dtd b/th/https-everywhere.dtd index 13dc10d..18408ee 100644 --- a/th/https-everywhere.dtd +++ b/th/https-everywhere.dtd @@ -5,7 +5,7 @@ <!ENTITY https-everywhere.about.created_by "สร้างโดย"> <!ENTITY https-everywhere.about.librarians "คลังกฎ"> <!ENTITY https-everywhere.about.thanks "ขอบคุณ"> -<!ENTITY https-everywhere.about.contribute "ถ้าคุณชอบ HTTPS Everywhere คุณอาจพิจารณา"> +<!ENTITY https-everywhere.about.contribute "ถ้าคุณชอบ HTTPS Everywhere คุณอาจลองพิจารณา"> <!ENTITY https-everywhere.about.donate_tor "บริจาคให้กับ Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> <!ENTITY https-everywhere.about.or "หรือ"> @@ -17,6 +17,7 @@ <!ENTITY https-everywhere.menu.globalDisable "ปิดใช้ HTTPS Everywhere"> <!ENTITY https-everywhere.menu.blockHttpRequests "หยุดการเชื่อมต่อผ่าน HTTP"> <!ENTITY https-everywhere.menu.showCounter "แสดงตัวนับ"> +<!ENTITY https-everywhere.menu.viewAllRules "ดูกติกาทั้งหมด"> <!ENTITY https-everywhere.prefs.title "ปรับแต่ง HTTPS Everywhere"> <!ENTITY https-everywhere.prefs.enable_all "เปิดใช้ทั้งหมด">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 28 Sep '15

28 Sep '15

commit 00e3069a8f6016ff6dedafeff4885bb60a26a9c6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 28 13:45:19 2015 +0000 Update translations for https_everywhere --- th/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/th/https-everywhere.dtd b/th/https-everywhere.dtd index bbe9f39..18408ee 100644 --- a/th/https-everywhere.dtd +++ b/th/https-everywhere.dtd @@ -5,7 +5,7 @@ <!ENTITY https-everywhere.about.created_by "สร้างโดย"> <!ENTITY https-everywhere.about.librarians "คลังกฎ"> <!ENTITY https-everywhere.about.thanks "ขอบคุณ"> -<!ENTITY https-everywhere.about.contribute "ถ้าคุณชอบ HTTPS Everywhere คุณอาจพิจารณา"> +<!ENTITY https-everywhere.about.contribute "ถ้าคุณชอบ HTTPS Everywhere คุณอาจลองพิจารณา"> <!ENTITY https-everywhere.about.donate_tor "บริจาคให้กับ Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> <!ENTITY https-everywhere.about.or "หรือ"> @@ -17,7 +17,7 @@ <!ENTITY https-everywhere.menu.globalDisable "ปิดใช้ HTTPS Everywhere"> <!ENTITY https-everywhere.menu.blockHttpRequests "หยุดการเชื่อมต่อผ่าน HTTP"> <!ENTITY https-everywhere.menu.showCounter "แสดงตัวนับ"> -<!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> +<!ENTITY https-everywhere.menu.viewAllRules "ดูกติกาทั้งหมด"> <!ENTITY https-everywhere.prefs.title "ปรับแต่ง HTTPS Everywhere"> <!ENTITY https-everywhere.prefs.enable_all "เปิดใช้ทั้งหมด">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 28 Sep '15

28 Sep '15

commit eb419221b105c9880b7c6f1c01e8b0387c8e71fd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 28 13:45:03 2015 +0000 Update translations for bridgedb --- th/LC_MESSAGES/bridgedb.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po index 73e04b4..1915ea7 100644 --- a/th/LC_MESSAGES/bridgedb.po +++ b/th/LC_MESSAGES/bridgedb.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# BlackDog ForThai <myblackdog(a)tuta.io>, 2015 # exploiz <exploiz(a)gmail.com>, 2014 # lanichita <vainilla7(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Thai (http://www.transifex.com/projects/p/torproject/language/th/)\n" +"PO-Revision-Date: 2015-09-28 13:42+0000\n" +"Last-Translator: BlackDog ForThai <myblackdog(a)tuta.io>\n" +"Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -32,7 +33,7 @@ msgstr "" #. "Tor Browser" #: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." -msgstr "ผิดปรกติ ! มีบางอย่างผิดปรกติจากการขอ" +msgstr "ขออภัย ! คำสั่งที่คุณสั่งไปมันผิดปรกติ" #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" @@ -47,7 +48,7 @@ msgstr "บริดจ์ของท่าน" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "" +msgstr "คุณส่งถี่เกินระบบกำหนด โปรดช้าลงหน่อย อย่างน้อยๆที่สุดคือ %s ชม. ต่อการส่งแต่ละอีเมล\nอีเมลใดๆที่ส่งไประหว่างช่วงเวลานั้นจะถูกเพิกเฉย" #: lib/bridgedb/strings.py:25 msgid "" @@ -62,20 +63,20 @@ msgstr "ต้อนรับสู่ BridgeDB" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "Currently supported transport TYPEs:" #: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "เฮ้!, %s!" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "" +msgstr "สวัสดี สหาย!" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" -msgstr "" +msgstr "Public Keys" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 28 Sep '15

28 Sep '15

commit d66f89bed905aa7e98ccfd5a4ae27fec628312dd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 28 08:15:44 2015 +0000 Update translations for tails-misc_completed --- it.po | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/it.po b/it.po index 785cfe4..cd36283 100644 --- a/it.po +++ b/it.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Emanuele Trotta <etrotta(a)grupposintesi.it>, 2015 # il_doc <filippo.giomi(a)gmail.com>, 2014 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 # Francesco Tombolini <tombo(a)adamantio.net>, 2015 @@ -23,10 +24,10 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-06-16 18:26+0000\n" -"Last-Translator: Stefano Avezzù <Opusprimo(a)gmail.com>\n" -"Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" +"POT-Creation-Date: 2015-09-20 19:32+0200\n" +"PO-Revision-Date: 2015-09-28 07:54+0000\n" +"Last-Translator: Emanuele Trotta <etrotta(a)grupposintesi.it>\n" +"Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -321,23 +322,23 @@ msgstr "La rete sembrerebbe bloccata. Ciò potrebbe essere dovuto alla modifica msgid "This version of Tails has known security issues:" msgstr "Questa versione di Tails ha problemi di sicurezza noti:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45 #, sh-format msgid "Network card ${nic} disabled" msgstr "Scheda di rete ${nic} disabilitata" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." msgstr "L'oscuramento dell'indirizzo MAC è fallito per la scheda di rete ${nic_name} (${nic}) che è stata quindi temporaneamente disabilitata. Si potrebbe voler riavviare Tails e disabilitare l'oscuramento dell'indirizzo MAC. Per maggiori informazioni, consultare la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentazione</a>." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55 msgid "All networking disabled" msgstr "Rete disabilitata" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -384,19 +385,19 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Per saperne di più ...</a>" -#: config/chroot_local-includes/usr/local/bin/tor-browser:18 +#: config/chroot_local-includes/usr/local/bin/tor-browser:29 msgid "Tor is not ready" msgstr "Tor non è pronto" -#: config/chroot_local-includes/usr/local/bin/tor-browser:19 +#: config/chroot_local-includes/usr/local/bin/tor-browser:30 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor non è pronto. Avviare comunque il Tor Browser?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:20 +#: config/chroot_local-includes/usr/local/bin/tor-browser:31 msgid "Start Tor Browser" msgstr "Avvia Tor Browser" -#: config/chroot_local-includes/usr/local/bin/tor-browser:21 +#: config/chroot_local-includes/usr/local/bin/tor-browser:32 msgid "Cancel" msgstr "Annulla" @@ -483,8 +484,8 @@ msgid "I2P's router console is ready" msgstr "La console del router I2P è pronta" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 -msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "Adesso puoi accedere alla console router di I2P all'indirizzo http://127.0.0.1:7657." +msgid "You can now access I2P's router console in the I2P Browser." +msgstr "Adesso puoi accedere alla console router di I2P nel Browser I2P." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -492,10 +493,10 @@ msgstr "I2P non è pronto" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" -"Eepsite tunnel not built within six minutes. Check the router console at " -"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." -" Reconnect to the network to try again." -msgstr "Il tunnel Eepsite non è stato costruito nell'arco di sei minuti. Controlla la console router all'indirizzo http://127.0.0.1:7657/logs o nei log in /var/log/i2p per maggiori informazioni. Riconnetti alla rete e riprova." +"Eepsite tunnel not built within six minutes. Check the router console in the" +" I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " +"the network to try again." +msgstr "Il tunnel Eepsite non è stato costruito nell'arco di sei minuti. Controlla la console router nel Browser I2P o i log in /var/log/i2p per maggiori informazioni. Riconnetti alla rete e riprova." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 28 Sep '15

28 Sep '15

commit 5ce5de06b7a88bdc03d468d58490aa6c24ad3349 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 28 08:15:39 2015 +0000 Update translations for tails-misc --- it.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/it.po b/it.po index eedb6f2..cd36283 100644 --- a/it.po +++ b/it.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Emanuele Trotta <etrotta(a)grupposintesi.it>, 2015 # il_doc <filippo.giomi(a)gmail.com>, 2014 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 # Francesco Tombolini <tombo(a)adamantio.net>, 2015 @@ -24,8 +25,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-21 09:20+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2015-09-28 07:54+0000\n" +"Last-Translator: Emanuele Trotta <etrotta(a)grupposintesi.it>\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -484,7 +485,7 @@ msgstr "La console del router I2P è pronta" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console in the I2P Browser." -msgstr "" +msgstr "Adesso puoi accedere alla console router di I2P nel Browser I2P." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -495,7 +496,7 @@ msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." -msgstr "" +msgstr "Il tunnel Eepsite non è stato costruito nell'arco di sei minuti. Controlla la console router nel Browser I2P o i log in /var/log/i2p per maggiori informazioni. Riconnetti alla rete e riprova." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

[torbirdy/master] Merge pull request #24 from u451f/patch+13721-default-locale
by sukhbir＠torproject.org 28 Sep '15

28 Sep '15

commit 19cc1c71b9ee44554f3ff5ac6006da1380bd3a95 Merge: 4cdded4 3d625f3 Author: Sukhbir Singh <s3singh(a)uwaterloo.ca> Date: Mon Sep 28 03:40:26 2015 -0400 Merge pull request #24 from u451f/patch+13721-default-locale As suggested by anonym on #13721, add en-US locale to chrome.manifest chrome.manifest | 1 + 1 file changed, 1 insertion(+)

1 0

[torbirdy/master] As suggested by anonym on #13721, add en-US locale to chrome.manifest
by sukhbir＠torproject.org 28 Sep '15

28 Sep '15

commit 3d625f36926b958dcaa23ea453d1d2b5a61edee4 Author: Ulrike Uhlig <u(a)451f.org> Date: Sun Sep 27 14:11:07 2015 +0200 As suggested by anonym on #13721, add en-US locale to chrome.manifest --- chrome.manifest | 1 + 1 file changed, 1 insertion(+) diff --git a/chrome.manifest b/chrome.manifest index 79134aa..78f1183 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -16,6 +16,7 @@ locale castironthunderbirdclub de chrome/locale/de/ locale castironthunderbirdclub el chrome/locale/el/ locale castironthunderbirdclub en chrome/locale/en/ locale castironthunderbirdclub en-GB chrome/locale/en-GB/ +locale castironthunderbirdclub en-US chrome/locale/en/ locale castironthunderbirdclub es chrome/locale/es/ locale castironthunderbirdclub eu chrome/locale/eu/ locale castironthunderbirdclub fr chrome/locale/fr/

1 0

[tor-messenger-build/master] Update cert-installer.patch for OS X
by sukhbir＠torproject.org 28 Sep '15

28 Sep '15

commit 6540c5cd3cdd894488190fd507d2f27da48b9f7d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Sep 28 03:32:45 2015 -0400 Update cert-installer.patch for OS X --- projects/instantbird/cert-installer.patch | 39 ++++++++++++++++++----------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/projects/instantbird/cert-installer.patch b/projects/instantbird/cert-installer.patch index 06da2ff..ea5f60e 100644 --- a/projects/instantbird/cert-installer.patch +++ b/projects/instantbird/cert-installer.patch @@ -1,18 +1,14 @@ -diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in -index 0234b21..5d20e62 100644 ---- a/im/installer/Makefile.in -+++ b/im/installer/Makefile.in -@@ -113,7 +113,9 @@ MOZ_PKG_MAC_ICON=branding/disk.icns - MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ " - endif +diff --git a/im/app/profile/moz.build b/im/app/profile/moz.build +--- a/im/app/profile/moz.build ++++ b/im/app/profile/moz.build +@@ -9,6 +9,7 @@ + DEFINES['HAVE_SHELL_SERVICE'] = 1 --NON_OMNIJAR_FILES = -+NON_OMNIJAR_FILES = \ -+ defaults/profile/cert_override.txt \ -+ $(NULL) - - ifndef LIBXUL_SDK - INSTALL_SDK = 1 + FINAL_TARGET_FILES.defaults.profile += [ ++ 'cert_override.txt', + 'localstore.rdf', + 'mimeTypes.rdf', + ] diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in index edf01b1..78db5e4 100644 --- a/im/installer/package-manifest.in @@ -25,3 +21,18 @@ index edf01b1..78db5e4 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js +diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in +index 0234b21..5d20e62 100644 +--- a/im/installer/Makefile.in ++++ b/im/installer/Makefile.in +@@ -113,7 +113,9 @@ MOZ_PKG_MAC_ICON=branding/disk.icns + MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ " + endif + +-NON_OMNIJAR_FILES = ++NON_OMNIJAR_FILES = \ ++ defaults/profile/cert_override.txt \ ++ $(NULL) + + ifndef LIBXUL_SDK + INSTALL_SDK = 1

1 0

[tor-messenger-build/master] Remove patches merged upstream for Windows and OS X
by sukhbir＠torproject.org 28 Sep '15

28 Sep '15

commit bee5c819340d1e630c6d36a616f7063dcc1e3f83 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Sep 28 03:31:40 2015 -0400 Remove patches merged upstream for Windows and OS X --- projects/instantbird/824009fbc42f.mozpatch | 20 ----- ...ckport-Make-D3DVsyncDisplay-destructor.mozpatch | 45 ---------- ...refox-app-menu-sometimes-contains-only.mozpatch | 20 ----- .../instantbird/f2e7cea9bc6a-bug-1150967.patch | 86 -------------------- 4 files changed, 171 deletions(-) diff --git a/projects/instantbird/824009fbc42f.mozpatch b/projects/instantbird/824009fbc42f.mozpatch deleted file mode 100644 index bc2a61c..0000000 --- a/projects/instantbird/824009fbc42f.mozpatch +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -# User Trevor Saunders <tbsaunde(a)tbsaunde.org> -# Date 1426879106 14400 -# Fri Mar 20 15:18:26 2015 -0400 -# Node ID 824009fbc42fed138b9ff0b9d1ee44e8502773dd -# Parent 6ef7ca8f1db3f984dfa255ff6222edca6dc890d6 -bug 1183967 - fixup correct case of mfidl.h - -diff -r 6ef7ca8f1db3 -r 824009fbc42f gfx/layers/IMFYCbCrImage.h ---- a/gfx/layers/IMFYCbCrImage.h Mon Mar 16 14:30:41 2015 -0400 -+++ b/gfx/layers/IMFYCbCrImage.h Fri Mar 20 15:18:26 2015 -0400 -@@ -8,7 +8,7 @@ - - #include "mozilla/RefPtr.h" - #include "ImageContainer.h" --#include "Mfidl.h" -+#include "mfidl.h" - - namespace mozilla { - namespace layers { diff --git a/projects/instantbird/Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch b/projects/instantbird/Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch deleted file mode 100644 index 7e891c1..0000000 --- a/projects/instantbird/Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch +++ /dev/null @@ -1,45 +0,0 @@ -From 6f443d4c93cee1df3ad645b06d1441df8c3706a3 Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Fri, 22 May 2015 12:27:53 +0200 -Subject: [PATCH] Bug 1133689 (backport) - Make D3DVsyncDisplay destructor - private. - ---- - gfx/thebes/gfxWindowsPlatform.cpp | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp -index 37e6907fb3cb..5a7b18cc97da 100644 ---- a/gfx/thebes/gfxWindowsPlatform.cpp -+++ b/gfx/thebes/gfxWindowsPlatform.cpp -@@ -2001,13 +2001,6 @@ public: - mSoftwareVsyncRate = TimeDuration::FromMilliseconds(rate); - } - -- virtual ~D3DVsyncDisplay() -- { -- MOZ_ASSERT(NS_IsMainThread()); -- DisableVsync(); -- delete mVsyncThread; -- } -- - virtual void EnableVsync() override - { - MOZ_ASSERT(NS_IsMainThread()); -@@ -2110,6 +2103,13 @@ public: - } - - private: -+ virtual ~D3DVsyncDisplay() -+ { -+ MOZ_ASSERT(NS_IsMainThread()); -+ DisableVsync(); -+ delete mVsyncThread; -+ } -+ - bool IsInVsyncThread() - { - return mVsyncThread->thread_id() == PlatformThread::CurrentId(); --- -2.1.0 - diff --git a/projects/instantbird/Bug-1151345-Firefox-app-menu-sometimes-contains-only.mozpatch b/projects/instantbird/Bug-1151345-Firefox-app-menu-sometimes-contains-only.mozpatch deleted file mode 100644 index b8b798f..0000000 --- a/projects/instantbird/Bug-1151345-Firefox-app-menu-sometimes-contains-only.mozpatch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/widget/cocoa/nsAppShell.mm b/widget/cocoa/nsAppShell.mm -index 10e0f0e..c89cee9 100644 ---- a/widget/cocoa/nsAppShell.mm -+++ b/widget/cocoa/nsAppShell.mm -@@ -28,6 +28,7 @@ - #include "nsCocoaFeatures.h" - #include "nsCocoaUtils.h" - #include "nsChildView.h" -+#include "nsMenuBarX.h" - #include "nsToolkit.h" - #include "TextInputHandler.h" - #include "mozilla/HangMonitor.h" -@@ -647,6 +648,7 @@ nsAppShell::Run(void) - mStarted = true; - - AddScreenWakeLockListener(); -+ nsMenuBarX::ResetNativeApplicationMenu(); - - NS_OBJC_TRY_ABORT([NSApp run]); - diff --git a/projects/instantbird/f2e7cea9bc6a-bug-1150967.patch b/projects/instantbird/f2e7cea9bc6a-bug-1150967.patch deleted file mode 100644 index 223019c..0000000 --- a/projects/instantbird/f2e7cea9bc6a-bug-1150967.patch +++ /dev/null @@ -1,86 +0,0 @@ -# HG changeset patch -# User Sebastian Hengst <archaeopteryx(a)coole-files.de> -# Date 1428083489 -7200 -# Fri Apr 03 19:51:29 2015 +0200 -# Node ID f2e7cea9bc6aca3140fb49512d4cc16f85988540 -# Parent 1cc7a71a04355c949421c3789386c48af37f5f3b -Bug 1150967 - Port Bug 1147839 - Fix building installer on mingw by only including helper.exe if mknsisu is used. r=clokep,mkmelin,Neil a=Ratty for SeaMonkey CLOSED TREE - -diff -r 1cc7a71a0435 -r f2e7cea9bc6a im/installer/Makefile.in ---- a/im/installer/Makefile.in Thu Apr 02 19:46:06 2015 +0200 -+++ b/im/installer/Makefile.in Fri Apr 03 19:51:29 2015 +0200 -@@ -93,6 +93,10 @@ - DEFINES += -DMOZ_PURPLE - endif - -+ifdef MAKENSISU -+DEFINES += -DHAVE_MAKENSISU=1 -+endif -+ - ifdef MOZ_PKG_MANIFEST_P - MOZ_PKG_MANIFEST = package-manifest - -diff -r 1cc7a71a0435 -r f2e7cea9bc6a im/installer/package-manifest.in ---- a/im/installer/package-manifest.in Thu Apr 02 19:46:06 2015 +0200 -+++ b/im/installer/package-manifest.in Fri Apr 03 19:51:29 2015 +0200 -@@ -52,7 +52,7 @@ - @RESPATH@/searchplugins/* - @RESPATH@/dictionaries/* - @RESPATH@/hyphenation/* --#ifdef XP_WIN32 -+#ifdef HAVE_MAKENSISU - @BINPATH@/uninstall/helper.exe - #endif - #ifdef MOZ_UPDATER -diff -r 1cc7a71a0435 -r f2e7cea9bc6a mail/installer/Makefile.in ---- a/mail/installer/Makefile.in Thu Apr 02 19:46:06 2015 +0200 -+++ b/mail/installer/Makefile.in Fri Apr 03 19:51:29 2015 +0200 -@@ -87,6 +87,10 @@ - DEFINES += -DMOZ_SHARED_MOZGLUE=1 - endif - -+ifdef MAKENSISU -+DEFINES += -DHAVE_MAKENSISU=1 -+endif -+ - ifdef MOZ_PKG_MANIFEST_P - MOZ_PKG_MANIFEST = package-manifest - -diff -r 1cc7a71a0435 -r f2e7cea9bc6a mail/installer/package-manifest.in ---- a/mail/installer/package-manifest.in Thu Apr 02 19:46:06 2015 +0200 -+++ b/mail/installer/package-manifest.in Fri Apr 03 19:51:29 2015 +0200 -@@ -53,7 +53,7 @@ - @RESPATH@/searchplugins/* - @RESPATH@/dictionaries/* - @RESPATH@/hyphenation/* --#ifdef XP_WIN32 -+#ifdef HAVE_MAKENSISU - @BINPATH@/uninstall/helper.exe - #endif - #ifdef MOZ_UPDATER -diff -r 1cc7a71a0435 -r f2e7cea9bc6a suite/installer/Makefile.in ---- a/suite/installer/Makefile.in Thu Apr 02 19:46:06 2015 +0200 -+++ b/suite/installer/Makefile.in Fri Apr 03 19:51:29 2015 +0200 -@@ -121,6 +121,10 @@ - - DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) - -+ifdef MAKENSISU -+DEFINES += -DHAVE_MAKENSISU=1 -+endif -+ - ifdef MOZ_PKG_MANIFEST_P - MOZ_PKG_MANIFEST = package-manifest - -diff -r 1cc7a71a0435 -r f2e7cea9bc6a suite/installer/package-manifest.in ---- a/suite/installer/package-manifest.in Thu Apr 02 19:46:06 2015 +0200 -+++ b/suite/installer/package-manifest.in Fri Apr 03 19:51:29 2015 +0200 -@@ -54,7 +54,7 @@ - @RESPATH@/hyphenation/* - @RESPATH@/@PREF_DIR@/suite-l10n.js - @RESPATH@/searchplugins/* --#ifdef XP_WIN32 -+#ifdef HAVE_MAKENSISU - @BINPATH@/uninstall/helper.exe - #endif - #ifdef MOZ_UPDATER

1 0