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

[tor-browser/tor-browser-38.2.0esr-5.5-1] Merge remote-tracking branch 'pc/bug16781-01' into tor-browser-38.2.0esr-5.5-1
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit 6d15c68167a45cca12ab5e7bcb8781d1de535e80 Merge: c1bde57 6803874 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 12:59:57 2015 +0200 Merge remote-tracking branch 'pc/bug16781-01' into tor-browser-38.2.0esr-5.5-1 browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

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

20 Aug '15

commit 2c6f0dd790ae7fc8d5613b64837ce4a75710ba01 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 20 10:46:24 2015 +0000 Update translations for tor-messenger-ircproperties --- vi/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi/irc.properties b/vi/irc.properties index fae86d0..9ef23fe 100644 --- a/vi/irc.properties +++ b/vi/irc.properties @@ -80,7 +80,7 @@ command.whois2=%S [<nick>]: Get information on a user. # These are shown as system messages in the conversation. # %1$S is the nick and %2$S is the nick and host of the user who joined. message.join=%1$S [%2$S] entered the room. -message.rejoined=You have rejoined the room. +message.rejoined=Bạn đã gia nhập lại vào phòng. # %1$S is the nick of who kicked you. # %2$S is message.kicked.reason, if a kick message was given. message.kicked.you=You have been kicked by %1$S%2$S.

1 0

[translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
by translation＠torproject.org 20 Aug '15

20 Aug '15

commit 389fe31936038f352873274d53614e3cdc85fa42 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 20 10:15:49 2015 +0000 Update translations for torbutton-brandproperties_completed --- zh_CN/brand.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/zh_CN/brand.properties b/zh_CN/brand.properties index 5f9a8c7..4804bae 100644 --- a/zh_CN/brand.properties +++ b/zh_CN/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project

1 0

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

20 Aug '15

commit ea4a811984b99e14e1bbdb35be7f3afd4ff93df2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 20 10:15:42 2015 +0000 Update translations for tails-misc_completed --- zh_CN.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index e1936de..150f5bb 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -15,10 +15,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-18 18:28+0000\n" +"POT-Creation-Date: 2015-08-10 18:53+0200\n" +"PO-Revision-Date: 2015-08-20 10:14+0000\n" "Last-Translator: YF <yfdyh000(a)gmail.com>\n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" +"Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -373,19 +373,19 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>了解更多...</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 未就绪" -#: 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 未就绪。确定启动 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 "启动 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 "取消"

1 0

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

20 Aug '15

commit cd72a76f7608d1032b105625afe54969e0891b58 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 20 10:15:38 2015 +0000 Update translations for tails-misc --- zh_CN.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index e1936de..150f5bb 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -15,10 +15,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-18 18:28+0000\n" +"POT-Creation-Date: 2015-08-10 18:53+0200\n" +"PO-Revision-Date: 2015-08-20 10:14+0000\n" "Last-Translator: YF <yfdyh000(a)gmail.com>\n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" +"Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -373,19 +373,19 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>了解更多...</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 未就绪" -#: 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 未就绪。确定启动 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 "启动 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 "取消"

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] Merge remote-tracking branch 'gk/bug_16727_55' into tor-browser-38.2.0esr-5.5-1
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit c1bde5752a0116b2b99b061c4a3192ef13d2c100 Merge: dd8b29f 9fd1486 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 12:05:29 2015 +0200 Merge remote-tracking branch 'gk/bug_16727_55' into tor-browser-38.2.0esr-5.5-1 browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit 9fd14868c1c27ffbc1a966fc900d5b22273d3177 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 11 13:00:05 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 16727: a localized remote page got loaded to handle the health report related transmissions and settings. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6bc98d0..20e2f3a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -55,6 +55,9 @@ pref("extensions.ui.lastCategory", "addons://list/extension"); pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); +// Don't fetch a localized remote page that Tor Browser interacts with, see +// #16727. And, yes, it is "reportUrl" and not "reportURL". +pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] Merge remote-tracking branch 'gk/bug_16727_50' into tor-browser-38.2.0esr-5.0-1
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit d0fc4f07bbae57b13298be569adceb0bf4bfa455 Merge: 2cf98b3 b21e9d1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 12:03:06 2015 +0200 Merge remote-tracking branch 'gk/bug_16727_50' into tor-browser-38.2.0esr-5.0-1 browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit b21e9d1f4c199e425700083ef528209b5406dbf1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 11 13:00:05 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 16727: a localized remote page got loaded to handle the health report related transmissions and settings. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6bc98d0..20e2f3a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -55,6 +55,9 @@ pref("extensions.ui.lastCategory", "addons://list/extension"); pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); +// Don't fetch a localized remote page that Tor Browser interacts with, see +// #16727. And, yes, it is "reportUrl" and not "reportURL". +pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers

1 0

[translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
by translation＠torproject.org 20 Aug '15

20 Aug '15

commit 9bc35358e97788ff5b3e93df400afb19a1978054 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 20 09:45:53 2015 +0000 Update translations for torbutton-brandproperties_completed --- es/brand.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/es/brand.properties b/es/brand.properties index 035057f..c59e88f 100644 --- a/es/brand.properties +++ b/es/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Navegador Tor brandShortName=Navegador Tor brandFullName=Navegador Tor vendorShortName=Proyecto Tor

1 0