Conflicts:

	config/chroot_local-includes/usr/local/sbin/tails-additional-software

This fixes a regression introduced by d6991d (Use new consistent
path for additional software).

Conflicts:

	config/chroot_local-includes/usr/local/sbin/tails-additional-software

It is installed, and apparently (according to Wikipedia)
preferred over pinyin in some regions in China.
Now it is selectable in the applet too.

This login script will enable IBus for all locales,
but for Japanese, Chinese and Korean it will also select
the right default input method for that language.

This replaces im-switch, as it not only starts IBus,
but actually configures it correctly for usage in Tails.

This fixes bug #6206, that made it impossible
to input passwords in pinentry for Japanese,
Chinese and Korean languages.

This patch also drops UIM instead of replacing it,
because UIM wasn't used for anything.

IBus is replacing SCIM in Wheezy anyway, so making
this change for Squeeze too is sensible.

Conflicts:
	debian/changelog
	wiki/src/about.fr.po

Conflicts:
	wiki/src/news/version_0.21.fr.po
	wiki/src/security/Numerous_security_holes_in_0.20.1.fr.po
	wiki/src/support/known_issues.fr.po

This reverts commit 86357842.

No commit message

     principalement USB → USB et carte SD

This fixes a regression introduced by 8ed95a (Move pages and update PO files)