Conflicts:
	wiki/src/doc/first_steps.index.fr.po
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.es.po
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po
	wiki/src/doc/first_steps/persistence/configure.de.po
	wiki/src/doc/first_steps/persistence/configure.es.po
	wiki/src/doc/first_steps/persistence/configure.pt.po
	wiki/src/doc/first_steps/usb_installation.de.po
	wiki/src/doc/first_steps/usb_installation.es.po
	wiki/src/doc/first_steps/usb_installation.fr.po
	wiki/src/doc/first_steps/usb_installation.pt.po
	wiki/src/doc/first_steps/usb_upgrade.de.po
	wiki/src/doc/first_steps/usb_upgrade.es.po
	wiki/src/doc/first_steps/usb_upgrade.fr.po
	wiki/src/doc/first_steps/usb_upgrade.pt.po