MB 75: Add Mullvad references where needed

Makefile

@@ -403,133 +403,133 @@ basebrowser-incrementals-nightly: submodule-update
 
 
 ###########################
-# Privacy Browser Targets #
+# Mullvad Browser Targets #
 ###########################
 
-privacybrowser-release: submodule-update
-	$(rbm) build release --target release --target browser-all-desktop --target privacybrowser
+mullvadbrowser-release: submodule-update
+	$(rbm) build release --target release --target browser-all-desktop --target mullvadbrowser
 
-privacybrowser-release-desktop: submodule-update
-	$(rbm) build release --target release --target browser-all-desktop --target privacybrowser
+mullvadbrowser-release-desktop: submodule-update
+	$(rbm) build release --target release --target browser-all-desktop --target mullvadbrowser
 
-privacybrowser-release-linux-x86_64: submodule-update
-	$(rbm) build release --target release --target browser-linux-x86_64 --target privacybrowser
+mullvadbrowser-release-linux-x86_64: submodule-update
+	$(rbm) build release --target release --target browser-linux-x86_64 --target mullvadbrowser
 
-privacybrowser-release-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target release --target browser-linux-x86_64-asan --target privacybrowser
+mullvadbrowser-release-linux-x86_64-asan: submodule-update
+	$(rbm) build release --target release --target browser-linux-x86_64-asan --target mullvadbrowser
 
-privacybrowser-release-windows-x86_64: submodule-update
-	$(rbm) build release --target release --target browser-windows-x86_64 --target privacybrowser
+mullvadbrowser-release-windows-x86_64: submodule-update
+	$(rbm) build release --target release --target browser-windows-x86_64 --target mullvadbrowser
 
-privacybrowser-release-macos: submodule-update
-	$(rbm) build release --target release --target browser-macos --target privacybrowser
+mullvadbrowser-release-macos: submodule-update
+	$(rbm) build release --target release --target browser-macos --target mullvadbrowser
 
-privacybrowser-release-src: submodule-update
-	$(rbm) build release --target release --target browser-src --target privacybrowser
+mullvadbrowser-release-src: submodule-update
+	$(rbm) build release --target release --target browser-src --target mullvadbrowser
 
-privacybrowser-alpha: submodule-update
-	$(rbm) build release --target alpha --target browser-all-desktop --target privacybrowser
+mullvadbrowser-alpha: submodule-update
+	$(rbm) build release --target alpha --target browser-all-desktop --target mullvadbrowser
 
-privacybrowser-alpha-desktop: submodule-update
-	$(rbm) build release --target alpha --target browser-all-desktop --target privacybrowser
+mullvadbrowser-alpha-desktop: submodule-update
+	$(rbm) build release --target alpha --target browser-all-desktop --target mullvadbrowser
 
-privacybrowser-alpha-linux-x86_64: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-x86_64 --target privacybrowser
+mullvadbrowser-alpha-linux-x86_64: submodule-update
+	$(rbm) build release --target alpha --target browser-linux-x86_64 --target mullvadbrowser
 
-privacybrowser-alpha-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target alpha --target browser-linux-x86_64-asan --target privacybrowser
+mullvadbrowser-alpha-linux-x86_64-asan: submodule-update
+	$(rbm) build release --target alpha --target browser-linux-x86_64-asan --target mullvadbrowser
 
-privacybrowser-alpha-windows-x86_64: submodule-update
-	$(rbm) build release --target alpha --target browser-windows-x86_64 --target privacybrowser
+mullvadbrowser-alpha-windows-x86_64: submodule-update
+	$(rbm) build release --target alpha --target browser-windows-x86_64 --target mullvadbrowser
 
-privacybrowser-alpha-macos: submodule-update
-	$(rbm) build release --target alpha --target browser-macos --target privacybrowser
+mullvadbrowser-alpha-macos: submodule-update
+	$(rbm) build release --target alpha --target browser-macos --target mullvadbrowser
 
-privacybrowser-alpha-src: submodule-update
-	$(rbm) build release --target alpha --target browser-src --target privacybrowser
+mullvadbrowser-alpha-src: submodule-update
+	$(rbm) build release --target alpha --target browser-src --target mullvadbrowser
 
-privacybrowser-nightly: submodule-update
-	$(rbm) build release --target nightly --target browser-all-desktop --target privacybrowser
+mullvadbrowser-nightly: submodule-update
+	$(rbm) build release --target nightly --target browser-all-desktop --target mullvadbrowser
 
-privacybrowser-nightly-desktop: submodule-update
-	$(rbm) build release --target nightly --target browser-all-desktop --target privacybrowser
+mullvadbrowser-nightly-desktop: submodule-update
+	$(rbm) build release --target nightly --target browser-all-desktop --target mullvadbrowser
 
-privacybrowser-nightly-linux-x86_64: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-x86_64 --target privacybrowser
+mullvadbrowser-nightly-linux-x86_64: submodule-update
+	$(rbm) build release --target nightly --target browser-linux-x86_64 --target mullvadbrowser
 
-privacybrowser-nightly-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target nightly --target browser-linux-x86_64-asan --target privacybrowser
+mullvadbrowser-nightly-linux-x86_64-asan: submodule-update
+	$(rbm) build release --target nightly --target browser-linux-x86_64-asan --target mullvadbrowser
 
-privacybrowser-nightly-windows-x86_64: submodule-update
-	$(rbm) build release --target nightly --target browser-windows-x86_64 --target privacybrowser
+mullvadbrowser-nightly-windows-x86_64: submodule-update
+	$(rbm) build release --target nightly --target browser-windows-x86_64 --target mullvadbrowser
 
-privacybrowser-nightly-macos: submodule-update
-	$(rbm) build release --target nightly --target browser-macos --target privacybrowser
+mullvadbrowser-nightly-macos: submodule-update
+	$(rbm) build release --target nightly --target browser-macos --target mullvadbrowser
 
-privacybrowser-nightly-src: submodule-update
-	$(rbm) build release --target nightly --target browser-src --target privacybrowser
+mullvadbrowser-nightly-src: submodule-update
+	$(rbm) build release --target nightly --target browser-src --target mullvadbrowser
 
-privacybrowser-testbuild: submodule-update
-	$(rbm) build release --target testbuild --target browser-all-desktop --target privacybrowser
+mullvadbrowser-testbuild: submodule-update
+	$(rbm) build release --target testbuild --target browser-all-desktop --target mullvadbrowser
 
-privacybrowser-testbuild-desktop: submodule-update
-	$(rbm) build release --target testbuild --target browser-all-desktop --target privacybrowser
+mullvadbrowser-testbuild-desktop: submodule-update
+	$(rbm) build release --target testbuild --target browser-all-desktop --target mullvadbrowser
 
-privacybrowser-testbuild-linux-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-x86_64 --target privacybrowser
+mullvadbrowser-testbuild-linux-x86_64: submodule-update
+	$(rbm) build release --target testbuild --target browser-linux-x86_64 --target mullvadbrowser
 
-privacybrowser-testbuild-linux-x86_64-asan: submodule-update
-	$(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target privacybrowser
+mullvadbrowser-testbuild-linux-x86_64-asan: submodule-update
+	$(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target mullvadbrowser
 
-privacybrowser-testbuild-windows-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-windows-x86_64 --target privacybrowser
+mullvadbrowser-testbuild-windows-x86_64: submodule-update
+	$(rbm) build release --target testbuild --target browser-windows-x86_64 --target mullvadbrowser
 
-privacybrowser-testbuild-macos: submodule-update
-	$(rbm) build release --target testbuild --target browser-macos --target privacybrowser
+mullvadbrowser-testbuild-macos: submodule-update
+	$(rbm) build release --target testbuild --target browser-macos --target mullvadbrowser
 
-privacybrowser-testbuild-macos-x86_64: submodule-update
-	$(rbm) build release --target testbuild --target browser-macos-x86_64 --target privacybrowser
+mullvadbrowser-testbuild-macos-x86_64: submodule-update
+	$(rbm) build release --target testbuild --target browser-macos-x86_64 --target mullvadbrowser
 
-privacybrowser-testbuild-macos-aarch64: submodule-update
-	$(rbm) build release --target testbuild --target browser-macos-aarch64 --target privacybrowser
+mullvadbrowser-testbuild-macos-aarch64: submodule-update
+	$(rbm) build release --target testbuild --target browser-macos-aarch64 --target mullvadbrowser
 
-privacybrowser-testbuild-src: submodule-update
-	$(rbm) build release --target testbuild --target browser-src-testbuild --target privacybrowser
+mullvadbrowser-testbuild-src: submodule-update
+	$(rbm) build release --target testbuild --target browser-src-testbuild --target mullvadbrowser
 
-privacybrowser-incrementals-release: submodule-update
-	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target privacybrowser
+mullvadbrowser-incrementals-release: submodule-update
+	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target mullvadbrowser
 	tools/update-responses/download_missing_versions release
 	tools/update-responses/gen_incrementals release
-	$(rbm) build release --step hash_incrementals --target release --target privacybrowser
+	$(rbm) build release --step hash_incrementals --target release --target mullvadbrowser
 
-privacybrowser-incrementals-alpha: submodule-update
-	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target privacybrowser
+mullvadbrowser-incrementals-alpha: submodule-update
+	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target mullvadbrowser
 	tools/update-responses/download_missing_versions alpha
 	tools/update-responses/gen_incrementals alpha
-	$(rbm) build release --step hash_incrementals --target alpha --target privacybrowser
+	$(rbm) build release --step hash_incrementals --target alpha --target mullvadbrowser
 
-privacybrowser-incrementals-nightly: submodule-update
-	$(rbm) build release --step update_responses_config --target nightly --target privacybrowser
+mullvadbrowser-incrementals-nightly: submodule-update
+	$(rbm) build release --step update_responses_config --target nightly --target mullvadbrowser
 	NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly
-	$(rbm) build release --step hash_incrementals --target nightly --target privacybrowser
+	$(rbm) build release --step hash_incrementals --target nightly --target mullvadbrowser
 
-privacybrowser-update_responses-release: submodule-update
-	$(rbm) build release --step update_responses_config --target release --target signed --target privacybrowser
-	$(rbm) build release --step create_update_responses_tar --target release --target signed --target privacybrowser
+mullvadbrowser-update_responses-release: submodule-update
+	$(rbm) build release --step update_responses_config --target release --target signed --target mullvadbrowser
+	$(rbm) build release --step create_update_responses_tar --target release --target signed --target mullvadbrowser
 
-privacybrowser-update_responses-alpha: submodule-update
-	$(rbm) build release --step update_responses_config --target alpha --target signed --target privacybrowser
-	$(rbm) build release --step create_update_responses_tar --target alpha --target signed --target privacybrowser
+mullvadbrowser-update_responses-alpha: submodule-update
+	$(rbm) build release --step update_responses_config --target alpha --target signed --target mullvadbrowser
+	$(rbm) build release --step create_update_responses_tar --target alpha --target signed --target mullvadbrowser
 
-privacybrowser-dmg2mar-release: submodule-update
-	$(rbm) build release --step update_responses_config --target release --target signed --target privacybrowser
-	$(rbm) build release --step dmg2mar --target release --target signed --target privacybrowser
+mullvadbrowser-dmg2mar-release: submodule-update
+	$(rbm) build release --step update_responses_config --target release --target signed --target mullvadbrowser
+	$(rbm) build release --step dmg2mar --target release --target signed --target mullvadbrowser
 	tools/update-responses/download_missing_versions release
 	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
 
-privacybrowser-dmg2mar-alpha: submodule-update
-	$(rbm) build release --step update_responses_config --target alpha --target signed --target privacybrowser
-	$(rbm) build release --step dmg2mar --target alpha --target signed --target privacybrowser
+mullvadbrowser-dmg2mar-alpha: submodule-update
+	$(rbm) build release --step update_responses_config --target alpha --target signed --target mullvadbrowser
+	$(rbm) build release --step dmg2mar --target alpha --target signed --target mullvadbrowser
 	tools/update-responses/download_missing_versions alpha
 	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
 

projects/browser/build

@@ -49,8 +49,8 @@ touch "$GENERATEDPREFSPATH"
     PROFILEPATH=[% c('var/ProjectName') %]/Data/Browser/profile.default/extensions
     mkdir -p "$TBDIR/$PROFILEPATH"
   [% END -%]
-  [% IF !c("var/privacy-browser") -%]
-    # For Privacy Browser, we keep the data directory at the same level of
+  [% IF !c("var/mullvad-browser") -%]
+    # For Mullvad Browser, we keep the data directory at the same level of
     # Browser, instead of creating a Data directory with the program files.
     mkdir -p "$TBDIR/[% c('var/ProjectName') %]/Data/Browser/Caches"
   [% END -%]
@@ -68,7 +68,7 @@ done
 [% END -%]
 
 mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-[% IF c("var/privacy-browser") -%]
+[% IF c("var/mullvad-browser") -%]
   mv [% c('input_files_by_name/ublock-origin') %] "$TBDIR/$EXTSPATH/uBlock0@raymondhill.net.xpi"
   mv [% c('input_files_by_name/mullvad-extension') %] "$TBDIR/$EXTSPATH/{d19a89b9-76c1-4a61-bcd4-49e8de916403}.xpi"
 [% END -%]
@@ -231,7 +231,7 @@ do
     tar -C Bundle-Data/[% bundledata_osname %] \
       [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] \
       -c . | tar -C "$tbdir[% IF ! c("var/macos") %]/[% c('var/ProjectName') %][% END %]" -x
-  [% ELSIF c("var/privacy-browser") -%]
+  [% ELSIF c("var/mullvad-browser") -%]
     cp -a Bundle-Data/Docs-PB/* "$tbdir/$DOCSPATH"
   [% END -%]
 done
@@ -293,7 +293,7 @@ done
   cat > $distdir/windows-installer/browser-portable.nsi << 'BROWSER_NSI'
 [% INCLUDE 'windows-installer.nsi' %]
 BROWSER_NSI
-  [% IF c('var/privacy-browser') -%]
+  [% IF c('var/mullvad-browser') -%]
     cat > $distdir/windows-installer/browser-system.nsi << 'BROWSER_NSI'
 [% INCLUDE 'windows-installer.nsi' system_install_mode = 1 %]
 BROWSER_NSI
@@ -371,7 +371,7 @@ cd $distdir
   # Working around NSIS braindamage
   python3 $rootdir/pe_checksum_fix.py browser-install.exe
   mv browser-install.exe $OUTDIR/[% c("var/projectname") %]-install[% IF c("var/windows-x86_64") %]-win64[% END %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.exe
-  [% IF c('var/privacy-browser') -%]
+  [% IF c('var/mullvad-browser') -%]
     makensis browser-system.nsi
     python3 $rootdir/pe_checksum_fix.py browser-install.exe
     mv browser-install.exe $OUTDIR/[% c("var/projectname") %]-systeminstall[% IF c("var/windows-x86_64") %]-win64[% END %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.exe

projects/browser/config

@@ -67,7 +67,7 @@ targets:
   basebrowser:
     var:
       prefs_file: 001-base-profile.js
-  privacybrowser:
+  mullvadbrowser:
     var:
       prefs_file: 001-base-profile.js
 
@@ -109,11 +109,11 @@ input_files:
   - URL: https://addons.mozilla.org/firefox/downloads/file/4047353/ublock_origin-1.46.0.xpi
     name: ublock-origin
     sha256sum: 6bf8af5266353fab5eabdc7476de026e01edfb7901b0430c5e539f6791f1edc8
-    enable: '[% c("var/privacy-browser") %]'
+    enable: '[% c("var/mullvad-browser") %]'
   - URL: https://github.com/mullvad/browser-extension/releases/download/v0.7.0-firefox-beta/mullvad-browser-extension-0.7.1.xpi
     name: mullvad-extension
     sha256sum: 56677556ee5e4c61fb56274be9c2b79453b42582b0f8d1b5a182bc9aa5d58e77
-    enable: '[% c("var/privacy-browser") %]'
+    enable: '[% c("var/mullvad-browser") %]'
   - filename: 'gtk3-settings.ini'
     enable: '[% c("var/linux") %]'
   - project: hfsplus-tools

projects/browser/windows-installer.nsi

-;NSIS Installer for Tor/Base/Privacy Browser
+;NSIS Installer for Tor/Base/Mullvad Browser
 ;Written by Moritz Bartl
 ;released under Public Domain
 
@@ -13,7 +13,7 @@
 ;--------------------------------
 ;General
 
-  ;Location of Tor/Base/Privacy Browser to put into installer
+  ;Location of Tor/Base/Mullvad Browser to put into installer
   !define PROGRAM_SOURCE ".\[% c('var/Project_Name') %]\"
 
   Name "[% c('var/Project_Name') %]"

projects/firefox/build

@@ -200,7 +200,7 @@ export LANG=C.UTF-8
     '[% c("var/Project_Name") %]' \
     '[% c("var/torbrowser_version") %]' \
     '[% c("var/copyright_year") %]' \
-    [% IF c("var/privacy-browser") -%]'Mullvad, Tor Browser and Mozilla Developers'[% ELSE -%]'The Tor Project'[% END %]
+    [% IF c("var/mullvad-browser") -%]'Mullvad, Tor Browser and Mozilla Developers'[% ELSE -%]'The Tor Project'[% END %]
 [% END %]
 
 [% IF c("var/linux") %]

projects/firefox/config

@@ -75,10 +75,10 @@ targets:
     git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]'
     tag_gpg_id: 0
 
-  privacybrowser:
+  mullvadbrowser:
     git_url: git@gitlab.torproject.org:tpo/applications/privacy-browser.git
     var:
-      branding_directory_prefix: 'pb'
+      branding_directory_prefix: 'mb'
       browser_branch: '12.0-1'
       gitlab_project: https://gitlab.torproject.org/tpo/applications/privacy-browser
 

projects/release/config

@@ -53,10 +53,10 @@ targets:
       asan-build: '-asan'
   browser-linux-i686:
     var:
-      browser-linux-i686: '[% c("var/browser_type") != "privacybrowser" %]'
+      browser-linux-i686: '[% c("var/browser_type") != "mullvadbrowser" %]'
   browser-windows-i686:
     var:
-      browser-windows-i686: '[% c("var/browser_type") != "privacybrowser" %]'
+      browser-windows-i686: '[% c("var/browser_type") != "mullvadbrowser" %]'
   browser-windows-x86_64:
     var:
       browser-windows-x86_64: 1
@@ -93,9 +93,9 @@ targets:
   basebrowser:
     var:
       browser_type: basebrowser
-  privacybrowser:
+  mullvadbrowser:
     var:
-      browser_type: privacybrowser
+      browser_type: mullvadbrowser
 
   release:
     var:

rbm.conf

@@ -242,14 +242,14 @@ targets:
       ProjectName: BaseBrowser
       updater_enabled: '[% c("var/nightly") %]'
 
-  privacybrowser:
+  mullvadbrowser:
     var:
-      privacy-browser: 1
-      project-name: privacy-browser
-      projectname: privacybrowser
-      Project_Name: 'Privacy Browser'
-      ProjectName: PrivacyBrowser
-      exe_name: privacybrowser
+      mullvad-browser: 1
+      project-name: mullvad-browser
+      projectname: mullvadbrowser
+      Project_Name: 'Mullvad Browser'
+      ProjectName: MullvadBrowser
+      exe_name: mullvadbrowser
       updater_enabled: 0
       locales: []
 
@@ -261,10 +261,10 @@ targets:
     - testbuild
     - alpha
     - basebrowser
-  privacybrowser-testbuild:
+  mullvadbrowser-testbuild:
     - testbuild
     - alpha
-    - privacybrowser
+    - mullvadbrowser
   testbuild:
     var:
       testbuild: 1
@@ -390,10 +390,10 @@ targets:
     - linux-x86_64
     - linux
     - basebrowser
-  privacybrowser-linux-x86_64:
+  mullvadbrowser-linux-x86_64:
     - linux-x86_64
     - linux
-    - privacybrowser
+    - mullvadbrowser
   torbrowser-linux-x86_64-asan:
     - linux-asan
     - linux-x86_64
@@ -404,11 +404,11 @@ targets:
     - linux-x86_64
     - linux
     - basebrowser
-  privacybrowser-linux-x86_64-asan:
+  mullvadbrowser-linux-x86_64-asan:
     - linux-asan
     - linux-x86_64
     - linux
-    - privacybrowser
+    - mullvadbrowser
   torbrowser-linux-i686:
     - linux-i686
     - linux
@@ -505,10 +505,10 @@ targets:
     - windows-x86_64
     - windows
     - basebrowser
-  privacybrowser-windows-x86_64:
+  mullvadbrowser-windows-x86_64:
     - windows-x86_64
     - windows
-    - privacybrowser
+    - mullvadbrowser
   windows-x86_64:
     arch: x86_64
     var:
@@ -572,19 +572,19 @@ targets:
     - macos-aarch64
     - macos
     - basebrowser
-  privacybrowser-macos:
+  mullvadbrowser-macos:
     - macos-universal
     - macos-x86_64
     - macos
-    - privacybrowser
-  privacybrowser-macos-x86_64:
+    - mullvadbrowser
+  mullvadbrowser-macos-x86_64:
     - macos-x86_64
     - macos
-    - privacybrowser
-  privacybrowser-macos-aarch64:
+    - mullvadbrowser
+  mullvadbrowser-macos-aarch64:
     - macos-aarch64
     - macos
-    - privacybrowser
+    - mullvadbrowser
   macos-universal:
     var:
       macos_universal: 1