Merge branch 'master' into next-minor

config/locales/diaspora/ar.yml

config/locales/diaspora/bg.yml

config/locales/diaspora/br.yml

config/locales/diaspora/bs.yml

config/locales/diaspora/cs.yml

config/locales/diaspora/cy.yml

config/locales/diaspora/da.yml

config/locales/diaspora/de-CH.yml

config/locales/diaspora/de-moo.yml

config/locales/diaspora/de.yml

config/locales/diaspora/de_formal.yml

config/locales/diaspora/el.yml

config/locales/diaspora/en_1337.yml

config/locales/diaspora/en_pirate.yml

config/locales/diaspora/en_shaw.yml

config/locales/diaspora/en_valspeak.yml

config/locales/diaspora/eo.yml

config/locales/diaspora/es-AR.yml

config/locales/diaspora/es-CL.yml

config/locales/diaspora/es-CO.yml