Merge remote-tracking branch 'origin/master' into testing
Conflicts: po/fr.po wiki/src/contribute.fr.po wiki/src/doc/anonymous_internet/i2p.fr.po wiki/src/doc/first_steps/persistence/check_file_system.fr.po wiki/src/doc/get/verify_the_iso_image_using_gnome.fr.po wiki/src/support/faq.fr.po

| W: | H:
| W: | H:


This diff is collapsed.

| W: | H:
| W: | H:


This diff is collapsed.

| W: | H:
| W: | H:


This diff is collapsed.

| W: | H:
| W: | H:


This diff is collapsed.