merge master

wiki/src/about.de.po

wiki/src/about.fr.po

wiki/src/about.mdwn

wiki/src/about.pt.po

wiki/src/blueprint/HTTP_mirror_pool.mdwn

wiki/src/blueprint/UEFI/syslinux.mdwn

wiki/src/blueprint/replace_truecrypt.mdwn

wiki/src/contribute.pt.po

wiki/src/contribute/APT_repository.mdwn

wiki/src/contribute/build.mdwn

...src/contribute/build/squid-deb-proxy/squid-deb-proxy.conf

wiki/src/contribute/calendar.mdwn

wiki/src/contribute/customize.mdwn

wiki/src/contribute/design.mdwn

wiki/src/contribute/design/vagrant.mdwn

wiki/src/contribute/how/translate.mdwn

wiki/src/contribute/l10n_tricks/core_po_files.txt

wiki/src/contribute/l10n_tricks/language_statistics.sh

wiki/src/contribute/meetings/201405.mdwn

wiki/src/contribute/relationship_with_upstream.mdwn