Conflicts:
	config/chroot_local-includes/usr/local/bin/tails-activate-win8-theme

Conflicts:
	config/chroot_local-includes/usr/local/bin/tails-activate-win8-theme

Closes https://labs.riseup.net/code/issues/7401 with the associated gnome-theme-windows8

Conflicts:
	config/chroot_local-includes/usr/local/sbin/tails-prepare-win8-theme

Conflicts:
	config/chroot_local-includes/usr/local/sbin/tails-prepare-win8-theme

This reverts commit fe413c8a, which breaks camouflage mode.

Merge remote-tracking branch 'origin/bugfix/7329-unsafe-browser-with-win8-camouflage' into feature/6342-update-camouflage-for-gnome3

Conflicts:
	wiki/src/contribute/release_process/test.mdwn

Merge remote-tracking branch 'origin/bugfix/7329-unsafe-browser-with-win8-camouflage' into feature/6342-update-camouflage-for-gnome3

The Search Bar is removed in the Windows 8 camouflage, so having
Wikipedia as the default cannot be used as a stealthy visual indicator
any more. We already have "Unsafe Browser" in both the window title,
and the button to the right of the URL box, which should make it clear
enough which browser is used.

When the 'clearnet' user runs this script (when setting up the Unsafe
Browser's chroot) there's no .claws directory, for instance. Even if
this script currently doesn't `set -e` this feels like a nice
robustness improvement.

If we're in camouflage mode we want it to be applied to the Unsafe
Browser as well. However, the camouflage activation script modifies
the *user's* own profile, not the system one, so it must be present at
this point, and then it's easier to also make all the other changes to
the user's profile since any changes to the system profile will not be
copied back in.

This closes https://labs.riseup.net/code/issues/7407 and prevent potential races

It may be that one wants to read the documentation because one fails to connect
to the Tor network. Being told "Tor is not ready", and asked "Start Tor Browser
anyway?" will likely confuse users in such a case.

This reverts commit 08800bc0.

Yelp in Wheezy has quite some issues in our usecase, and the browser
issue that made us move to Yelp has vanished.

Conflicts:
	config/chroot_local-includes/etc/iceweasel/pref/000-tor-browser.js

Conflicts:
	config/chroot_local-includes/etc/iceweasel/pref/000-tor-browser.js

Conflicts:
	wiki/src/contribute/release_process/test.mdwn

Conflicts:
	config/chroot_apt/preferences
	config/chroot_local-includes/etc/iceweasel/pref/000-tor-browser.js
	config/chroot_local-includes/etc/iceweasel/profile/adblockplus/patterns.ini
	debian/changelog
	po/ar.po
	po/cy.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/fa.po
	po/fr.po
	po/fr_CA.po
	po/hu.po
	po/it.po
	po/ja.po
	po/km.po
	po/ko.po
	po/lv.po
	po/nb.po
	po/nl.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ru.po
	po/sk.po
	po/sv.po
	po/tails.pot
	po/tr.po
	po/uk.po
	po/zh.po
	po/zh_CN.po
	wiki/src/doc/about.index.pt.po
	wiki/src/doc/about/features.pt.po
	wiki/src/doc/about/requirements.pt.po
	wiki/src/doc/advanced_topics/cold_boot_attacks.pt.po
	wiki/src/doc/anonymous_internet.index.pt.po
	wiki/src/doc/anonymous_internet/vidalia.fr.po
	wiki/src/doc/encryption_and_privacy.index.pt.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
	wiki/src/doc/first_steps/persistence/warnings.pt.po
	wiki/src/doc/get.index.pt.po
	wiki/src/doc/sensitive_documents/printing_and_scanning.fr.po
	wiki/src/support.de.po
	wiki/src/support/known_issues.de.po
	wiki/src/support/known_issues.fr.po
	wiki/src/support/known_issues.pt.po
	wiki/src/support/talk.pt.po