This commit reintroduces changes that were lost in the conflict resolution of merge 770bfdf2, reported by xin as: * faq.es.po, faq.fr.po and faq.it.po in f7d26a70 * download.inline.de.po and download.inline.it.po in 4c33052e Will-fix: #16376