This reverts commit 7b866f52.

With the upgrade to stable TBB 4.0, all desired locales are available
again.

Conflicts:
	wiki/src/doc/anonymous_internet/i2p.mdwn

We shouldn't let the user believe that they can "configure" Firefox to be the
Tor Browser.

This reverts commit 90e0d322.

Conflicts:
	po/fr.po

Merge remote-tracking branch 'origin/bugfix/8057-translatable-tor-browser-desktop-file' into testing

Merge remote-tracking branch 'origin/bugfix/8035-remove-branding-extension-in-unsafe-browser' into testing

... otherwise, there are great chances to mistakenly and partially upgrade to
Debian testing, and get a non-working system as a result.

It was added by mistake when adapting the script for the
TBB-migration.

We didn't do this prior to the TBB 4.x bump; 4.x's new directory
layout caused this, so now these must be explicitly deleted.

This instance was forgotten before.

It was a relic of the TBB 3.x times when the profile was located in
the parent directory of the TBB browser files.

Also patch Tails Greeter with the updated path. That patch should
be dropped once it's been upstreamed into Tails Greeter.

The new place corresponds better to where Debian puts the Iceweasel
extensions. Also, it will allow us to drop the useless "Browser"
sub-dir in TBB_INSTALL without having potential collisions (e.g. if
there was a "Browser/extensions").

... and that makes it available in the Tor Browser.

Conflicts:
	wiki/src/about.fr.po

Tor Browser is not only a rebranded version of Firefox