Merge remote-tracking branch 'origin/testing' into feature/tor-browser-4.0

auto/config

@@ -35,7 +35,7 @@ $RUN_LB_CONFIG \
    --memtest none \
    --packages-lists="standard" \
    --tasks="standard" \
-   --linux-packages="linux-image-3.16-2" \
+   --linux-packages="linux-image-3.16-3" \
    --syslinux-menu vesamenu \
    --syslinux-splash data/splash.png \
    --syslinux-timeout 4 \

config/chroot_apt/preferences

@@ -126,19 +126,19 @@ Package: linux-headers-amd64
 Pin: release o=Debian,a=unstable
 Pin-Priority: 999
 
-Package: linux-headers-3.16-2-common
+Package: linux-headers-3.16-3-common
 Pin: release o=Debian,a=unstable
 Pin-Priority: 999
 
-Package: linux-headers-3.16-2-486
+Package: linux-headers-3.16-3-486
 Pin: release o=Debian,a=unstable
 Pin-Priority: 999
 
-Package: linux-headers-3.16-2-686-pae
+Package: linux-headers-3.16-3-686-pae
 Pin: release o=Debian,a=unstable
 Pin-Priority: 999
 
-Package: linux-headers-3.16-2-amd64
+Package: linux-headers-3.16-3-amd64
 Pin: release o=Debian,a=unstable
 Pin-Priority: 999
 
@@ -154,15 +154,15 @@ Package: linux-image-amd64
 Pin: release o=Debian,a=unstable
 Pin-Priority: 999
 
-Package: linux-image-3.16-2-486
+Package: linux-image-3.16-3-486
 Pin: release o=Debian,a=unstable
 Pin-Priority: 999
 
-Package: linux-image-3.16-2-686-pae
+Package: linux-image-3.16-3-686-pae
 Pin: release o=Debian,a=unstable
 Pin-Priority: 999
 
-Package: linux-image-3.16-2-amd64
+Package: linux-image-3.16-3-amd64
 Pin: release o=Debian,a=unstable
 Pin-Priority: 999
 
@@ -218,11 +218,6 @@ Package: xul-ext-noscript
 Pin: release o=Debian Backports,n=wheezy-backports
 Pin-Priority: 999
 
-Explanation: Block installation of iceweasel until it has been removed from our APT repo
-Package: iceweasel
-Pin: origin deb.tails.boum.org
-Pin-Priority: -1
-
 Explanation: weirdness in chroot_apt install-binary
 Package: *
 Pin: release o=chroot_local-packages

config/chroot_local-hooks/10-tbb

@@ -145,7 +145,8 @@ EOF
 install_debian_extensions() {
     local destination
     destination="${1}"
-    apt-get install --yes xul-ext-adblock-plus xul-ext-torbutton
+    shift
+    apt-get install --yes "${@}"
     ln -s /usr/share/xul-ext/adblock-plus/ \
           "${destination}"/'{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}'
     ln -s /usr/share/xul-ext/torbutton/ \
@@ -170,43 +171,24 @@ create_default_profile() {
     done
 }
 
-# Get the below with `grep "tor-browser-linux32-.*\.tar.xz" sha256sums.txt`
-BUNDLES="$(cat <<EOF
-d43236d3a8b6d9ce17bdc490c5349da7726800113872835e20961609f6cfb0ca  tor-browser-linux32-4.0_ar.tar.xz
-b1007109555d79fc0b959343bd204b9f19c22e11b42c760a8a4adc7ee0a5cc88  tor-browser-linux32-4.0_de.tar.xz
-2511830a5eea5136e90dc14e309f036d5890d728a0ed3dbb557eeee4d733359c  tor-browser-linux32-4.0_en-US.tar.xz
-7e48ab4d0360ace4e481fb145cf7e11da0fe43cf5518e1285d60390cd777e1aa  tor-browser-linux32-4.0_es-ES.tar.xz
-560e81777b097a53918d861b5e3864bfcd6641e4be87044b1c9f227266ed9800  tor-browser-linux32-4.0_fa.tar.xz
-c28fbad043b66a6fe5d76111232c6bce3a0334f6401c52f152d4941029ac27c5  tor-browser-linux32-4.0_fr.tar.xz
-73906106a501a3e9be43d048cd4daaf8146ef9702272661fe40fdaa6378d8ec1  tor-browser-linux32-4.0_it.tar.xz
-5497c51bc47d73f047f4b84ff163462134a52e0a3fb511f968df44f3aa65a187  tor-browser-linux32-4.0_ko.tar.xz
-c11b8d3b5b8d2488e15c524e85993fbad2261b53a7a16aeee722a0fadeffe28c  tor-browser-linux32-4.0_nl.tar.xz
-cad5625b18785a11ee49432e858e776a1b1f02d8c0eda9d2e79358fc1d7793a0  tor-browser-linux32-4.0_pl.tar.xz
-29f51b4fb9d51ccab2668f2d84e88850e3458c41400369d4da45410af11b981e  tor-browser-linux32-4.0_pt-PT.tar.xz
-4d23c36fce0f56d4316469ba33c2fa079e7cf2eea6e67c4c8a5b271b72e3ce6d  tor-browser-linux32-4.0_ru.tar.xz
-463e38b98c93473142d79d65626cc53584c27e77ea799ad2d0702b25d5495093  tor-browser-linux32-4.0_tr.tar.xz
-66a00595224dbf2fba1925bcb60e0fb7ae1a6915cb112d903e5f861b68d019f4  tor-browser-linux32-4.0_vi.tar.xz
-720e680d42ea939ce2551dbd43559c6960097ae6de45de507da151403dfa5ac9  tor-browser-linux32-4.0_zh-CN.tar.xz
-EOF
-)"
+TBB_SHA256SUMS_FILE=/usr/share/tails/tbb-sha256sums.txt
+TBB_TARBALLS="$(grep "\<tor-browser-linux32-.*\.tar.xz$" "${TBB_SHA256SUMS_FILE}")"
 
 # We'll use the en-US bundle as our basis; only langpacks will be
 # installed from the other bundles.
-MAIN_BUNDLE="$(echo "${BUNDLES}" | grep -o "tor-browser-linux32-.*_en-US.tar.xz")"
-VERSION="$(echo "${MAIN_BUNDLE}" | sed 's/tor-browser-linux32-\(.*\)_en-US.tar.xz/\1/')"
-# Note that we cannot use https here since apt-cacher-ng (used by vagrant)
-# gets confused and throws a 403. It doesn't matter, though, since we verify
-# the checksums of each file downloaded.
-#TBB_DIST_URL="http://archive.torproject.org/tor-package-archive/torbrowser/${VERSION}"
-#TBB_DIST_URL="http://www.torproject.org/dist/torbrowser/${VERSION}/"
-TBB_DIST_URL="http://people.torproject.org/~mikeperry/builds/${VERSION}/"
-#TBB_DIST_URL="http://people.torproject.org/~gk/testbuilds/${VERSION}"
-#TBB_DIST_URL="http://people.torproject.org/~linus/builds/${VERSION}"
+MAIN_TARBALL="$(echo "${TBB_TARBALLS}" | grep -o "tor-browser-linux32-.*_en-US.tar.xz")"
+VERSION="$(echo "${MAIN_TARBALL}" | sed 's/tor-browser-linux32-\(.*\)_en-US.tar.xz/\1/')"
+TBB_DIST_URL_FILE=/usr/share/tails/tbb-dist-url.txt
+TBB_TARBALLS_BASE_URL="$(cat "${TBB_DIST_URL_FILE}")/${VERSION}"
+
+# The Debian Iceweasel extensions we want to install and make
+# available in the Tor Browser.
+DEBIAN_EXT_PKGS="xul-ext-adblock-plus xul-ext-torbutton"
 
 TMP="$(mktemp -d)"
-download_and_verify_files "${TBB_DIST_URL}" "${BUNDLES}" "${TMP}"
+download_and_verify_files "${TBB_TARBALLS_BASE_URL}" "${TBB_TARBALLS}" "${TMP}"
 
-install_tor_browser "${TMP}/${MAIN_BUNDLE}" "${TBB_INSTALL}"
+install_tor_browser "${TMP}/${MAIN_TARBALL}" "${TBB_INSTALL}"
 
 mkdir -p "${TBB_EXT}"
 install_langpacks_from_bundles "${TMP}" "${TBB_EXT}"
@@ -223,7 +205,7 @@ rmdir "${TBB_INSTALL}"/TorBrowser/Data/Browser/profile.default/extensions
 FIREFOX_VERSION=$(get_firefox_version "${TBB_INSTALL}"/application.ini)
 FAKE_ICEWEASEL_VERSION=${FIREFOX_VERSION}+fake1
 install_fake_iceweasel_pkg "${FAKE_ICEWEASEL_VERSION}"
-install_debian_extensions "${TBB_EXT}"
+install_debian_extensions "${TBB_EXT}" ${DEBIAN_EXT_PKGS}
 
 mkdir -p "${TBB_PROFILE}"
 create_default_profile "${TBB_INSTALL}"/TorBrowser/Data/Browser/profile.default "${TBB_EXT}" "${TBB_PROFILE}"

config/chroot_local-hooks/12-install_browser_searchplugins

+#!/bin/sh
+
+set -e
+
+echo "Install extra browser search plugins"
+
+# Import the TBB_EXT variable
+. /usr/local/lib/tails-shell-library/tor-browser.sh
+
+LOCALIZED_PLUGINS_DIR=/usr/share/amnesia/browser/searchplugins/locale
+
+for langpack in "${TBB_EXT}"/langpack-*@firefox.mozilla.org.xpi; do
+    locale="$(basename "${langpack}" | sed 's,^langpack-\([^@]\+\)@.*$,\1,')"
+    pkg=iceweasel-l10n-"$(echo ${locale} | tr 'A-Z' 'a-z')"
+    tmp="$(mktemp -d)"
+    cd "${tmp}"
+    apt-get download "${pkg}"
+    ar x "${pkg}"*.deb
+    path_to_searchplugins=etc/iceweasel/searchplugins/locale/"${locale}"
+    tar xf data.tar.* --wildcards ./"${path_to_searchplugins}"/wikipedia-'*'.xml
+    mkdir -p "${LOCALIZED_PLUGINS_DIR}"/"${locale}"
+    cp "${path_to_searchplugins}"/* "${LOCALIZED_PLUGINS_DIR}"/"${locale}"
+    cd /
+    rm -r "${tmp}"
+done

config/chroot_local-hooks/98-remove_unwanted_files

@@ -13,3 +13,7 @@ find /usr/share/doc -type f -name NEWS.Debian.gz      -delete
 
 # Remove .in files managed by intltool
 rm $POTFILES_DOT_IN
+
+# These files are not needed after the Tor Browser has been installed
+# (by the 10-tbb hook)
+rm /usr/share/tails/tbb-*.txt

config/chroot_local-includes/etc/tor-browser/profile/preferences/0000locale.js

-/var/lib/tails-user-session/browser-locale.js
\ No newline at end of file

config/chroot_local-includes/usr/bin/tor-launcher

@@ -2,7 +2,7 @@
 
 set -e
 
-# Import exec_firefox()
+# Import exec_firefox() and configure_best_tor_launcher_locale()
 . /usr/local/lib/tails-shell-library/tor-browser.sh
 
 # The Tor Browser hardcodes the default profile dir to ../.. from the
@@ -24,7 +24,7 @@ IsRelative=1
 Path=profile.default
 EOF
     mkdir -p "${HOME}"/.tor-launcher/TorBrowser/Data/Browser/profile.default/preferences
-    ln -s /var/lib/tails-user-session/tor-launcher-locale.js \
-          "${HOME}"/.tor-launcher/TorBrowser/Data/Browser/profile.default/preferences/0000locale.js
+    configure_best_tor_launcher_locale "${HOME}"/.tor-launcher/TorBrowser/Data/Browser/profile.default
 fi
+
 exec_firefox -app "${HOME}"/.tor-launcher/tor-launcher-standalone/application.ini

config/chroot_local-includes/usr/local/bin/tor-browser

@@ -11,7 +11,7 @@ export TEXTDOMAIN
 
 PROFILE="${HOME}/.tor-browser/profile.default"
 
-# Import exec_firefox()
+# Import exec_firefox() and configure_best_tor_browser_locale()
 . /usr/local/lib/tails-shell-library/tor-browser.sh
 
 ask_for_confirmation() {
@@ -30,12 +30,34 @@ tor_has_bootstrapped() {
     sudo -n -u debian-tor /usr/local/sbin/tor-has-bootstrapped
 }
 
+# Workaround bug #8036 by copying any localized search plugins into
+# the profile.
+enable_localized_searchplugins() {
+    local locale plugin
+    locale=$(cat "${PROFILE}"/preferences/0000locale.js | \
+                 sed 's@^pref("general\.useragent\.locale", "\([^"]*\)");$@\1@')
+    if [ "${locale}" = en-US ] || [ -e "${PROFILE}"/searchplugins ]; then
+        return
+    fi
+    # Fallback to a similar locale if there is no exact match
+    plugin="$(ls -1 "${TBB_INSTALL}"/distribution/searchplugins/locale/ | grep -m1 "^${locale}\(-[A-Z]\+\)\?$" || true)"
+    if [ -n "${plugin}" ]; then
+        mkdir -p "${PROFILE}"/searchplugins
+        # The plugins do not load if they are symlinks
+        cp --dereference "${TBB_INSTALL}"/distribution/searchplugins/locale/"${plugin}"/*  "${PROFILE}"/searchplugins
+    fi
+}
 
 start_browser() {
     if [ ! -d "${PROFILE}" ]; then
         /usr/local/bin/generate-tor-browser-profile
     fi
 
+    configure_best_tor_browser_locale "${PROFILE}"
+
+    # Workaround bug #8036
+    enable_localized_searchplugins
+
     if [ -z "$XAUTHORITY" ]; then
         XAUTHORITY=~/.Xauthority
         export XAUTHORITY

config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh

@@ -3,9 +3,57 @@
 TBB_INSTALL=/usr/local/lib/tor-browser
 TBB_PROFILE=/etc/tor-browser/profile
 TBB_EXT=/usr/local/share/tor-browser-extensions
+TOR_LAUNCHER_LOCALES_DIR=/usr/share/tor-launcher-standalone/chrome/locale
 
 exec_firefox() {
     LD_LIBRARY_PATH="${TBB_INSTALL}"
     export LD_LIBRARY_PATH
     exec "${TBB_INSTALL}"/firefox "${@}"
 }
+
+guess_best_tor_browser_locale() {
+    local long_locale short_locale
+    long_locale="$(echo ${LANG} | sed -e 's/\..*$//' -e 's/_/-/')"
+    short_locale="$(echo ${long_locale} | cut -d"-" -f1)"
+    if [ -e "${TBB_EXT}/langpack-${long_locale}@firefox.mozilla.org.xpi" ]; then
+        echo ${long_locale}
+    elif ls -1 "${TBB_EXT}" | grep -q "^langpack-${short_locale}\(-[A-Z]\+\)\?@firefox.mozilla.org.xpi$"; then
+        # If we use locale xx-YY and there is no langpack for xx nor
+        # xx-YY but there is one for xx-ZZ, then Firefox is smart
+        # enough to use the xx-ZZ langpack if we set the locale to xx.
+        echo ${short_locale}
+    else
+        echo en-US
+    fi
+}
+
+guess_best_tor_launcher_locale() {
+    local long_locale short_locale
+    long_locale="$(echo ${LANG} | sed -e 's/\..*$//' -e 's/_/-/')"
+    short_locale="$(echo ${long_locale} | cut -d"-" -f1)"
+    if [ -e "${TOR_LAUNCHER_LOCALES_DIR}/${long_locale}" ]; then
+        echo ${long_locale}
+    elif ls -1 "${TOR_LAUNCHER_LOCALES_DIR}" | grep -q "^${short_locale}\(-[A-Z]\+\)\?$"; then
+        # See comment in guess_best_firefox_locale()
+        echo ${short_locale}
+    else
+        echo en-US
+    fi
+}
+
+configure_xulrunner_app_locale() {
+    local profile locale
+    profile="${1}"
+    locale="${2}"
+    mkdir -p "${profile}"/preferences
+    echo "pref(\"general.useragent.locale\", \"${locale}\");" > \
+        "${profile}"/preferences/0000locale.js
+}
+
+configure_best_tor_browser_locale() {
+    configure_xulrunner_app_locale "${1}" "$(guess_best_tor_browser_locale)"
+}
+
+configure_best_tor_launcher_locale() {
+    configure_xulrunner_app_locale "${1}" "$(guess_best_tor_launcher_locale)"
+}

config/chroot_local-includes/usr/local/sbin/i2p-browser

@@ -22,7 +22,9 @@ BROWSER_USER=i2pbrowser
 TBB_PREFS="/etc/tor-browser/profile/preferences"
 START_PAGE="http://127.0.0.1:7657"
 
-# Import the TBB_INSTALL, TBB_EXT and TBB_PROFILE variables
+# Import the TBB_INSTALL, TBB_EXT and TBB_PROFILE variables, and
+# exec_firefox(), configure_xulrunner_app_locale() and
+# guess_best_tor_browser_locale()
 . /usr/local/lib/tails-shell-library/tor-browser.sh
 
 NOSCRIPT="${TBB_EXT}/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
@@ -109,18 +111,13 @@ setup_chroot () {
 
 set_chroot_browser_name () {
     NAME="${1}"
-    LONG=$(echo ${LANG} | grep -o "^[a-zA-Z_]*")
-    SHORT=${LONG%%_*}
-    EXT_DIR="${CHROOT}/${TBB_EXT}"
+    LOCALE="${2}"
+    EXT_DIR=${CHROOT}/"${TBB_EXT}"
     BRANDING=branding/brand.dtd
-    if [ -e "${EXT_DIR}/langpack-${LONG}@firefox.mozilla.org.xpi" ]; then
-        PACK="${EXT_DIR}/langpack-${LONG}@firefox.mozilla.org.xpi"
+    if [ "${LOCALE}" != en-US ]; then
+        PACK="${EXT_DIR}/langpack-${LOCALE}@firefox.mozilla.org.xpi"
         TOP=browser/chrome
-        REST=${LONG}/locale
-    elif [ -e "${EXT_DIR}/langpack-${SHORT}@firefox.mozilla.org.xpi" ]; then
-        PACK="${EXT_DIR}/langpack-${SHORT}@firefox.mozilla.org.xpi"
-        TOP=browser/chrome
-        REST=${SHORT}/locale
+        REST=${LOCALE}/locale
     else
         PACK="${CHROOT}/${TBB_INSTALL}/browser/omni.ja"
         TOP=chrome
@@ -174,8 +171,8 @@ configure_chroot () {
                     ${BROWSER_PREF_DIR}/extension-overrides.js
 
     # Localization
-    cat /var/lib/tails-user-session/browser-locale.js >> "${BROWSER_PREFS}"
-
+    BEST_LOCALE="$(guess_best_tor_browser_locale)"
+    configure_xulrunner_app_locale "${BROWSER_PROFILE}" "${BEST_LOCALE}"
 
     # Prevent File -> Print or CTRL+P from causing the browser to hang
     # for several minutes while trying to communicate with CUPS, since
@@ -184,7 +181,7 @@ configure_chroot () {
         ${BROWSER_PREFS}
 
     # Set the name (e.g. window title) of the browser
-    set_chroot_browser_name "`gettext \"I2P Browser\"`"
+    set_chroot_browser_name "`gettext \"I2P Browser\"`" "${BEST_LOCALE}"
 
     # Set start page to the router console
     echo 'user_pref("browser.startup.homepage", "'${START_PAGE}'");' >> \

config/chroot_local-includes/usr/local/sbin/unsafe-browser

@@ -18,7 +18,9 @@ CLEARNET_USER=clearnet
 # Import tor_is_working()
 . /usr/local/lib/tails-shell-library/tor.sh
 
-# Import the TBB_INSTALL, TBB_EXT and TBB_PROFILE variables
+# Import the TBB_INSTALL, TBB_EXT and TBB_PROFILE variables, and
+# exec_firefox(), configure_xulrunner_app_locale() and
+# guess_best_tor_browser_locale()
 . /usr/local/lib/tails-shell-library/tor-browser.sh
 
 WARNING_PAGE='/usr/share/doc/tails/website/misc/unsafe_browser_warning'
@@ -109,18 +111,13 @@ setup_chroot () {
 
 set_chroot_browser_name () {
     NAME="${1}"
-    LONG=$(echo ${LANG} | grep -o "^[a-zA-Z_]*")
-    SHORT=${LONG%%_*}
+    LOCALE="${2}"
     EXT_DIR=${CHROOT}/"${TBB_EXT}"
     BRANDING=branding/brand.dtd
-    if [ -e "${EXT_DIR}/langpack-${LONG}@firefox.mozilla.org.xpi" ]; then
-        PACK="${EXT_DIR}/langpack-${LONG}@firefox.mozilla.org.xpi"
+    if [ "${LOCALE}" != en-US ]; then
+        PACK="${EXT_DIR}/langpack-${LOCALE}@firefox.mozilla.org.xpi"
         TOP=browser/chrome
-        REST=${LONG}/locale
-    elif [ -e "${EXT_DIR}/langpack-${SHORT}@firefox.mozilla.org.xpi" ]; then
-        PACK="${EXT_DIR}/langpack-${SHORT}@firefox.mozilla.org.xpi"
-        TOP=browser/chrome
-        REST=${SHORT}/locale
+        REST=${LOCALE}/locale
     else
         PACK="${CHROOT}/${TBB_INSTALL}/browser/omni.ja"
         TOP=chrome
@@ -165,7 +162,8 @@ configure_chroot () {
     mkdir -p "$(dirname "${CLEARNET_PREFS}")"
 
     # Localization
-    cat /var/lib/tails-user-session/browser-locale.js >> "${CLEARNET_PREFS}"
+    BEST_LOCALE="$(guess_best_tor_browser_locale)"
+    configure_xulrunner_app_locale "${CLEARNET_PROFILE}" "${BEST_LOCALE}"
 
     # Disable proxying in the chroot
     echo 'pref("network.proxy.type", 0);' >> "${CLEARNET_PREFS}"
@@ -179,7 +177,7 @@ configure_chroot () {
     echo 'user_pref("extensions.getAddons.showPane", false);' >> "${CLEARNET_PREFS}"
 
     # Set the name (e.g. window title) of the browser
-    set_chroot_browser_name "`gettext \"Unsafe Browser\"`"
+    set_chroot_browser_name "`gettext \"Unsafe Browser\"`" "${BEST_LOCALE}"
 
     # Set start page to something that explains what's going on
     echo 'user_pref("browser.startup.homepage", "'${START_PAGE}'");' >> \

config/chroot_local-includes/usr/local/share/tor-browser-extensions/branding@amnesia.boum.org/chrome/locale/ar-EG/amnesia.properties

-browser.search.defaultenginename=Startpage HTTPS
-browser.search.selectedEngine=Startpage HTTPS
+browser.search.defaultenginename=Startpage
+browser.search.selectedEngine=Startpage
 browser.startup.homepage=https://tails.boum.org/news/
 spellchecker.dictionary=ar_EG

config/chroot_local-includes/usr/local/share/tor-browser-extensions/branding@amnesia.boum.org/chrome/locale/de-DE/amnesia.properties

-browser.search.defaultenginename=Startpage HTTPS - Deutsch
-browser.search.selectedEngine=Startpage HTTPS - Deutsch
+browser.search.defaultenginename=Startpage - Deutsch
+browser.search.selectedEngine=Startpage - Deutsch
 browser.startup.homepage=https://tails.boum.org/news/index.de.html
 spellchecker.dictionary=de_DE

config/chroot_local-includes/usr/local/share/tor-browser-extensions/branding@amnesia.boum.org/chrome/locale/en-US/amnesia.properties

-browser.search.defaultenginename=Startpage HTTPS
-browser.search.selectedEngine=Startpage HTTPS
+browser.search.defaultenginename=Startpage
+browser.search.selectedEngine=Startpage
 browser.startup.homepage=https://tails.boum.org/news/
 spellchecker.dictionary=en_US

config/chroot_local-includes/usr/local/share/tor-browser-extensions/branding@amnesia.boum.org/chrome/locale/es-ES/amnesia.properties

-browser.search.defaultenginename=Startpage HTTPS - Espanol
-browser.search.selectedEngine=Startpage HTTPS - Espanol
+browser.search.defaultenginename=Startpage - Espanol
+browser.search.selectedEngine=Startpage - Espanol
 browser.startup.homepage=https://tails.boum.org/news/
 spellchecker.dictionary=es_ES

config/chroot_local-includes/usr/local/share/tor-browser-extensions/branding@amnesia.boum.org/chrome/locale/fr-FR/amnesia.properties

-browser.search.defaultenginename=Startpage HTTPS - Francais
-browser.search.selectedEngine=Startpage HTTPS - Francais
+browser.search.defaultenginename=Startpage - Francais
+browser.search.selectedEngine=Startpage - Francais
 browser.startup.homepage=https://tails.boum.org/news/index.fr.html
 spellchecker.dictionary=fr_FR

config/chroot_local-includes/usr/local/share/tor-browser-extensions/branding@amnesia.boum.org/chrome/locale/it-IT/amnesia.properties

-browser.search.defaultenginename=Startpage HTTPS - Italiano
-browser.search.selectedEngine=Startpage HTTPS - Italiano
+browser.search.defaultenginename=Startpage - Italiano
+browser.search.selectedEngine=Startpage - Italiano
 browser.startup.homepage=https://tails.boum.org/news/
 spellchecker.dictionary=it_IT

config/chroot_local-includes/usr/local/share/tor-browser-extensions/branding@amnesia.boum.org/chrome/locale/pt-BR/amnesia.properties

-browser.search.defaultenginename=Startpage HTTPS - Portugues
-browser.search.selectedEngine=Startpage HTTPS - Portugues
+browser.search.defaultenginename=Startpage - Portugues
+browser.search.selectedEngine=Startpage - Portugues
 browser.startup.homepage=https://tails.boum.org/news/index.pt.html
 spellchecker.dictionary=pt_BR

config/chroot_local-includes/usr/local/share/tor-browser-extensions/branding@amnesia.boum.org/chrome/locale/pt-PT/amnesia.properties

-browser.search.defaultenginename=Startpage HTTPS - Portugues
-browser.search.selectedEngine=Startpage HTTPS - Portugues
+browser.search.defaultenginename=Startpage - Portugues
+browser.search.selectedEngine=Startpage - Portugues
 browser.startup.homepage=https://tails.boum.org/news/index.pt.html
 spellchecker.dictionary=pt_PT