Conflicts:
	wiki/src/doc/first_steps/accessibility.pt.po
	wiki/src/doc/first_steps/installation.pt.po
	wiki/src/doc/first_steps/reset/linux.pt.po
	wiki/src/doc/first_steps/upgrade.pt.po
	wiki/src/doc/get/verify_the_iso_image_using_gnome.pt.po
	wiki/src/support/known_issues.de.po
	wiki/src/support/known_issues.fr.po
	wiki/src/support/known_issues.pt.po

This reverts commit d517fb21.

We have now removed shared-mime-info from our APT suite, and install a
newer one from Wheezy backports.

FoxyProxy adds the proxy:// protocol handler, which can be used to
configure the proxy via an URI. A malicious webpage can include (or a
malicious exit node can inject) some JavaScript code to visit such an
URI and disable or otherwise change Iceweasel's proxy settings.

While using this to disable proxying will be dealt with safely by our
firewall, this could be used to defeat stream isolation, although the
use must be tricked into accepting the new proxy settings.

The step "Tails is installed on USB drive $TARGET" only checks that
the *running* Tails is installed on $TARGET, which obviously fails
when doing an upgrade from ISO running an old Tails. That it worked
for the same scenario running the current Tails is just incidental.

Knowing that relationship makes it possible to do the permission
checks in the "persistent directories have safe access rights" step
without exceptions for each destination not in /home/$LIVE_USER.

Otherwise e.g. the permission fixes won't get applied, and the
subsequent steps testing the permissions will fail.

Conflicts:
	wiki/src/support/known_issues.pt.po