October 2022 - tor-commits - lists.torproject.org

[builders/tor-browser-build] branch main updated: Bug 40359: Update the icon also in the launcher of the Browser directory
by gitolite role 18 Oct '22

18 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 6d0e9690 Bug 40359: Update the icon also in the launcher of the Browser directory 6d0e9690 is described below commit 6d0e96906b330af5ad8a2db47db9c4a5a9014210 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Oct 14 18:41:48 2022 +0200 Bug 40359: Update the icon also in the launcher of the Browser directory --- projects/browser/RelativeLink/start-browser | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/browser/RelativeLink/start-browser b/projects/browser/RelativeLink/start-browser index b7b96d2a..14b50e15 100755 --- a/projects/browser/RelativeLink/start-browser +++ b/projects/browser/RelativeLink/start-browser @@ -232,6 +232,7 @@ fi cp start-[% c('var/project-name') %].desktop ../ sed -i -e "s,^Name=.*,Name=[% c('var/Project_Name') %],g" ../start-[% c('var/project-name') %].desktop sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" ../start-[% c('var/project-name') %].desktop +sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" start-[% c('var/project-name') %].desktop sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-[% c('var/project-name') %]\" --detach || ([ ! -x \"$PWD/start-[% c('var/project-name') %]\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-[% c('var/project-name') %] --detach)' dummy %k,g" ../start-[% c('var/project-name') %].desktop if [ "$register_desktop_app" -eq 1 ]; then -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated (98311ec00049 -> 2debb2470dbc)
by gitolite role 18 Oct '22

18 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. from 98311ec00049 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser new 725d7fdaf484 Revert "Bug 41125: stop proxy bypass in ServiceRequest.fetch by gating with checking MOZ_PROXY_BYPASS_PROTECTION and network.proxy.allow_bypass" new fb016a0d3f40 Bug 1791689 - StaticPrefList network.proxy.allow_bypass checks MOZ_PROXY_BYPASS_PROTECTION for default value. r=robwu, a=RyanVM new 2debb2470dbc fixup! Firefox preference overrides. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: browser/app/profile/001-base-profile.js | 2 +- modules/libpref/init/StaticPrefList.yaml | 4 ++++ services/settings/Utils.jsm | 3 --- toolkit/modules/AppConstants.jsm | 7 ------- 4 files changed, 5 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[builders/tor-browser-build] branch main updated: fixup! Bug 17400: Enable multi-lingual builds
by gitolite role 17 Oct '22

17 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 71e09418 fixup! Bug 17400: Enable multi-lingual builds 71e09418 is described below commit 71e0941818e735f931b5353918b06e7ea7d8828d Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Oct 17 21:44:24 2022 +0200 fixup! Bug 17400: Enable multi-lingual builds Bumped the rebase number of projects/firefox --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 43f2d7da..e20591c9 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -12,7 +12,7 @@ container: var: firefox_platform_version: 102.3.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - browser_branch: '12.0-1' + browser_branch: '12.0-2' browser_build: 2 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated (2bfef6cc3db2 -> 98311ec00049)
by gitolite role 17 Oct '22

17 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. from 2bfef6cc3db2 fixup! Bug 40926: Implemented the New Identity feature new be4ac65a5b15 fixup! Bug 2176: Rebrand Firefox to TorBrowser new daaaf35100fe fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection new 98311ec00049 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: browser/branding/tor-styles.inc.css | 12 +++++- .../torconnect/content/aboutTorConnect.css | 4 +- .../torconnect/content/connection-failure.svg | 2 +- .../torconnect/content/connection-location.svg | 2 +- .../torpreferences/content/torPreferences.css | 44 +++++++++++----------- 5 files changed, 39 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: fixup! Bug 40926: Implemented the New Identity feature
by gitolite role 17 Oct '22

17 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.3.0esr-12.0-2 by this push: new 2bfef6cc3db2 fixup! Bug 40926: Implemented the New Identity feature 2bfef6cc3db2 is described below commit 2bfef6cc3db2a31d7803e271638c0838295ad8a0 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Thu Oct 13 19:36:46 2022 +0200 fixup! Bug 40926: Implemented the New Identity feature Bug 41337: Add a title to the new identity confirmation --- browser/components/newidentity/content/newidentity.js | 15 ++++++++++++--- .../newidentity/locale/en-US/newIdentity.properties | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/browser/components/newidentity/content/newidentity.js b/browser/components/newidentity/content/newidentity.js index 466cf437d90a..fac4c05e96a2 100644 --- a/browser/components/newidentity/content/newidentity.js +++ b/browser/components/newidentity/content/newidentity.js @@ -15,7 +15,9 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { let strings = { new_identity: "New Identity", new_identity_sentence_case: "New identity", + new_identity_prompt_title: "Reset your identity?", new_identity_prompt: `${brandShortName} will close all windows and tabs. All website sessions will be lost. \nRestart ${brandShortName} now to reset your identity?`, + new_identity_restart: `${brandShortName}`, new_identity_ask_again: "Never ask me again", new_identity_menu_accesskey: "I", }; @@ -37,6 +39,10 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { "%S", brandShortName ); + strings.new_identity_restart = strings.new_identity_restart.replaceAll( + "%S", + brandShortName + ); } return strings; }); @@ -523,15 +529,18 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { const shouldConfirm = Services.prefs.getBoolPref(prefConfirm, true); if (shouldConfirm) { // Display two buttons, both with string titles. - const flags = Services.prompt.STD_YES_NO_BUTTONS; + const flags = + Services.prompt.BUTTON_TITLE_IS_STRING * + Services.prompt.BUTTON_POS_0 + + Services.prompt.BUTTON_TITLE_CANCEL * Services.prompt.BUTTON_POS_1; const askAgain = { value: false }; const confirmed = Services.prompt.confirmEx( window, - "", + NewIdentityStrings.new_identity_prompt_title, NewIdentityStrings.new_identity_prompt, flags, - null, + NewIdentityStrings.new_identity_restart, null, null, NewIdentityStrings.new_identity_ask_again, diff --git a/browser/components/newidentity/locale/en-US/newIdentity.properties b/browser/components/newidentity/locale/en-US/newIdentity.properties index 54eeca135a5e..b44dd74c17df 100644 --- a/browser/components/newidentity/locale/en-US/newIdentity.properties +++ b/browser/components/newidentity/locale/en-US/newIdentity.properties @@ -2,7 +2,9 @@ new_identity = New Identity # This is the string for the hamburger menu new_identity_sentence_case = New identity # %S is the application name. Keep it as a placeholder +new_identity_prompt_title = Reset your identity? new_identity_prompt = %S will close all windows and tabs. All website sessions will be lost. \nRestart %S now to reset your identity? +new_identity_restart = Restart %S new_identity_ask_again = Never ask me again # Shown in the File menu (use Alt to show File, if you do not see) new_identity_menu_accesskey = I -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torbutton] branch main updated: Bug 41352: Always show the link to the manual in about:tor
by gitolite role 17 Oct '22

17 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch main in repository torbutton. The following commit(s) were added to refs/heads/main by this push: new fb381b64 Bug 41352: Always show the link to the manual in about:tor fb381b64 is described below commit fb381b649b92116d3f03a13313c5a051b792604c Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Oct 11 19:13:21 2022 +0200 Bug 41352: Always show the link to the manual in about:tor --- chrome/content/aboutTor/aboutTor-content.js | 8 +------- chrome/content/preferences-mobile.js | 26 -------------------------- chrome/content/torbutton.js | 18 ------------------ chrome/skin/aboutTor.css | 3 +-- modules/utils.js | 7 ------- 5 files changed, 2 insertions(+), 60 deletions(-) diff --git a/chrome/content/aboutTor/aboutTor-content.js b/chrome/content/aboutTor/aboutTor-content.js index 55bf4413..a35d95b5 100644 --- a/chrome/content/aboutTor/aboutTor-content.js +++ b/chrome/content/aboutTor/aboutTor-content.js @@ -19,7 +19,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { bindPrefAndInit, show_torbrowser_manual } = ChromeUtils.import( +const { bindPrefAndInit } = ChromeUtils.import( "resource://torbutton/modules/utils.js" ); @@ -95,12 +95,6 @@ var AboutTorListener = { body.removeAttribute("toron"); } - if (show_torbrowser_manual()) { - body.setAttribute("showmanual", "yes"); - } else { - body.removeAttribute("showmanual"); - } - if (aData.updateChannel) { body.setAttribute("updatechannel", aData.updateChannel); } else { diff --git a/chrome/content/preferences-mobile.js b/chrome/content/preferences-mobile.js index 92564e90..50cbfccd 100644 --- a/chrome/content/preferences-mobile.js +++ b/chrome/content/preferences-mobile.js @@ -10,10 +10,6 @@ const { getCharPref, } = Services.prefs; -let { getLocale, show_torbrowser_manual } = ChromeUtils.import( - "resource://torbutton/modules/utils.js" -); - // Description elements have the follow names. const descNames = ["", "desc_standard", "desc_safer", "desc_safest"]; // "Learn-more"-elements have the follow names. @@ -51,7 +47,6 @@ function torbutton_init_security_ui() { getIntPref("extensions.torbutton.security_slider") ) ); - torbutton_set_learn_more_links(); } // Write the two prefs from the current settings. @@ -62,24 +57,3 @@ function torbutton_save_security_settings() { ); setBoolPref("extensions.torbutton.security_custom", state.custom); } - -// We follow the way we treat the links to the Tor Browser User Manual on the -// Help Menu and on about:tor: if we have the manual available for a locale, -// let's show the "Learn more"-link, otherwise hide it. -function torbutton_set_learn_more_links() { - let show_manual = show_torbrowser_manual(); - let locale = ""; - if (show_manual) { - locale = getLocale(); - } - let links = linkNames.map(name => document.getElementById(name)); - links.forEach(link => { - if (show_manual && locale != "") { - link.href = - "https:/tb-manual.torproject.org/" + locale + "/security-slider.html"; - link.hidden = false; - } else { - link.hidden = true; - } - }); -} diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index d89e5d55..3400a32a 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -19,7 +19,6 @@ var torbutton_new_circuit; */ let { - show_torbrowser_manual, unescapeTorString, bindPrefAndInit, getDomainForBrowser, @@ -275,12 +274,6 @@ var torbutton_new_circuit; torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register(); - try { - torbutton_init_user_manual_links(); - } catch (e) { - torbutton_log(4, "Error loading the user manual " + e); - } - // Arrange for our about:tor content script to be loaded in each frame. window.messageManager.loadFrameScript( "chrome://torbutton/content/aboutTor/aboutTor-content.js", @@ -1042,16 +1035,5 @@ var torbutton_new_circuit; onStatusChange(aProgress, aRequest, stat, message) {}, onSecurityChange() {}, }; - - // Makes sure the item in the Help Menu and the link in about:tor - // for the Tor Browser User Manual are only visible when - // show_torbrowser_manual() returns true. - function torbutton_init_user_manual_links() { - let menuitem = document.getElementById("torBrowserUserManual"); - bindPrefAndInit("intl.locale.requested", val => { - menuitem.hidden = !show_torbrowser_manual(); - torbutton_abouttor_message_handler.updateAllOpenPages(); - }); - } })(); //vim:set ts=4 diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index da02130b..007c46d3 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -112,8 +112,7 @@ body:not([toron]) .hideIfTorOff { display: none; } -body:not([hasbeenupdated]) .showIfHasBeenUpdated, -body:not([showmanual]) .showForManual { +body:not([hasbeenupdated]) .showIfHasBeenUpdated { display: none; } diff --git a/modules/utils.js b/modules/utils.js index 7ccd2da1..49f7c0dc 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -208,13 +208,6 @@ var unescapeTorString = function(str) { return _torControl._strUnescape(str); }; -// Returns true if we should show the tor browser manual. -var show_torbrowser_manual = () => { - let availableLocales = ["de", "en", "es", "fr", "nl", "pt", "tr", "vi", "zh"]; - let shortLocale = getLocale().substring(0, 2); - return availableLocales.includes(shortLocale); -}; - var getFPDFromHost = hostname => { try { return Services.eTLD.getBaseDomainFromHost(hostname); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torbutton] branch main updated: Bug 41366: Remove the article before Tor Browser when not needed
by gitolite role 17 Oct '22

17 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch main in repository torbutton. The following commit(s) were added to refs/heads/main by this push: new 88803b52 Bug 41366: Remove the article before Tor Browser when not needed 88803b52 is described below commit 88803b5271954eb0985f130cc4488ca948ea1c07 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Oct 17 09:48:42 2022 +0200 Bug 41366: Remove the article before Tor Browser when not needed --- chrome/locale/en-US/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/locale/en-US/torlauncher.properties b/chrome/locale/en-US/torlauncher.properties index 2e34c6e1..bc9eb5df 100644 --- a/chrome/locale/en-US/torlauncher.properties +++ b/chrome/locale/en-US/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher 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 be able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +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, Tor Browser will not be 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_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pluggable-transports/snowflake] branch main updated (39df9b3 -> ac85628)
by gitolite role 17 Oct '22

17 Oct '22

This is an automated email from the git hooks/post-receive script. meskio pushed a change to branch main in repository pluggable-transports/snowflake. from 39df9b3 Fix uTLS issue number in ChangeLog. new 10c8173 proxy: Fix ephemeral ports range CLI flag (again) new 21d7449 proxy: Check ephemeral port range ordering at flag parsing new ac85628 Merge remote-tracking branch 'gitlab/mr/107' The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: proxy/lib/snowflake.go | 5 ++++- proxy/main.go | 14 ++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[builders/tor-browser-build] branch main updated: fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos
by gitolite role 17 Oct '22

17 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 823383c fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos 823383c is described below commit 823383cd749307aa49c5625c1f9a0019575a4049 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Oct 14 18:19:58 2022 +0200 fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos Changed remaining URLs in GitLab issue templates. --- .gitlab/issue_templates/Release Prep - Alpha.md | 12 ++++++------ .gitlab/issue_templates/Release Prep - Stable.md | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab/issue_templates/Release Prep - Alpha.md b/.gitlab/issue_templates/Release Prep - Alpha.md index eb9a3f7..1735c6b 100644 --- a/.gitlab/issue_templates/Release Prep - Alpha.md +++ b/.gitlab/issue_templates/Release Prep - Alpha.md @@ -33,7 +33,7 @@ <details> <summary>Desktop</summary> -### **torbutton** : https://git.torproject.org/torbutton.git +### **torbutton** : https://gitlab.torproject.org/tpo/applications/torbutton.git - [ ] Update translations : - [ ] `./import-translations.sh` - **NOTE** : if there are no new strings imported then we are done here @@ -42,7 +42,7 @@ - [ ] ***(Optional)*** Backport to maintenance branch if present and necessary - [ ] fixup! `tor-browser`'s `Bug 10760 : Integrate TorButton to TorBrowser core` issue to point to updated `torbutton` commit -### **tor-launcher** : https://git.torproject.org/tor-launcher.git +### **tor-launcher** : https://gitlab.torproject.org/tpo/applications/tor-launcher.git - [ ] Update translations: - [ ] ./localization/import-translations.sh - **NOTE** : if there are no new strings imported then we are done here @@ -57,11 +57,11 @@ <details> <summary>Android</summary> -### **tba-translation** : https://git.torproject.org/translation.git +### **tba-translation** : https://gitlab.torproject.org/tpo/translation.git - [ ] Fetch latest and identify new `HEAD` of `fenix-torbrowserstringsxml` branch - [ ] `origin/fenix-torbrowserstringsxml` : `<INSERT COMMIT HASH HERE>` -### **tor-android-service** ***(Optional)***: https://git.torproject.org/tor-android-service.git +### **tor-android-service** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/tor-android-service.git - [ ] Fetch latest and identify new `HEAD` of `main` branch - [ ] `origin/main` : `<INSERT COMMIT HASH HERE>` @@ -101,7 +101,7 @@ <details> <summary>Shared</summary> -### tor-browser: https://git.torproject.org/tor-browser.git +### tor-browser: https://gitlab.torproject.org/tpo/applications/tor-browser.git - [ ] ***(Optional)*** Backport any Android-specific security fixes from Firefox rapid-release - [ ] ***(Optional)*** Rebase to `$(ESR_VERSION)` - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-esr102/tags @@ -138,7 +138,7 @@ <details> <summary>Build/Signing/Publishing</summary> -### tor-browser-build: https://git.torproject.org/builders/tor-browser-build.git +### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in the various `$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-maint` (and possibly more specific) branches - [ ] Update `rbm.conf` diff --git a/.gitlab/issue_templates/Release Prep - Stable.md b/.gitlab/issue_templates/Release Prep - Stable.md index a93f472..6c36008 100644 --- a/.gitlab/issue_templates/Release Prep - Stable.md +++ b/.gitlab/issue_templates/Release Prep - Stable.md @@ -39,7 +39,7 @@ <details> <summary>Desktop</summary> -### **torbutton** ***(Optional)***: https://git.torproject.org/torbutton.git +### **torbutton** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/torbutton.git - [ ] ***(Optional)*** Update translations : - **NOTE** We only update strings in stable if a backported feature depends on new strings - [ ] `./import-translations.sh` @@ -48,7 +48,7 @@ - **NOTE** : only add files which are already being tracked - [ ] fixup! `tor-browser`'s `Bug 10760 : Integrate TorButton to TorBrowser core` issue to point to updated `torbutton` commit -### **tor-launcher** ***(Optional)***: https://git.torproject.org/tor-launcher.git +### **tor-launcher** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/tor-launcher.git - [ ] ***(Optional)*** Update translations: - **NOTE** We only update strings in stable if a backported feature depends on new strings - [ ] ./localization/import-translations.sh @@ -59,7 +59,7 @@ - Message `Tagging $(TOR_LAUNCHER_VERSION)` - [ ] Push `main` and tag to origin -### tor-browser: https://git.torproject.org/tor-browser.git +### tor-browser: https://gitlab.torproject.org/tpo/applications/tor-browser.git - [ ] ***(Optional)*** Rebase to `$(ESR_VERSION)` - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-esr91/tags - [ ] `$(ESR_TAG)` : `<INSERT_TAG_HERE>` @@ -93,7 +93,7 @@ <details> <summary>Android</summary> -### **geckoview**: https://git.torproject.org/tor-browser.git +### **geckoview**: https://gitlab.torproject.org/tpo/applications/tor-browser.git - [ ] ***(Optional)*** Rebase to `$(RR_VERSION)` - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-release/tags - [ ] `$(RR_TAG)` : `<INSERT_TAG_HERE>` @@ -123,12 +123,12 @@ - Message : `Tagging $(FIREFOX_BUILD_N) for $(RR_VERSION)-based (alpha|stable)` - [ ] Push tag to `origin` -### **tba-translation** ***(Optional)***: https://git.torproject.org/translation.git +### **tba-translation** ***(Optional)***: https://gitlab.torproject.org/tpo/translation.git - **NOTE** We only update strings in stable if a backported feature depends on new strings - [ ] Fetch latest and identify new `HEAD` of `fenix-torbrowserstringsxml` branch - [ ] `origin/fenix-torbrowserstringsxml` : `<INSERT COMMIT HASH HERE>` -### **tor-android-service** ***(Optional)***: https://git.torproject.org/tor-android-service.git +### **tor-android-service** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/tor-android-service.git - [ ] Fetch latest and identify new `HEAD` of `main` branch - [ ] `origin/main` : `<INSERT COMMIT HASH HERE>` @@ -185,7 +185,7 @@ <details> <summary>Build/Signing/Publishing</summary> -### tor-browser-build: https://git.torproject.org/builders/tor-browser-build.git +### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in the various `$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-maint` (and possibly more specific) branches - [ ] Update `rbm.conf` -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 17400: Enable multi-lingual builds
by gitolite role 17 Oct '22

17 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new a3f4912 Bug 17400: Enable multi-lingual builds a3f4912 is described below commit a3f49129c0c697eb7e951c871b8bfa8dd2e1fe27 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Oct 7 18:16:58 2022 +0200 Bug 17400: Enable multi-lingual builds --- projects/browser/build | 10 ++++++---- projects/browser/config | 2 +- rbm.conf | 2 +- tools/update-responses/update_responses | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/projects/browser/build b/projects/browser/build index 6a7ef9a..2e037d6 100644 --- a/projects/browser/build +++ b/projects/browser/build @@ -223,7 +223,7 @@ tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/" unzip omni.ja defaults/preferences/[% c("var/prefs_file") %] || [ $? -lt 3 ] -# Append our built extension-overrides.js to 000-tor-browser.js +# Append our built extension-overrides.js to the preferences file cat "$GENERATEDPREFSPATH" >> defaults/preferences/[% c("var/prefs_file") %] cp defaults/preferences/[% c("var/prefs_file") %] $rootdir [% IF c("var/osx") %] @@ -235,8 +235,6 @@ cp defaults/preferences/[% c("var/prefs_file") %] $rootdir zip -Xm omni.ja chrome/en-US/locale/browser/bookmarks.html rm -rf chrome [% END %] -# Set the locale of the bundle. -echo "pref(\"intl.locale.requested\", \"en-US\");" >> defaults/preferences/[% c("var/prefs_file") %] [% c("touch") %] defaults/preferences/[% c("var/prefs_file") %] zip -Xm omni.ja defaults/preferences/[% c("var/prefs_file") %] rm -rf defaults @@ -247,7 +245,11 @@ popd [% IF c("var/osx") || c("var/multi_lingual") -%] # Prepare our language packs to embed our default bookmarks. # See bug 21879 for more details. - [% SET locales = c("var/testbuild") ? [] : c("var/locales") -%] + [% IF c("var/multi_lingual") -%] + [% SET locales = c("var/locales") -%] + [% ELSE -%] + [% SET locales = c("var/testbuild") ? [] : c("var/locales") -%] + [% END -%] [% FOREACH lang = locales %] [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; diff --git a/projects/browser/config b/projects/browser/config index 10b7eb9..4ae3e4f 100644 --- a/projects/browser/config +++ b/projects/browser/config @@ -75,7 +75,7 @@ input_files: enable: '[% c("var/tor-browser") %]' - project: firefox-langpacks name: firefox-langpacks - enable: '[% ! c("var/testbuild") && ! c("var/android") %]' + enable: '[% (!c("var/testbuild") || c("var/multi_lingual")) && ! c("var/android") %]' - project: fonts name: fonts enable: '[% ! c("var/android") %]' diff --git a/rbm.conf b/rbm.conf index 97baa32..02c8074 100644 --- a/rbm.conf +++ b/rbm.conf @@ -75,7 +75,7 @@ var: torbrowser_build: 'build1' torbrowser_incremental_from: - 12.0a2 - multi_lingual: 0 + multi_lingual: 1 build_mar: 1 # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 7881205..af81875 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -411,7 +411,7 @@ sub write_htaccess { $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " . "$version-$os-$migrate_langs->{$lang}.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt/ $version-$os-en-US.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt/ $version-$os-ALL.xml $flags\n"; } } write_htdocs($channel, '.htaccess', $htaccess); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0