Merge branch 'master' of github.com:diaspora/diaspora

config/languages.yml

config/locales/devise/devise.ar.yml

config/locales/devise/devise.ca.yml

config/locales/devise/devise.cs.yml

config/locales/devise/devise.cy.yml

config/locales/devise/devise.da.yml

config/locales/devise/devise.de.yml

config/locales/devise/devise.el.yml

config/locales/devise/devise.eo.yml

config/locales/devise/devise.es-CL.yml

config/locales/devise/devise.es.yml

config/locales/devise/devise.fi.yml

config/locales/devise/devise.fr.yml

config/locales/devise/devise.he.yml

config/locales/devise/devise.hu.yml

config/locales/devise/devise.id.yml

config/locales/devise/devise.it.yml

config/locales/devise/devise.lt.yml

config/locales/devise/devise.mk.yml

config/locales/devise/devise.nb.yml