- tbb-commits - lists.torproject.org

[tor-browser-build/maint-8.5] A Changelog would be good as well
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit 9024841d836d737b2372a6535e3cf2d9761c46cd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 20 04:26:32 2019 +0000 A Changelog would be good as well --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ rbm.conf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 317bb1f..8763d44 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 8.5.3 -- June 21 2019 + * All platforms + * Pick up fix for Mozilla's bug 1560192 + Tor Browser 8.5.2 -- June 19 2019 * All platforms * Pick up fix for Mozilla's bug 1544386 diff --git a/rbm.conf b/rbm.conf index 6c60049..060686b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '8.5.3' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5.1 - 8.5.2

1 0

[tor-browser-build/maint-8.5] Release prep for 8.5.3
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit aaff2ce4348a6511ba672286bbb6619a2fc50dde Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 20 04:15:37 2019 +0000 Release prep for 8.5.3 --- projects/firefox/config | 2 +- rbm.conf | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index e95ccbd..be222a5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 651bf98..6c60049 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5.2' + torbrowser_version: '8.5.3' torbrowser_build: 'build1' torbrowser_incremental_from: - 8.5.1 + - 8.5.2 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.7.0esr-8.5-2] Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit e7f025ee58e2ba638fd9e5eae549bdc2b3644ccc Author: Johann Hofmann <jhofmann(a)mozilla.com> Date: Wed Jun 19 21:59:18 2019 +0000 Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D35371 --HG-- extra : source : bfd88bfc61c42a09475da8749b2218f540e4592c --- browser/modules/RemotePrompt.jsm | 14 +++++++++----- toolkit/components/prompts/src/nsPrompter.js | 18 +++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/browser/modules/RemotePrompt.jsm b/browser/modules/RemotePrompt.jsm index 45755c2446fc..f94052410d5c 100644 --- a/browser/modules/RemotePrompt.jsm +++ b/browser/modules/RemotePrompt.jsm @@ -23,10 +23,14 @@ var RemotePrompt = { receiveMessage(message) { switch (message.name) { case "Prompt:Open": - if (message.data.uri) { - this.openModalWindow(message.data, message.target); - } else { + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + if (message.data.tabPrompt) { this.openTabPrompt(message.data, message.target); + } else { + let uri = (message.data.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; + this.openModalWindow(uri, message.data, message.target); } break; } @@ -90,13 +94,13 @@ var RemotePrompt = { } }, - openModalWindow(args, browser) { + openModalWindow(uri, args, browser) { let window = browser.ownerGlobal; try { PromptUtils.fireDialogEvent(window, "DOMWillOpenModalDialog", browser); let bag = PromptUtils.objectToPropBag(args); - Services.ww.openWindow(window, args.uri, "_blank", + Services.ww.openWindow(window, uri, "_blank", "centerscreen,chrome,modal,titlebar", bag); PromptUtils.propBagToObject(bag, args); diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js index bf76cd8b2078..77a65b25b100 100644 --- a/toolkit/components/prompts/src/nsPrompter.js +++ b/toolkit/components/prompts/src/nsPrompter.js @@ -430,7 +430,7 @@ function openTabPrompt(domWin, tabPrompt, args) { } } -function openRemotePrompt(domWin, args, tabPrompt) { +function openRemotePrompt(domWin, args) { let docShell = domWin.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIDocShell); let messageManager = docShell.QueryInterface(Ci.nsIInterfaceRequestor) @@ -438,7 +438,7 @@ function openRemotePrompt(domWin, args, tabPrompt) { .messageManager; let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload; - let eventDetail = Cu.cloneInto({tabPrompt, inPermitUnload}, domWin); + let eventDetail = Cu.cloneInto({tabPrompt: args.tabPrompt, inPermitUnload}, domWin); PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail); let winUtils = domWin.QueryInterface(Ci.nsIInterfaceRequestor) @@ -536,7 +536,8 @@ ModalPrompter.prototype = { if (allowTabModal && this.domWin) { if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) { - openRemotePrompt(this.domWin, args, true); + args.tabPrompt = true; + openRemotePrompt(this.domWin, args); return; } @@ -548,17 +549,16 @@ ModalPrompter.prototype = { } // If we can't do a tab modal prompt, fallback to using a window-modal dialog. - const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; - const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; - - let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; - if (Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_CONTENT) { - args.uri = uri; + args.tabPrompt = false; openRemotePrompt(this.domWin, args); return; } + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; let propBag = PromptUtils.objectToPropBag(args); openModalWindow(this.domWin, uri, propBag); PromptUtils.propBagToObject(propBag, args);

1 0

[tor-browser-build/master] Actually pick up the new tor-browser tag
by gk＠torproject.org 18 Jun '19

18 Jun '19

commit 0e00aa1e032441c8f447ff1b4d708074cd25f392 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 18 14:04:13 2019 +0000 Actually pick up the new tor-browser tag --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 073487c..9d548cd 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index d82bbad..8e90615 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0a3' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0a2 project_name: tor-browser

1 0

[tor-browser-build/master] Release prep for 9.0a3
by gk＠torproject.org 18 Jun '19

18 Jun '19

commit 548084b7c5644a43cd4f439e02bb0784c66d41da Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 18 14:01:09 2019 +0000 Release prep for 9.0a3 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ rbm.conf | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6038e4a..851cc5e 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 9.0a3 -- June 20 2019 + * All platforms + * Pick up fix for Mozilla's bug 1544386 + * Update NoScript to 10.6.3 + * Bug 29904: NoScript blocks MP4 on higher security levels + * Bug 30624+29043+29647: Prevent XSS protection from freezing the browser + Tor Browser 9.0a2 -- June 11 2019 * All platforms * Update Torbutton to 2.2 diff --git a/rbm.conf b/rbm.conf index 6f121c2..d82bbad 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0a2' - torbrowser_build: 'build2' + torbrowser_version: '9.0a3' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.0a1 + - 9.0a2 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-8.5] Release prep for 8.5.2
by gk＠torproject.org 18 Jun '19

18 Jun '19

commit 7e5fa15b70f08bda97a7d00d4cd4fe36cf651845 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 18 05:15:16 2019 +0000 Release prep for 8.5.2 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ rbm.conf | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 8547aca..e95ccbd 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 1469988..317bb1f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 8.5.2 -- June 19 2019 + * All platforms + * Pick up fix for Mozilla's bug 1544386 + * Update NoScript to 10.6.3 + * Bug 29904: NoScript blocks MP4 on higher security levels + * Bug 30624+29043+29647: Prevent XSS protection from freezing the browser + Tor Browser 8.5.1 -- June 4 2019 * All platforms * Update Torbutton to 2.1.10 diff --git a/rbm.conf b/rbm.conf index ee9e322..651bf98 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5.1' + torbrowser_version: '8.5.2' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5 + - 8.5.1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-8.5] Bump NoScript version to 10.6.3
by gk＠torproject.org 16 Jun '19

16 Jun '19

commit 26a5d9739b7e0d30f03da46b316ac15546e79eef Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 16 19:30:08 2019 +0000 Bump NoScript version to 10.6.3 Fixes #29904, #30624, #29043, and #29647. --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index d427005..667d579 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -91,9 +91,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 040bc6eaf5bdb72d5851c1f7cdc3be39302859f53dbd479757a2723e639a995f + sha256sum: 2f9e10d2512263fbf56cb225c1622576037f01305e09e0e7757e23d13eb3f97d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Bump NoScript version to 10.6.3
by gk＠torproject.org 16 Jun '19

16 Jun '19

commit 07961f94a1d956c33c1d0448b6e5f69df6b03ea4 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 16 19:30:08 2019 +0000 Bump NoScript version to 10.6.3 Fixes #29904, #30624, #29043, and #29647. --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index a23a4f7..dc95350 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -79,9 +79,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 040bc6eaf5bdb72d5851c1f7cdc3be39302859f53dbd479757a2723e639a995f + sha256sum: 2f9e10d2512263fbf56cb225c1622576037f01305e09e0e7757e23d13eb3f97d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Fold in stable Changelog
by gk＠torproject.org 12 Jun '19

12 Jun '19

commit cbe4413b5aaaa214fbdb36ce68a2735bbf2b948a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 12 06:44:59 2019 +0000 Fold in stable Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index bb83d9c..6038e4a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -33,6 +33,25 @@ Tor Browser 9.0a2 -- June 11 2019 * Linux * Bug 25930: Update GCC to 8.3.0 for our Linux builds +Tor Browser 8.5.1 -- June 4 2019 + * All platforms + * Update Torbutton to 2.1.10 + * Bug 30565: Sync nocertdb with privatebrowsing.autostart at startup + * Bug 30464: Add WebGL to safer descriptions + * Translations update + * Update NoScript to 10.6.2 + * Bug 29969: Remove workaround for Mozilla's bug 1532530 + * Update HTTPS Everywhere to 2019.5.13 + * Bug 30541: Disable WebGL readPixel() for web content + * Windows + OS X + Linux + * Bug 30560: Better match actual toolbar in onboarding toolbar graphic + * Bug 30571: Correct more information URL for security settings + * Android + * Bug 30635: Sync mobile default bridges list with desktop one + * Build System + * All platforms + * Bug 30480: Check that signed tag contains expected tag name + Tor Browser 9.0a1 -- May 21 2019 * All platforms * Update Firefox to 60.7.0esr

1 0

[tor-browser/tor-browser-60.7.0esr-8.5-1] Bug 30631: Blurry Tor Browser icon on macOS app switcher
by gk＠torproject.org 10 Jun '19

10 Jun '19

commit 33913360097ee1c5c806f9a7124f69d3cfd58ded Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Jun 7 10:26:40 2019 -0700 Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. --- browser/branding/alpha/firefox.icns | Bin 30823 -> 291096 bytes browser/branding/nightly/firefox.icns | Bin 41613 -> 642308 bytes browser/branding/official/firefox.icns | Bin 31329 -> 259709 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/browser/branding/alpha/firefox.icns b/browser/branding/alpha/firefox.icns index 174fb21dd662..baad294f8497 100644 Binary files a/browser/branding/alpha/firefox.icns and b/browser/branding/alpha/firefox.icns differ diff --git a/browser/branding/nightly/firefox.icns b/browser/branding/nightly/firefox.icns index 5223801d095a..4b0adc0f5af7 100644 Binary files a/browser/branding/nightly/firefox.icns and b/browser/branding/nightly/firefox.icns differ diff --git a/browser/branding/official/firefox.icns b/browser/branding/official/firefox.icns index 721e57925b69..b9874461e519 100644 Binary files a/browser/branding/official/firefox.icns and b/browser/branding/official/firefox.icns differ

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 30631: Blurry Tor Browser icon on macOS app switcher
by gk＠torproject.org 10 Jun '19

10 Jun '19

commit defe73e8c1969c02f137e8b474d85a66b9605427 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Jun 7 10:26:40 2019 -0700 Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. --- browser/branding/alpha/firefox.icns | Bin 30823 -> 291096 bytes browser/branding/nightly/firefox.icns | Bin 41613 -> 642308 bytes browser/branding/official/firefox.icns | Bin 31329 -> 259709 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/browser/branding/alpha/firefox.icns b/browser/branding/alpha/firefox.icns index 174fb21dd662..baad294f8497 100644 Binary files a/browser/branding/alpha/firefox.icns and b/browser/branding/alpha/firefox.icns differ diff --git a/browser/branding/nightly/firefox.icns b/browser/branding/nightly/firefox.icns index 5223801d095a..4b0adc0f5af7 100644 Binary files a/browser/branding/nightly/firefox.icns and b/browser/branding/nightly/firefox.icns differ diff --git a/browser/branding/official/firefox.icns b/browser/branding/official/firefox.icns index 721e57925b69..b9874461e519 100644 Binary files a/browser/branding/official/firefox.icns and b/browser/branding/official/firefox.icns differ

1 0

[tor-browser-build/master] Bug 30779: Make openssl build reproducible by setting SOURCE_DATE_EPOCH
by gk＠torproject.org 07 Jun '19

07 Jun '19

commit 3d5f652a3ec9fb44c41e79174f2de28f14ffdbe0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 6 00:25:38 2019 +0200 Bug 30779: Make openssl build reproducible by setting SOURCE_DATE_EPOCH --- projects/openssl/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/openssl/build b/projects/openssl/build index a3ff092..40dc526 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -13,6 +13,7 @@ export CC='gcc -m32' ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin11-cc export CC="cc [% c("var/FLAGS") %]" [% END -%] +export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure --prefix=$distdir [% c('var/configure_opts') %] make make install

1 0

[tor-browser-build/master] Preparing -build2 for 9.0a2
by gk＠torproject.org 07 Jun '19

07 Jun '19

commit d151c053c01eef50f5b304680b61169684ae2c09 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 7 08:22:45 2019 +0000 Preparing -build2 for 9.0a2 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++-- projects/tor/config | 2 +- rbm.conf | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c0aad72..bb83d9c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 9.0a2 -- June 7 2019 +Tor Browser 9.0a2 -- June 11 2019 * All platforms * Update Torbutton to 2.2 * Bug 30565: Sync nocertdb with privatebrowsing.autostart at startup @@ -11,7 +11,7 @@ Tor Browser 9.0a2 -- June 7 2019 * Bug 30712: Backport fix for Mozilla's bug 1552993 * Bug 30469: Add locale ro * Windows + OS X + Linux - * Update Tor to 0.4.1.1-alpha + * Update Tor to 0.4.1.2-alpha * Update OpenSSL to 1.1.1c * Update Tor Launcher to 0.2.19.1 * Bug 30469: Add locale ro @@ -30,6 +30,8 @@ Tor Browser 9.0a2 -- June 7 2019 * Bug 30536: Update Go to 1.12.5 * OS X * Bug 30491: Move our macOS builds to Debian Stretch + * Linux + * Bug 25930: Update GCC to 8.3.0 for our Linux builds Tor Browser 9.0a1 -- May 21 2019 * All platforms diff --git a/projects/tor/config b/projects/tor/config index 8b02b6c..6f4b5f2 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.1.1-alpha +version: 0.4.1.2-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index a7c32a8..6f121c2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0a2' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0a1 project_name: tor-browser

1 0

[tor-browser-build/maint-8.5] Correct Changelog for 8.5.1
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit e7be90e27eb3a142ebf40115b20fc8ed05d7d3e8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 4 08:52:50 2019 +0000 Correct Changelog for 8.5.1 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e881c48..1469988 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -10,6 +10,7 @@ Tor Browser 8.5.1 -- June 4 2019 * Bug 30541: Disable WebGL readPixel() for web content * Windows + OS X + Linux * Bug 30560: Better match actual toolbar in onboarding toolbar graphic + * Bug 30571: Correct more information URL for security settings * Android * Bug 30635: Sync mobile default bridges list with desktop one * Build System

1 0

[tor-browser-build/master] Bump OpenSSL version to 1.1.1c
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit 727881f6ac77f84e7127f6ae2dc1b1995985c9e6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 4 08:17:38 2019 +0000 Bump OpenSSL version to 1.1.1c --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 318529a..1a3da33 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1b +version: 1.1.1c filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -26,4 +26,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b + sha256sum: f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90

1 0

[tor-browser-build/master] Release preparations for 9.0a2
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit eb60135acf9c9fe67f8e314bc7a93626593d6550 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 4 08:20:39 2019 +0000 Release preparations for 9.0a2 Versions bump, Changelog update --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 33 ++++++++++++++++++++++ projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 4 +-- 7 files changed, 40 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 7e9e45e..073487c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 60776cb..2db9177 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2019.5.6.1 +version: 2019.5.13 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 42d43ce..c0aad72 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,36 @@ +Tor Browser 9.0a2 -- June 7 2019 + * All platforms + * Update Torbutton to 2.2 + * Bug 30565: Sync nocertdb with privatebrowsing.autostart at startup + * Bug 30469: Add ro translation + * Translations update + * Update NoScript to 10.6.2 + * Bug 29969: Remove workaround for Mozilla's bug 1532530 + * Update HTTPS Everywhere to 2019.5.13 + * Bug 30541: Disable WebGL readPixel() for web content + * Bug 30712: Backport fix for Mozilla's bug 1552993 + * Bug 30469: Add locale ro + * Windows + OS X + Linux + * Update Tor to 0.4.1.1-alpha + * Update OpenSSL to 1.1.1c + * Update Tor Launcher to 0.2.19.1 + * Bug 30469: Add locale ro + * Translations update + * Bug 30639: Revert IPv6 support test + * Bug 30560: Better match actual toolbar in onboarding toolbar graphic + * Bug 30571: Correct more information URL for security settings + * Linux + * Bug 30451: Compile go-webrtc with a non executable stack + * Android + * Bug 24920: Only create Private tabs in permanent Private Browsing Mode + * Bug 30635: Sync mobile default bridges list with desktop one + * Build System + * All platforms + * Bug 30480: Check that signed tag contains expected tag name + * Bug 30536: Update Go to 1.12.5 + * OS X + * Bug 30491: Move our macOS builds to Debian Stretch + Tor Browser 9.0a1 -- May 21 2019 * All platforms * Update Firefox to 60.7.0esr diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index ab7bebd..9bf886a 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.19 +version: 0.2.19.1 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index bf9ec5a..8b02b6c 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.0.4-rc +version: 0.4.1.1-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index ffbe089..ae3f915 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.9 +version: 2.2 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 1bc207d..a7c32a8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0a1' + torbrowser_version: '9.0a2' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a12 + - 9.0a1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-launcher/master] Release prep for 0.2.19.1
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit ae9f37839e8157969794b6b0dcfe2586a7f3fa82 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 4 07:53:37 2019 +0000 Release prep for 0.2.19.1 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 828ddfb..d78b9a8 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.19</em:version> + <em:version>0.2.19.1</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit dceb32326575a504a9f625f30f11e34cce1694a1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 4 07:52:44 2019 +0000 Translations update --- src/chrome/locale/ar/torlauncher.properties | 4 +- src/chrome/locale/eu/torlauncher.properties | 62 +++++++-------- src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/fr/torlauncher.properties | 2 +- src/chrome/locale/ka/torlauncher.properties | 4 +- src/chrome/locale/nb/torlauncher.properties | 8 +- src/chrome/locale/pt-PT/torlauncher.properties | 10 +-- src/chrome/locale/th/network-settings.dtd | 80 ++++++++++---------- src/chrome/locale/th/torlauncher.properties | 100 ++++++++++++------------- src/chrome/locale/uk/torlauncher.properties | 62 +++++++-------- src/chrome/locale/zh-CN/network-settings.dtd | 6 +- src/chrome/locale/zh-CN/torlauncher.properties | 30 ++++---- 12 files changed, 185 insertions(+), 185 deletions(-) diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 8f405cf..b1e5c60 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -58,7 +58,7 @@ torlauncher.bootstrapStatus.conn_done_pt=يتم الإتصال مع جِسْر torlauncher.bootstrapStatus.conn_proxy=يتم التواصل مع الوكيل torlauncher.bootstrapStatus.conn_done_proxy=يتم التواصل مع الوكيل torlauncher.bootstrapStatus.conn=يتم الإتصال بمرحل تور -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay +torlauncher.bootstrapStatus.conn_done=متصل بمُرحّل تور torlauncher.bootstrapStatus.handshake=يتم التفاوض مع مرحل تور torlauncher.bootstrapStatus.handshake_done=تم إنتهاء التفاوض مع مرحل تور torlauncher.bootstrapStatus.onehop_create=ينشئ اتصالا مشفرا بالدليل @@ -73,7 +73,7 @@ torlauncher.bootstrapStatus.ap_conn_done_pt=بناء دارات : يتم الإ torlauncher.bootstrapStatus.ap_conn_proxy=بناء دارات : يتم التواصل مع الوكيل torlauncher.bootstrapStatus.ap_conn_done_proxy=بناء دارات : يتم التواصل مع الوكيل torlauncher.bootstrapStatus.ap_conn=بناء دارات : يتم الإتصال بمرحل تور -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay +torlauncher.bootstrapStatus.ap_conn_done=بناء الدارات : متصل بمُرحّل تور torlauncher.bootstrapStatus.ap_handshake= بناء دارات : يتم التفاوض مع مرحل تور torlauncher.bootstrapStatus.ap_handshake_done= بناء دارات : تم إنتهاء التفاوض مع مرحل تور torlauncher.bootstrapStatus.circuit_create= بناء دارات : ينشئ دائرة تور diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index 0715cd9..4d6d383 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Torek proxy bat erabiliz Interneten sartzek torlauncher.error_proxy_type_missing=Proxy mota hautatu behar duzu. torlauncher.error_bridges_missing=Zubi bat edo gehiago zehaztu behar duzu. torlauncher.error_default_bridges_type_missing=Emandako zubietarako garraio mota bat hautatu behar duzu. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Mesedez zubi bat eskatu. torlauncher.error_bridge_bad_default_type=Ez daude eskuragarri %S garraio mota duten emandako zubirik. Mesedez doitu zure ezarpenak. torlauncher.bridge_suffix.meek-amazon=(badabil Txinan) torlauncher.bridge_suffix.meek-azure=(badabil Txinan) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Zubi bat eskatu… +torlauncher.request_a_new_bridge=Zubi berri bat eskatu… +torlauncher.contacting_bridgedb=BridgeDBrekin kontaktatzen. Itxaron mesedez. +torlauncher.captcha_prompt=CAPTCHAa ebatzi ezazu zubi bat eskatzeko. +torlauncher.bad_captcha_solution=Ebazpena ez da zuzena. Mesedez saiatu berriro. +torlauncher.unable_to_get_bridge=Ezin izan da zubi bat eskuratu BridgeDBtik.\n\n%S +torlauncher.no_meek=Nabigatzaile hau ez dago meek-erako konfiguratuta, eta beharrezkoa da zubiak eskuratzeko. +torlauncher.no_bridges_available=Ez dago zubirik eskuragarri une honetan. Barkatu. torlauncher.connect=Konektatu torlauncher.restart_tor=Tor berrabiarazi @@ -52,31 +52,31 @@ torlauncher.forAssistance2=Laguntzako lortzeko, bisita ezazu %S torlauncher.copiedNLogMessages=Kopia burutu da. %S Tor erregistro mezuak prest daude testu editore edo email mezu batean itsasteko. -torlauncher.bootstrapStatus.starting=Starting -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.starting=Abiarazten +torlauncher.bootstrapStatus.conn_pt=Zubira konektatzen +torlauncher.bootstrapStatus.conn_done_pt=Zubira konektatuta +torlauncher.bootstrapStatus.conn_proxy=Proxyra konektatzen +torlauncher.bootstrapStatus.conn_done_proxy=Proxyra konektatuta +torlauncher.bootstrapStatus.conn=Tor errele batera konektatzen +torlauncher.bootstrapStatus.conn_done=Tor errele batera konektatuta +torlauncher.bootstrapStatus.handshake=Tor errele batekin negoziatzen +torlauncher.bootstrapStatus.handshake_done=Amaitu da Tor errele batekin negoziatzen torlauncher.bootstrapStatus.onehop_create=Enkriptatutako direktorio batera konexioa ezartzen torlauncher.bootstrapStatus.requesting_status=Sarearen egoera eskuratzen torlauncher.bootstrapStatus.loading_status=Sarearen egoera kargatzen torlauncher.bootstrapStatus.loading_keys=Aginpide ziurtagiriak kargatzen torlauncher.bootstrapStatus.requesting_descriptors=Errele informazioa eskatzen torlauncher.bootstrapStatus.loading_descriptors=Errele informazioa kargatzen -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit +torlauncher.bootstrapStatus.enough_dirinfo=Amaitu da errele informazioa kargatzen +torlauncher.bootstrapStatus.ap_conn_pt=Zirkuituak eraikitzen: zubira konektatzen +torlauncher.bootstrapStatus.ap_conn_done_pt=Zirkuituak eraikitzen: zubira konektatuta +torlauncher.bootstrapStatus.ap_conn_proxy=Zirkuituak eraikitzen: proxyra konektatzen +torlauncher.bootstrapStatus.ap_conn_done_proxy=Zirkuituak eraikitzen: proxyra konektatuta +torlauncher.bootstrapStatus.ap_conn=Zirkuituak eraikitzen: Tor errele batera konektatzen +torlauncher.bootstrapStatus.ap_conn_done=Zirkuituak eraikitzen: Tor errele batera konektatzen +torlauncher.bootstrapStatus.ap_handshake=Zirkuituak eraikitzen: Tor errele batekin negoziatzen +torlauncher.bootstrapStatus.ap_handshake_done=Zirkuituak eraikitzen: Amaitu da Tor errele batekin negoziatzen +torlauncher.bootstrapStatus.circuit_create=Zirkuituak eraikitzen: Tor zirkuitu bat ezartzen torlauncher.bootstrapStatus.done=Tor sarera konektatuta! torlauncher.bootstrapWarning.done=eginda @@ -89,6 +89,6 @@ torlauncher.bootstrapWarning.noroute=ez dago biderik ostalarira torlauncher.bootstrapWarning.ioerror=irakurketa/idazketa akatsa torlauncher.bootstrapWarning.pt_missing=pluggable transport falta da -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Zerbitzarirekiko konexioa galdu da. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Ezin izan da zerbitzariarekin konektatu. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Ezin izan da proxyarekin konektatu. diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 5054c67..abbc13d 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -45,7 +45,7 @@ <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Saisir les caractères de l’image"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obtenir un nouveau test"> <!ENTITY torsettings.useBridges.captchaSubmit "Envoyer"> -<!ENTITY torsettings.useBridges.custom "Fournir un pont que je connais"> +<!ENTITY torsettings.useBridges.custom "Utiliser un pont que je connais"> <!ENTITY torsettings.useBridges.label "Saisir des informations de pont provenant d’une source fiable"> <!ENTITY torsettings.useBridges.placeholder "type adresse:port (un par ligne)"> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 59514c1..3392080 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -35,7 +35,7 @@ torlauncher.bridge_suffix.meek-azure=(fonctionne en Chine) torlauncher.request_a_bridge=Demander un pont… torlauncher.request_a_new_bridge=Demander un nouveau pont… torlauncher.contacting_bridgedb=Connexion à BridgeDB. Veuillez patienter. -torlauncher.captcha_prompt=Résoudre le CAPTCHA pour demander un pont. +torlauncher.captcha_prompt=Résoudre le captcha pour demander un pont. torlauncher.bad_captcha_solution=La solution est erronée. Veuillez ressayer. torlauncher.unable_to_get_bridge=Impossible d’obtenir un pont de BridgeDB.\n\n%S torlauncher.no_meek=Ce navigateur n’est pas configuré pour meek, qui est nécessaire pour obtenir des ponts. diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index 6543d6e..271f5b5 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -65,8 +65,8 @@ torlauncher.bootstrapStatus.onehop_create=დაშიფრული კავ torlauncher.bootstrapStatus.requesting_status=ქსელის მდგომარეობის დადგენა torlauncher.bootstrapStatus.loading_status=ქსელის მდგომარეობის ჩატვირთვა torlauncher.bootstrapStatus.loading_keys=უფლებამოსილი სერტიფიკატების ჩატვირთვა -torlauncher.bootstrapStatus.requesting_descriptors=გადამცემის მონაცემების მოთხოვნა -torlauncher.bootstrapStatus.loading_descriptors=გადამცემის მონაცემების ჩატვირთვა +torlauncher.bootstrapStatus.requesting_descriptors=გადამცემების მონაცემების მოთხოვნა +torlauncher.bootstrapStatus.loading_descriptors=გადამცემების მონაცემების ჩატვირთვა torlauncher.bootstrapStatus.enough_dirinfo=გადამცემის მონაცემები ჩაიტვირთა torlauncher.bootstrapStatus.ap_conn_pt=წრედების შექმნა: ხიდთან დაკავშირება torlauncher.bootstrapStatus.ap_conn_done_pt=წრედების შექმნა: ხიდთან დაკავშირებულია diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index e1d5bab..5b4d92d 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -53,10 +53,10 @@ torlauncher.forAssistance2=For hjelp, besøk %S torlauncher.copiedNLogMessages=Kopiering ferdig. %S Loggføringsmeldinger fra Tor er klare til å bli sent til et skriveprogram eller en e-post. torlauncher.bootstrapStatus.starting=Starter opp -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy +torlauncher.bootstrapStatus.conn_pt=Kobler til bro +torlauncher.bootstrapStatus.conn_done_pt=Koblet til broen +torlauncher.bootstrapStatus.conn_proxy=Kobler til proxy +torlauncher.bootstrapStatus.conn_done_proxy=Koblet til proxy torlauncher.bootstrapStatus.conn=Connecting to a Tor relay torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay diff --git a/src/chrome/locale/pt-PT/torlauncher.properties b/src/chrome/locale/pt-PT/torlauncher.properties index d010d6c..0d3cb6b 100644 --- a/src/chrome/locale/pt-PT/torlauncher.properties +++ b/src/chrome/locale/pt-PT/torlauncher.properties @@ -44,7 +44,7 @@ torlauncher.no_bridges_available=De momento, não estão disponíveis pontes. De torlauncher.connect=Ligar torlauncher.restart_tor=Reiniciar o Tor torlauncher.quit=Sair -torlauncher.quit_win=Sair +torlauncher.quit_win=Fechar torlauncher.done=Concluído torlauncher.forAssistance=Para assistência, contacte %S @@ -77,17 +77,17 @@ torlauncher.bootstrapStatus.ap_conn_done=Construir circuitos: conectado a um ret torlauncher.bootstrapStatus.ap_handshake=Construir circuitos: a negociar com um retransmissor Tor torlauncher.bootstrapStatus.ap_handshake_done=Construir circuitos: terminada a negociação com um retransmissor Tor torlauncher.bootstrapStatus.circuit_create=Construir circuitos: a estabelecer um circuito Tor -torlauncher.bootstrapStatus.done=Ligado à rede Tor +torlauncher.bootstrapStatus.done=Ligado à rede Tor! torlauncher.bootstrapWarning.done=finalizado torlauncher.bootstrapWarning.connectrefused=ligação recusada torlauncher.bootstrapWarning.misc=diversos torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes torlauncher.bootstrapWarning.identity=identidade não correspondente -torlauncher.bootstrapWarning.timeout=o tempo de ligação expirou +torlauncher.bootstrapWarning.timeout=ligação expirou torlauncher.bootstrapWarning.noroute=sem rota para o hospedeiro -torlauncher.bootstrapWarning.ioerror=rrro de leitura/gravação -torlauncher.bootstrapWarning.pt_missing=falta o transporte de ligação +torlauncher.bootstrapWarning.ioerror=erro de leitura/gravação +torlauncher.bootstrapWarning.pt_missing=transporte ligável em falta torlauncher.nsresult.NS_ERROR_NET_RESET=A ligação para o servidor foi perdida. torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Não foi possível ligar ao servidor. diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd index 2eea0d9..cb88acc 100644 --- a/src/chrome/locale/th/network-settings.dtd +++ b/src/chrome/locale/th/network-settings.dtd @@ -1,62 +1,62 @@ <!ENTITY torsettings.dialog.title "ตั้งค่าเครือข่าย Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.default "เชื่อมต่อกับ Tor"> <!ENTITY torsettings.wizard.title.configure "ตั้งค่าเครือข่าย Tor"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.connecting "กำลังสร้างการเชื่อมต่อ">  -<!ENTITY torlauncher.localePicker.title "ภาษาของทอร์เบราว์เซอร์"> +<!ENTITY torlauncher.localePicker.title "ภาษาของ Tor Browser"> <!ENTITY torlauncher.localePicker.prompt "โปรดเลือกภาษา">  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "คลิกปุ่ม "เชื่อมต่อ" เพื่อเชื่อมต่อกับ Tor"> +<!ENTITY torSettings.configurePrompt "คลิกปุ่ม "กำหนดค่า" เพื่อปรับการตั้งค่าเครือข่ายถ้าคุณอยู่ในประเทศที่เซ็นเซอร์ Tor (เช่น อียิปต์ จีน ตุรกี) หรือถ้าคุณกำลังเชื่อมต่อจากเครือข่ายส่วนตัวที่จำเป็นต้องใช้พร็อกซี"> <!ENTITY torSettings.configure "กำหนดค่า"> <!ENTITY torSettings.connect "เชื่อมต่อ">  -<!ENTITY torsettings.startingTor "รอให้ Tor เริ่มทำงาน..."> +<!ENTITY torsettings.startingTor "กรุณารอให้ Tor เริ่มทำงาน..."> <!ENTITY torsettings.restartTor "เริ่มการทำงานของ Tor ใหม่"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "กำหนดค่าใหม่"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "คุณได้กำหนดค่าสะพานของ Tor หรือคุณได้ใส่การตั้งค่าพร็อกซีท้องถิ่นไว้แล้ว &#160 คุณจำเป็นต้องลบการตั้งค่าเหล่านี้ออกถ้าต้องการสร้างการเชื่อมต่อโดยตรงกับเครือข่ายของ Tor"> +<!ENTITY torsettings.discardSettings.proceed "ลบการตั้งค่าและการเชื่อมต่อ"> -<!ENTITY torsettings.optional "ตัวเลือก"> +<!ENTITY torsettings.optional "ไม่จำเป็น"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "ชนิดพร็อกซี:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "ที่อยู่:"> +<!ENTITY torsettings.useProxy.checkbox "ฉันใช้พร็อกซีเพื่อเชื่อมต่อกับอินเทอร์เน็ต"> +<!ENTITY torsettings.useProxy.type "ชนิดพร็อกซีคือ"> +<!ENTITY torsettings.useProxy.type.placeholder "เลือกชนิดพร็อกซี"> +<!ENTITY torsettings.useProxy.address "ที่อยู่คือ"> <!ENTITY torsettings.useProxy.address.placeholder "ที่อยู่ IP หรือชื่อโฮสต์"> -<!ENTITY torsettings.useProxy.port "พอร์ต:"> -<!ENTITY torsettings.useProxy.username "ชื่อผู้ใช้:"> -<!ENTITY torsettings.useProxy.password "รหัสผ่าน:"> +<!ENTITY torsettings.useProxy.port "พอร์ตคือ"> +<!ENTITY torsettings.useProxy.username "ชื่อผู้ใช้คือ"> +<!ENTITY torsettings.useProxy.password "รหัสผ่านคือ"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "คอมพิวเตอร์เครื่องนี้ใช้งานผ่านไฟร์วอลล์ที่ยินยอมที่จะให้เชื่อมต่อกับบางพอร์ตเท่านั้น"> -<!ENTITY torsettings.firewall.allowedPorts "พอร์ตที่อนุญาต:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "เสนอ"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> - -<!ENTITY torsettings.copyLog "คัดลอกปูม Tor ไปที่คลิปบอร์ด"> - -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> - -<!ENTITY torsettings.bridgeHelpTitle "การช่วยเหลือรีเลย์สะพาน"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.useProxy.type.http "HTTP หรือ HTTPS"> +<!ENTITY torsettings.firewall.checkbox "คอมพิวเตอร์เครื่องนี้ใช้งานผ่านไฟร์วอลล์ที่อนุญาตให้เชื่อมต่อกับเฉพาะบางพอร์ตเท่านั้น"> +<!ENTITY torsettings.firewall.allowedPorts "พอร์ตที่อนุญาตคือ "> +<!ENTITY torsettings.useBridges.checkbox "Tor ถูกเซ็นเซอร์ในประเทศของฉัน"> +<!ENTITY torsettings.useBridges.default "เลือกสะพานที่มีมาให้ในตัว"> +<!ENTITY torsettings.useBridges.default.placeholder "เลือกสะพาน"> +<!ENTITY torsettings.useBridges.bridgeDB "เลือกสะพานจาก torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "กรอกตัวอักษรที่อยู่ในภาพ"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "รับการท้าทายใหม่"> +<!ENTITY torsettings.useBridges.captchaSubmit "ส่ง"> +<!ENTITY torsettings.useBridges.custom "จัดหาสะพานที่ฉันรู้จัก"> +<!ENTITY torsettings.useBridges.label "กรอกข้อมูลสะพานจากแหล่งที่น่าเชื่อถือ"> +<!ENTITY torsettings.useBridges.placeholder "พิมพ์ที่อยู่: พอร์ต (บรรทัดละพอร์ต)"> + +<!ENTITY torsettings.copyLog "คัดลอกล็อก Tor ไปที่คลิปบอร์ด "> + +<!ENTITY torsettings.proxyHelpTitle "ความช่วยเหลือเกี่ยวกับพร็อกซี"> +<!ENTITY torsettings.proxyHelp1 "พร็อกซีท้องถิ่นอาจจะมีความจำเป็นหากเชื่อมต่อผ่านเครือข่ายบริษัท โรงเรียน หรือมหาวิทยาลัย   ถ้าคุณไม่แน่ใจว่าจำเป็นจะต้องใช้พร็อกซีหรือไม่ ดูได้ที่การตั้งค่าอินเทอร์เน็ตในเบราวเซอร์อื่น หรือตรวจสอบการตั้งค่าเครือข่ายของระบบของคุณ"> + +<!ENTITY torsettings.bridgeHelpTitle "การช่วยเหลือเกี่ยวกับรีเลย์สะพาน"> +<!ENTITY torsettings.bridgeHelp1 "สะพานเป็นรีเลย์ที่ไม่อยู่ในรายการ ซึ่งทำให้การบล็อกการเชื่อมต่อกับเครือข่าย Tor ทำได้ยากขึ้น   สะพานแต่ละชนิดใช้วิธีการที่แตกต่างกันเพื่อหลบเลี่ยงการเซ็นเซอร์   สะพานแบบ obfs ทำให้การรับส่งข้อมูลของคุณเป็นเหมือนเสียงรบกวนที่ไม่มีความหมาย ส่วนสะพานแบบ meek จะทำให้การรับส่งข้อมูลของคุณเหมือนกำลังเชื่อมต่อกับบริการนั้นๆ แทนที่จะเป็น Tor"> +<!ENTITY torsettings.bridgeHelp2 "เนื่องจากบางประเทศบล็อก Tor สะพานบางอันจึงใช้งานได้เฉพาะในบางประเทศเท่านั้น   ถ้าคุณไม่แน่ใจว่าสะพานอันไหนใช้งานได้ในประเทศของคุณบ้าง กรุณาดูที่ torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "กรุณรอระหว่างที่เรากำลังสร้างการเชื่อมต่อไปยังเครือข่าย Tor   นี่อาจจะใช้เวลาสักสองสามนาที"> +<!ENTITY torprogress.pleaseWait "กรุณรอระหว่างที่เรากำลังสร้างการเชื่อมต่อไปยังเครือข่าย Tor   ซึ่งอาจจะใช้เวลาหลายนาที"> diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties index c7d7566..3d587f1 100644 --- a/src/chrome/locale/th/torlauncher.properties +++ b/src/chrome/locale/th/torlauncher.properties @@ -3,43 +3,43 @@ torlauncher.error_title=ตัวเปิด Tor -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited_during_startup=Tor ออกจากโปรแกรมระหว่างการเริ่มต้น อาจเกิดจากข้อผิดพลาดในไฟล์ torrc ของคุณ ข้อผิดพลาดใน Tor หรือโปรแกรมอื่น ๆ ในระบบของคุณหรือฮาร์ดแวร์ผิดพลาด เบราว์เซอร์ของ Tor ยังจะไม่เริ่มทำงานจนกว่าคุณจะแก้ไขปัญหาพื้นฐานและรีสตาร์ทแล้ว +torlauncher.tor_exited=Tor ออกจากโปรแกรมโดยไม่ได้คาดคิดมาก่อน อาจเป็นเพราะข้อผิดพลาดในตัวของ Tor เอง โปรแกรมอื่นในระบบของคุณหรือผิดความผิดพลาดของฮาร์ดแวร์ จนกว่าคุณจะรีสตาร์ท Tor เบราว์เซอร์ของ Tor จะไม่สามารถเข้าถึงเว็บไซต์ใด ๆ ได้ หากปัญหายังคงอยู่ โปรดส่งสำเนาล็อค Tor ของคุณไปยังทีมสนับสนุน +torlauncher.tor_exited2=การรีสตาร์ท Tor จะไม่ปิดแท็บเบราว์เซอร์ของคุณ torlauncher.tor_controlconn_failed=ไม่สามารถเชื่อมต่อกับพอร์ตควบคุมของ Tor ได้ torlauncher.tor_failed_to_start=การเริ่ม Tor ล้มเหลว -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor ประสบความล้มเหลวในการเชื่อมต่อกับเครือข่าย Tor +torlauncher.tor_control_failed=การควบคุมของTor ล้มเหลว +torlauncher.tor_bootstrap_failed=Tor ล้มเหลวในการเชื่อมต่อกับเครือข่าย Tor torlauncher.tor_bootstrap_failed_details=%1$S ล้มเหลว (%2$S) torlauncher.unable_to_start_tor=ไม่สามารถเริ่มการทำงานของ Tor ได้\n\n%S torlauncher.tor_missing=แฟ้มโปรแกรม Tor ขาดหายไป -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=ไฟล์ torrc หายไปและไม่สามารถสร้างได้ +torlauncher.datadir_missing=ไม่มีข้อมูลไดเรกทอรีของ Tor และไม่สามารถสร้างได้ torlauncher.password_hash_missing=ล้มเหลวในการเรียกรหัสผ่านที่ถูกแฮช -torlauncher.failed_to_get_settings=ไม่สามารถเรียกการตั้งค่า Tor ได้\n\n%S +torlauncher.failed_to_get_settings=ไม่สามารถเรียกคืนการตั้งค่า Tor ได้\n\n%S torlauncher.failed_to_save_settings=ไม่สามารถบันทึกการตั้งค่า Tor ได้\n\n%S -torlauncher.ensure_tor_is_running=กรุณาตรวจให้แน่ใจว่า Tor กำลังทำงานอยู่ +torlauncher.ensure_tor_is_running=กรุณาตรวจสอบให้แน่ใจว่า Tor กำลังทำงานอยู่ torlauncher.error_proxy_addr_missing=คุณต้องระบุทั้งที่อยู่ IP หรือชื่อเครื่อง และหมายเลขพอร์ต เพื่อปรับแต่ง Tor ให้ใช้พร็อกซีในการเชื่อมต่ออินเทอร์เน็ต torlauncher.error_proxy_type_missing=คุณต้องเลือกชนิดพร็อกซี torlauncher.error_bridges_missing=คุณต้องระบุสะพานอย่างน้อยหนึ่งตัว -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=คุณต้องเลือกประเภทการถ่ายโอนข้อมูลสำหรับสะพานที่มีให้ +torlauncher.error_bridgedb_bridges_missing=กรุณาขอสะพาน +torlauncher.error_bridge_bad_default_type=ไม่มีสะพานสำหรับชนิดแลกเปลี่ยนข้อมูล% S โปรดปรับการตั้งค่าของคุณ torlauncher.bridge_suffix.meek-amazon=(ใช้งานได้ในประเทศจีน) torlauncher.bridge_suffix.meek-azure=(ใช้งานได้ในประเทศจีน) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=ขอสะพาน… +torlauncher.request_a_new_bridge=ขอสะพานใหม่… +torlauncher.contacting_bridgedb=กำลังติดต่อ BridgeDB. กรุณารอ +torlauncher.captcha_prompt=แก้ปัญหา CAPTCHA เพื่อขอสะพาน +torlauncher.bad_captcha_solution=วิธีแก้ไขไม่ถูกต้อง กรุณาลองอีกครั้ง +torlauncher.unable_to_get_bridge=ไม่สามารถรับสะพานจาก BridgeDB\n\n% S +torlauncher.no_meek=เบราว์เซอร์นี้ไม่ได้กำหนดค่าไว้สำหรับ meek ซึ่งจำเป็นสำหรับการรับสะพาน +torlauncher.no_bridges_available=ไม่มีสะพานว่างในขณะนี้ ขอโทษ torlauncher.connect=เชื่อมต่อ torlauncher.restart_tor=เริ่มการทำงานของ Tor ใหม่ @@ -47,48 +47,48 @@ torlauncher.quit=ออก torlauncher.quit_win=ออก torlauncher.done=สำเร็จ -torlauncher.forAssistance=ต้องการคำแนะนำ ติดต่อ %S -torlauncher.forAssistance2=สำหรับความช่วยเหลือ ดูที่ %S +torlauncher.forAssistance=ต้องการความช่วยเหลือ ติดต่อ %S +torlauncher.forAssistance2=สำหรับความช่วยเหลือ เข้าชมที่ %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=การคัดลอกสำเนาเสร็จสมบูรณ์ % S ข้อความบันทึก Tor พร้อมที่จะถูกวางลงในโปรแกรมแก้ไขข้อความหรือข้อความอีเมล -torlauncher.bootstrapStatus.starting=Starting -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.starting=กำลังเริ่มต้น +torlauncher.bootstrapStatus.conn_pt=กำลังเชื่อมต่อที่สะพาน +torlauncher.bootstrapStatus.conn_done_pt=เชื่อมต่อไปที่สะพานแล้ว +torlauncher.bootstrapStatus.conn_proxy=กำลังเชื่อมต่อกับพร็อกซี +torlauncher.bootstrapStatus.conn_done_proxy=เชื่อมต่อกับพร็อกซีแล้ว +torlauncher.bootstrapStatus.conn=การเชื่อมต่อกับ Tor relay +torlauncher.bootstrapStatus.conn_done=การเชื่อมต่อกับ Tor relay แล้ว +torlauncher.bootstrapStatus.handshake=กำลังต่อรองกับ Tor relay +torlauncher.bootstrapStatus.handshake_done=ต่อรองกับ Tor relay เสร็จแล้ว torlauncher.bootstrapStatus.onehop_create=กำลังสร้างการเชื่อมต่อแบบเข้ารหัสกับคลังเก็บรายชื่อ -torlauncher.bootstrapStatus.requesting_status=กำลังตรวจสถานะเครือข่าย +torlauncher.bootstrapStatus.requesting_status=กำลังเรียกข้อมูลสถานะเครือข่าย torlauncher.bootstrapStatus.loading_status=กำลังดึงข้อมูลสถานะเครือข่าย -torlauncher.bootstrapStatus.loading_keys=กำลังดึง ใบรับรองการให้สิทธิ (authority certificates) +torlauncher.bootstrapStatus.loading_keys=กำลังดึง ใบรับรองสิทธิ torlauncher.bootstrapStatus.requesting_descriptors=กำลังร้องขอข้อมูล relay torlauncher.bootstrapStatus.loading_descriptors=กำลังดึงข้อมูล relay -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit -torlauncher.bootstrapStatus.done=เชื่อมต่อสู่เครือข่าย Tor เรียบร้อย! +torlauncher.bootstrapStatus.enough_dirinfo=การโหลดข้อมูลrelay เสร็จสิ้น +torlauncher.bootstrapStatus.ap_conn_pt=กำลังสร้างวงจร: กำลังเชื่อมต่อกับสะพาน +torlauncher.bootstrapStatus.ap_conn_done_pt=กำลังสร้างวงจร: เชื่อมต่อกับสะพานแล้ว +torlauncher.bootstrapStatus.ap_conn_proxy=กำลังสร้างวงจร: กำลังเชื่อมต่อกับพร็อกซี +torlauncher.bootstrapStatus.ap_conn_done_proxy=กำลังสร้างวงจร: เชื่อมต่อกับพร็อกซีแล้ว +torlauncher.bootstrapStatus.ap_conn=กำลังสร้างวงจร: กำลังเชื่อมต่อกับTor relay +torlauncher.bootstrapStatus.ap_conn_done=กำลังสร้างวงจร: เชื่อมต่อกับ Tor relay แล้ว +torlauncher.bootstrapStatus.ap_handshake=กำลังสร้างวงจร: กำลังติดต่อกับ Tor relay +torlauncher.bootstrapStatus.ap_handshake_done=กำลังสร้างวงจร: ติดต่อกับ Tor relay เสร็จแล้ว +torlauncher.bootstrapStatus.circuit_create=กำลังสร้างวงจร: กำลังสร้างการเชื่อมต่อวงจร Tor +torlauncher.bootstrapStatus.done=เชื่อมต่อเครือข่าย Tor เรียบร้อยแล้ว torlauncher.bootstrapWarning.done=สำเร็จ torlauncher.bootstrapWarning.connectrefused=ถูกปฏิเสธการเชื่อมต่อ torlauncher.bootstrapWarning.misc=เบ็ดเตล็ด torlauncher.bootstrapWarning.resourcelimit=ทรัพยากรไม่เพียงพอ -torlauncher.bootstrapWarning.identity=ตัวตนไม่ถูกต้อง +torlauncher.bootstrapWarning.identity=ข้อมูลประจำตัวไม่ตรงกัน torlauncher.bootstrapWarning.timeout=นานเกินไปในการเชื่อมต่อ torlauncher.bootstrapWarning.noroute=หาเส้นทางไปหา host ไม่พบ torlauncher.bootstrapWarning.ioerror=อ่าน/เขียน ผิดพลาด -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=ที่เสียบสำหรับการขนส่งหายไป -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=การเชื่อมต่อกับเซิร์ฟเวอร์หายไป +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=ไม่สามารถเชื่อมต่อกับพร็อกซี diff --git a/src/chrome/locale/uk/torlauncher.properties b/src/chrome/locale/uk/torlauncher.properties index f2f13ac..3861593 100644 --- a/src/chrome/locale/uk/torlauncher.properties +++ b/src/chrome/locale/uk/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Ви повинні вказати IP-ад torlauncher.error_proxy_type_missing=Ви повинні вибрати тип проксі. torlauncher.error_bridges_missing=Ви повинні вказати один або кілька мережевих мостів. torlauncher.error_default_bridges_type_missing=Ви повинні вибрати тип транспорту для наданих мережевих мостів. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Надішліть запит на отримання мосту. torlauncher.error_bridge_bad_default_type=Немає мережевих мостів які мають тип транспорту %S. Будь ласка перевірте ваші налаштування. torlauncher.bridge_suffix.meek-amazon=(працює в Китаї) torlauncher.bridge_suffix.meek-azure=(працює в Китаї) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Надіслати запит на отримання мосту... +torlauncher.request_a_new_bridge=Надіслати запит на отримання нового мосту... +torlauncher.contacting_bridgedb=З'єднання з базою даних мостів. Зачекайте. +torlauncher.captcha_prompt=Розв'яжіть CAPTCHA, щоб надіслати запит на отримання мосту. +torlauncher.bad_captcha_solution=Розв'язання невірне. Спробуйте знову. +torlauncher.unable_to_get_bridge=Не вдалося отримати міст з бази даних мостів.\n\n%S +torlauncher.no_meek=Цей браузер не налаштований для роботи з meek, необхідним для отримання мостів. +torlauncher.no_bridges_available=Наразі немає доступних мостів. Шкода. torlauncher.connect=З'єднатися torlauncher.restart_tor=Перезапустити Tor @@ -52,31 +52,31 @@ torlauncher.forAssistance2=Для отримання допомоги, будь torlauncher.copiedNLogMessages=Копіювання завершено. %S повідомлень журналу tor готові до вставки у текстовий редактор або повідомлення електронної пошти. -torlauncher.bootstrapStatus.starting=Starting -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.starting=Запуск +torlauncher.bootstrapStatus.conn_pt=З'єднання з мостом +torlauncher.bootstrapStatus.conn_done_pt=З'єднано з мостом +torlauncher.bootstrapStatus.conn_proxy=З'єднання з проксі-сервером +torlauncher.bootstrapStatus.conn_done_proxy=З'єднано з проксі-сервером +torlauncher.bootstrapStatus.conn=З'єднання з ретранслятором Tor +torlauncher.bootstrapStatus.conn_done=З'єднано з ретранслятором Tor +torlauncher.bootstrapStatus.handshake=Обмін даними з ретранслятором Tor +torlauncher.bootstrapStatus.handshake_done=Обмін даними з ретранслятором Tor завершено torlauncher.bootstrapStatus.onehop_create=Встановлення зашифрованого з'єднання до каталогу torlauncher.bootstrapStatus.requesting_status=Отримання стану мережі torlauncher.bootstrapStatus.loading_status=Завантаження стану мережі torlauncher.bootstrapStatus.loading_keys=Завантаження сертифікатів авторизації torlauncher.bootstrapStatus.requesting_descriptors=Запит інформації про марщрутизацію torlauncher.bootstrapStatus.loading_descriptors=Завантаження інформації про маршрутизацію -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit +torlauncher.bootstrapStatus.enough_dirinfo=Завантаження інформації про ретранслятор завершено +torlauncher.bootstrapStatus.ap_conn_pt=Побудова кіл: З'єднання з мостом +torlauncher.bootstrapStatus.ap_conn_done_pt=Побудова кіл: З'єднано з мостом +torlauncher.bootstrapStatus.ap_conn_proxy=Побудова кіл: З'єднання з проксі-сервером +torlauncher.bootstrapStatus.ap_conn_done_proxy=Побудова кіл: З'єднано з проксі-сервером +torlauncher.bootstrapStatus.ap_conn=Побудова кіл: З'єднання з ретранслятором Tor +torlauncher.bootstrapStatus.ap_conn_done=Побудова кіл: З'єднано з ретранслятором Tor +torlauncher.bootstrapStatus.ap_handshake=Побудова кіл: Обмін даними з ретранслятором Tor +torlauncher.bootstrapStatus.ap_handshake_done=Побудова кіл: Обмін даними з ретранслятором Tor завершено +torlauncher.bootstrapStatus.circuit_create=Побудова кіл: Встановлення кола Tor torlauncher.bootstrapStatus.done=Підключений до мережі Tor! torlauncher.bootstrapWarning.done=виконано @@ -89,6 +89,6 @@ torlauncher.bootstrapWarning.noroute=не вказаний шлях до хос torlauncher.bootstrapWarning.ioerror=помилка читання / запису torlauncher.bootstrapWarning.pt_missing=пропущений підключуваний транспорт -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=З'єднання з сервером втрачено. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Не вдалося з'єднатися з сервером. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Не вдалося з'єднатися з проксі-сервером. diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 54f23b1..f0dc557 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "请点击“连接”以连接至 Tor 网络。"> -<!ENTITY torSettings.configurePrompt "如果您所在的国家（如埃及，中国，土耳其）对Tor进行审查，或者您处于私人网络需要代理。请点击“配置”，对网络设置进行调整。"> +<!ENTITY torSettings.configurePrompt "如果您所在的国家（如埃及，中国，土耳其）对 Tor 进行审查，或者您处于的私人网络需要代理，请点击“配置”，对网络设置进行调整。"> <!ENTITY torSettings.configure "配置"> <!ENTITY torSettings.connect "连接"> @@ -38,12 +38,12 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接"> <!ENTITY torsettings.firewall.allowedPorts "允许的端口："> -<!ENTITY torsettings.useBridges.checkbox "我所在国家对 Tor 进行了封锁"> +<!ENTITY torsettings.useBridges.checkbox "我所在的国家对 Tor 进行了审查"> <!ENTITY torsettings.useBridges.default "选择内置网桥"> <!ENTITY torsettings.useBridges.default.placeholder "选择网桥"> <!ENTITY torsettings.useBridges.bridgeDB "从torproject.org获取一个网桥"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "请输入图片中出现的字符"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "迎接新的挑战"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "获取新的验证码"> <!ENTITY torsettings.useBridges.captchaSubmit "提交"> <!ENTITY torsettings.useBridges.custom "输入获取的网桥"> <!ENTITY torsettings.useBridges.label "输入可信来源提供的网桥："> diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index 9f97f31..ef2c93c 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -1,16 +1,16 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor 启动器 torlauncher.tor_exited_during_startup=Tor 在启动期间退出。这可能是您的 torrc 文件存在错误，或者 Tor 或您的系统中的其他程序存在问题，或者硬件问题。在您解决此问题并重新启动 Tor 前，Tor 浏览器将不会启动。 -torlauncher.tor_exited=Tor 意外退出。这可能是由于：Tor 自身故障，操作系统的其他程序或硬件故障。在重新启动 Tor 之前，Tor Browser 将无法连接任何网站。如果问题持续发生，请将 Tor 日志发送至技术团队。 +torlauncher.tor_exited=Tor 意外退出。这可能是由于 Tor 自身的故障或操作系统的其他程序或硬件故障。在重新启动 Tor 之前，Tor 浏览器将无法连接任何网站。如果问题持续发生，请将 Tor 日志发送至技术团队。 torlauncher.tor_exited2=重启 Tor 不会关闭浏览器标签页。 torlauncher.tor_controlconn_failed=无法连接 Tor 控制端口。 torlauncher.tor_failed_to_start=Tor 无法启动。 torlauncher.tor_control_failed=控制 Tor 失败。 torlauncher.tor_bootstrap_failed=连接 Tor 网络失败。 -torlauncher.tor_bootstrap_failed_details=%1$S 失败 (%2$S)。 +torlauncher.tor_bootstrap_failed_details=%1$S 失败（%2$S）。 torlauncher.unable_to_start_tor=无法启动 Tor。\n\n%S torlauncher.tor_missing=缺少 Tor 可执行文件。 @@ -59,8 +59,8 @@ torlauncher.bootstrapStatus.conn_proxy=正在连接到代理服务器 torlauncher.bootstrapStatus.conn_done_proxy=已连接到代理服务器 torlauncher.bootstrapStatus.conn=正在连接到 Tor 中继 torlauncher.bootstrapStatus.conn_done=已连接到 Tor 中继 -torlauncher.bootstrapStatus.handshake=与一个Tor中继交涉中 -torlauncher.bootstrapStatus.handshake_done=与一个Tor中继交涉完毕 +torlauncher.bootstrapStatus.handshake=与一个 Tor 中继交涉中 +torlauncher.bootstrapStatus.handshake_done=与一个 Tor 中继交涉完毕 torlauncher.bootstrapStatus.onehop_create=正在建立加密的目录连接 torlauncher.bootstrapStatus.requesting_status=正在检索网络状态 torlauncher.bootstrapStatus.loading_status=正在载入网络状态 @@ -68,15 +68,15 @@ torlauncher.bootstrapStatus.loading_keys=正在载入证书颁发机构证书 torlauncher.bootstrapStatus.requesting_descriptors=正在请求中继信息 torlauncher.bootstrapStatus.loading_descriptors=正在载入中继信息 torlauncher.bootstrapStatus.enough_dirinfo=已加载中继信息 -torlauncher.bootstrapStatus.ap_conn_pt=构筑环路：正在连接到网桥 -torlauncher.bootstrapStatus.ap_conn_done_pt=构筑环路：已连接到网桥 -torlauncher.bootstrapStatus.ap_conn_proxy=构筑环路：正在连接到代理服务器 -torlauncher.bootstrapStatus.ap_conn_done_proxy=构筑环路：已连接到代理服务器 -torlauncher.bootstrapStatus.ap_conn=构筑环路：正在连接到 Tor 中继 -torlauncher.bootstrapStatus.ap_conn_done=构筑环路：已连接到 Tor 中继 -torlauncher.bootstrapStatus.ap_handshake=构筑环路：与一个Tor中继交涉中 -torlauncher.bootstrapStatus.ap_handshake_done=构筑环路：与一个Tor中继交涉完毕 -torlauncher.bootstrapStatus.circuit_create=构筑环路：建立一个Tor 环路中 +torlauncher.bootstrapStatus.ap_conn_pt=建立链路：正在连接到网桥 +torlauncher.bootstrapStatus.ap_conn_done_pt=建立链路：已连接到网桥 +torlauncher.bootstrapStatus.ap_conn_proxy=建立链路：正在连接到代理服务器 +torlauncher.bootstrapStatus.ap_conn_done_proxy=建立链路：已连接到代理服务器 +torlauncher.bootstrapStatus.ap_conn=建立链路：正在连接到 Tor 中继 +torlauncher.bootstrapStatus.ap_conn_done=建立链路：已连接到 Tor 中继 +torlauncher.bootstrapStatus.ap_handshake=建立链路：与 Tor 中继交涉中 +torlauncher.bootstrapStatus.ap_handshake_done=建立链路：与一个 Tor 中继交涉完毕 +torlauncher.bootstrapStatus.circuit_create=建立链路：建立一个 Tor 链路中 torlauncher.bootstrapStatus.done=Tor 网络已经连接！ torlauncher.bootstrapWarning.done=完成 @@ -87,7 +87,7 @@ torlauncher.bootstrapWarning.identity=标识不一致 torlauncher.bootstrapWarning.timeout=连接超时 torlauncher.bootstrapWarning.noroute=没有可用链路 torlauncher.bootstrapWarning.ioerror=读写错误 -torlauncher.bootstrapWarning.pt_missing=缺少 pluggable 传输类型网桥 +torlauncher.bootstrapWarning.pt_missing=缺少可插拔传输类型网桥 torlauncher.nsresult.NS_ERROR_NET_RESET=与服务器的连接已丢失... torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=无法连接到服务器。

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Pull in Torbutton 2.2
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit be8e62e4dbd305b8a3a99aa140e38bcb5be88f3c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 4 07:46:33 2019 +0000 Pull in Torbutton 2.2 --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 534a42c9d8c5..73ef44a6ece3 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 534a42c9d8c57730dab0df9a1f77b2b5cc1d0b43 +Subproject commit 73ef44a6ece304438cf6db89a0c8bbc75d65c16b

1 0

[torbutton/master] Release prep for 2.2
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit 73ef44a6ece304438cf6db89a0c8bbc75d65c16b Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 4 07:44:53 2019 +0000 Release prep for 2.2 --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index fe236b2c..e1b56304 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +2.2 + * Bug 30469: Add ro translation + * Translations update + 2.1.10 * Bug 30565: sync nocertdb with privatebrowsing.autostart at startup * Translations update diff --git a/src/install.rdf b/src/install.rdf index aa03c8dc..2d855202 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.1.10</em:version> + <em:version>2.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit 41b5dac4943dcf65582f2638fe6d1b5c80127c0a Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 28 14:12:49 2019 +0000 fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens There are rare situations where getSelectedTab() is null. --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 0b369ca8d5ab..265081798bf7 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3134,7 +3134,10 @@ public class BrowserApp extends GeckoApp // When the content loaded in the background (such as about:tor), // it was loaded while mBrowserChrome was GONE. We should refresh the // height now so the page is rendered correctly. - Tabs.getInstance().getSelectedTab().doReload(true); + Tab selectedTab = Tabs.getInstance().getSelectedTab(); + if (selectedTab != null) { + selectedTab.doReload(true); + } // If we finished, then Tor bootstrapped 100% mTorNeedsStart = false;

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Revert "Bug 28507: Add prefs that allow the browser to delete browsing history by default"
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit 6d81ef66c55d5b88f39ee6527f8218b2f2e15cd8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 28 01:58:05 2019 +0000 Revert "Bug 28507: Add prefs that allow the browser to delete browsing history by default" This reverts commit b0b54ec7c7a077e8fc728a75cdd475965a1c2bac. --- .../torbrowser/assets/distribution/preferences.json | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/mobile/android/torbrowser/assets/distribution/preferences.json b/mobile/android/torbrowser/assets/distribution/preferences.json index 0990fba37a8f..bebd14967d8e 100644 --- a/mobile/android/torbrowser/assets/distribution/preferences.json +++ b/mobile/android/torbrowser/assets/distribution/preferences.json @@ -5,18 +5,6 @@ "AndroidPreferences": { "homepage": "about:tor", "startpane_enabled_after_57": true, - "startpane_enabled": true, - "history.clear_on_exit": [ - "private.data.openTabs", - "private.data.history", - "private.data.searchHistory", - "private.data.formdata", - "private.data.cookies_sessions", - "private.data.cache", - "private.data.offlineApps", - "private.data.siteSettings", - "private.data.syncedTabs", - "private.data.passwords" - ] + "startpane_enabled": true } }

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 24920 - Only create Private tabs if browser.privatebrowsing.autostart is true
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit 1bce86ec5cfff504baf6e61b9d356ff74c62b297 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon May 27 15:55:33 2019 +0000 Bug 24920 - Only create Private tabs if browser.privatebrowsing.autostart is true --- .../base/java/org/mozilla/gecko/BrowserApp.java | 9 +++++++ .../base/java/org/mozilla/gecko/GeckoApp.java | 31 ++++++++++++++++++++++ .../android/base/java/org/mozilla/gecko/Tabs.java | 7 ++++- .../java/org/mozilla/gecko/tabs/TabsPanel.java | 4 +++ mobile/android/chrome/content/browser.js | 2 +- 5 files changed, 51 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 006d5c11f210..0b369ca8d5ab 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3754,6 +3754,15 @@ public class BrowserApp extends GeckoApp share.setActionProvider(provider); + // Change visibility of new_tab. This may be called before + // mOnlyPrivateTabs is set in GeckoApp::onCreate(). If the PrefHelper + // callback was not already called, then the visibility will be correctly set + // in the callback. + MenuItem newTabMenuItem = (MenuItem) mMenu.findItem(R.id.new_tab); + if (newTabMenuItem != null) { + newTabMenuItem.setVisible(mOnlyPrivateTabs == false); + } + return true; } diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index 42a4f191d525..64c93d900430 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -154,6 +154,8 @@ public abstract class GeckoApp extends GeckoActivity */ public static final String PREFS_IS_FIRST_RUN = "telemetry-isFirstRun"; + public static final String PREFS_PRIVATEBROWSING_AUTOSTART = "browser.privatebrowsing.autostart"; + public static final String SAVED_STATE_IN_BACKGROUND = "inBackground"; public static final String SAVED_STATE_PRIVATE_SESSION = "privateSession"; @@ -325,6 +327,8 @@ public abstract class GeckoApp extends GeckoActivity private boolean mPrivateBrowsingSessionOutdated; private static final int MAX_PRIVATE_TABS_UPDATE_WAIT_MSEC = 500; + protected boolean mOnlyPrivateTabs = false; + private volatile HealthRecorder mHealthRecorder; private volatile Locale mLastLocale; @@ -1129,6 +1133,28 @@ public abstract class GeckoApp extends GeckoActivity "ToggleChrome:Show", null); + PrefsHelper.getPref(PREFS_PRIVATEBROWSING_AUTOSTART, + new PrefsHelper.PrefHandlerBase() { + @Override public void prefValue(String pref, boolean value) { + if (pref != PREFS_PRIVATEBROWSING_AUTOSTART) { + return; + } + + mOnlyPrivateTabs = value; + + // Change visibility here in case mMenu is initialized. If it is not initialized, + // then the visibility is set in BrowserApp::onCreateOptionsMenu(). + if (mMenu != null) { + MenuItem newTabMenuItem = (MenuItem) mMenu.findItem(R.id.new_tab); + if (newTabMenuItem != null) { + newTabMenuItem.setVisible(mOnlyPrivateTabs == false); + } + } + + Tabs.getInstance().setOnlyPrivateTabs(mOnlyPrivateTabs); + } + }); + Tabs.getInstance().attachToContext(this, mLayerView, getAppEventDispatcher()); Tabs.registerOnTabsChangedListener(this); @@ -1167,6 +1193,7 @@ public abstract class GeckoApp extends GeckoActivity } // If we are doing a restore, read the session data so we can send it to Gecko later. + GeckoBundle restoreMessage = null; if (!mIsRestoringActivity && mShouldRestore) { final boolean isExternalURL = invokedWithExternalURL(getIntentURI(new SafeIntent(getIntent()))); @@ -2244,6 +2271,10 @@ public abstract class GeckoApp extends GeckoActivity } } + public boolean isOnlyPrivateTabs() { + return mOnlyPrivateTabs; + } + @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) protected void finishAndShutdown(final boolean restart) { ThreadUtils.assertOnUiThread(); diff --git a/mobile/android/base/java/org/mozilla/gecko/Tabs.java b/mobile/android/base/java/org/mozilla/gecko/Tabs.java index 36d1b474bb87..d139b26cc217 100644 --- a/mobile/android/base/java/org/mozilla/gecko/Tabs.java +++ b/mobile/android/base/java/org/mozilla/gecko/Tabs.java @@ -104,6 +104,7 @@ public class Tabs implements BundleEventListener { private ContentObserver mBookmarksContentObserver; private PersistTabsRunnable mPersistTabsRunnable; private int mPrivateClearColor; + private boolean mOnlyPrivateTabs = true; // Close all tabs including normal and private tabs. @RobocopTarget @@ -208,6 +209,10 @@ public class Tabs implements BundleEventListener { } } + public synchronized void setOnlyPrivateTabs(boolean onlyPrivateTabs) { + mOnlyPrivateTabs = onlyPrivateTabs; + } + public void detachFromContext() { mGeckoView = null; } @@ -989,7 +994,7 @@ public class Tabs implements BundleEventListener { // delayLoad implies background tab boolean background = delayLoad || (flags & LOADURL_BACKGROUND) != 0; - boolean isPrivate = (flags & LOADURL_PRIVATE) != 0 || (intent != null && intent.getBooleanExtra(PRIVATE_TAB_INTENT_EXTRA, false)); + boolean isPrivate = (flags & LOADURL_PRIVATE) != 0 || (intent != null && intent.getBooleanExtra(PRIVATE_TAB_INTENT_EXTRA, false)) || mOnlyPrivateTabs; boolean userEntered = (flags & LOADURL_USER_ENTERED) != 0; boolean desktopMode = (flags & LOADURL_DESKTOP) != 0; boolean external = (flags & LOADURL_EXTERNAL) != 0; diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.java index 08c107ebb62d..fc27ac03c929 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.java @@ -167,6 +167,10 @@ public class TabsPanel extends LinearLayout final View tabNormal = mTabWidget.addTab(R.drawable.tabs_normal, R.string.tabs_normal); mNormalTabsPanel = tabNormal instanceof ThemedImageButton ? ((ThemedImageButton) tabNormal) : null; + if (mActivity.isOnlyPrivateTabs()) { + tabNormal.setVisibility(View.GONE); + } + final View tabPrivate = mTabWidget.addTab(R.drawable.tabs_private, R.string.tabs_private); mPrivateTabsPanel = tabPrivate instanceof ThemedImageButton ? ((ThemedImageButton) tabPrivate) : null; if (mPrivateTabsPanel != null) { diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index c3430f5b5a4c..5e2291865b89 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -3652,7 +3652,7 @@ Tab.prototype = { // Must be called after appendChild so the docShell has been created. this.setActive(false); - let isPrivate = ("isPrivate" in aParams) && aParams.isPrivate; + let isPrivate = (("isPrivate" in aParams) && aParams.isPrivate) || Services.prefs.getBoolPref("browser.privatebrowsing.autostart"); if (isPrivate) { attrs['privateBrowsingId'] = 1; }

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Revert "Bug 28507: Parse a set of strings in Android Set Preferences"
by gk＠torproject.org 04 Jun '19

04 Jun '19

commit 1666b0186346ab2769614d3b19bc2058fd6f13f0 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 28 01:58:14 2019 +0000 Revert "Bug 28507: Parse a set of strings in Android Set Preferences" This reverts commit 894c64799812159b17ee90ca39427d12999a670d. --- .../gecko/preferences/DistroSharedPrefsImport.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java b/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java index 7969aca3d2ac..13047c6f2ff4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java +++ b/mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java @@ -11,13 +11,10 @@ import org.mozilla.gecko.distribution.Distribution; import android.content.Context; import android.content.SharedPreferences; import android.util.Log; -import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import java.util.HashSet; import java.util.Iterator; -import java.util.Set; public class DistroSharedPrefsImport { @@ -61,21 +58,7 @@ public class DistroSharedPrefsImport { } else if (value instanceof Long) { sharedPreferences.putLong(GeckoPreferences.NON_PREF_PREFIX + key, (long) value); } else { - JSONArray jsonArray = preferences.optJSONArray(key); - if (jsonArray != null) { - Set<String> prefValues = new HashSet<String>(); - for (int i = 0; i < jsonArray.length(); i++) { - try { - prefValues.add(jsonArray.getString(i)); - } catch (JSONException e) { - Log.e(LOGTAG, "Unable to parse Android Preferences.", e); - continue; - } - } - sharedPreferences.putStringSet(GeckoPreferences.NON_PREF_PREFIX + key, prefValues); - } else { - Log.d(LOGTAG, "Unknown preference value type whilst importing android preferences from distro file."); - } + Log.d(LOGTAG, "Unknown preference value type whilst importing android preferences from distro file."); } } sharedPreferences.apply();

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Pick up #30469 for mobile nightlies
by gk＠torproject.org 03 Jun '19

03 Jun '19

commit beed98ed94ee8b9fabdeff198f80bedbcbc525b8 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 3 12:19:14 2019 +0000 Pick up #30469 for mobile nightlies --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index fc1b50e42123..534a42c9d8c5 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit fc1b50e42123a5850098cd58e6a8889e28be8ae6 +Subproject commit 534a42c9d8c57730dab0df9a1f77b2b5cc1d0b43

1 0