diaspora/config/locales/diaspora
Raphael Sofaer 9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
2011-07-19 10:44:00 -07:00
..
ar.yml updated locales 2011-07-12 15:08:44 +02:00
bg.yml updated locales 2011-07-14 20:29:55 +02:00
br.yml updated locales 2011-07-12 15:08:44 +02:00
ca.yml Updated Catalan translation to 97ca10d. 2011-07-11 15:51:36 +02:00
cs.yml updated locales 2011-07-14 20:29:55 +02:00
cy.yml updated locales 2011-07-12 15:08:44 +02:00
da.yml updated locales 2011-07-12 15:08:44 +02:00
de.yml updated locales 2011-07-14 20:29:55 +02:00
el.yml updated locales 2011-07-12 15:08:44 +02:00
en-AU.yml broke out the en activerecord validations translations to their respective file 2011-02-13 15:09:05 -08:00
en-GB.yml broke out the en activerecord validations translations to their respective file 2011-02-13 15:09:05 -08:00
en-US.yml broke out the en activerecord validations translations to their respective file 2011-02-13 15:09:05 -08:00
en.yml Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 2011-07-19 10:44:00 -07:00
en_shaw.yml updated locales 2011-07-12 15:08:44 +02:00
eo.yml updated locales 2011-07-12 15:08:44 +02:00
es-AR.yml updated locales 2011-07-12 15:08:44 +02:00
es-CL.yml updated locales 2011-07-14 20:29:55 +02:00
es.yml updated locales 2011-07-14 20:29:55 +02:00
eu.yml updated locales 2011-07-12 15:08:44 +02:00
fi.yml updated locales 2011-07-12 15:08:44 +02:00
fr.yml updated locales 2011-07-12 15:08:44 +02:00
ga.yml updated locales 2011-07-12 15:08:44 +02:00
gl.yml Added correct string delimiters to the last strings of ‘diaspora/gl.yml’ file. 2011-07-15 11:55:53 +02:00
he.yml updated locales 2011-07-12 15:08:44 +02:00
hu.yml updated locales 2011-07-12 15:08:44 +02:00
id.yml updated locales 2011-07-12 15:08:44 +02:00
is.yml updated locales 2011-07-12 15:08:44 +02:00
it.yml updated locales 2011-07-14 20:29:55 +02:00
ja.yml updated locales 2011-07-12 15:08:44 +02:00
ko.yml updated locales 2011-07-12 15:08:44 +02:00
lt.yml updated locales 2011-07-12 15:08:44 +02:00
mk.yml updated locales 2011-07-12 15:08:44 +02:00
ml.yml fixed type in ml.yml 2011-06-03 00:29:23 +02:00
nb.yml updated locales 2011-07-12 15:08:44 +02:00
nl.yml updated locales 2011-07-12 15:08:44 +02:00
pa.yml updated locales 2011-07-12 15:08:44 +02:00
pl.yml updated locales 2011-07-12 15:08:44 +02:00
pt-BR.yml updated locales 2011-07-12 15:08:44 +02:00
pt-PT.yml updated locales 2011-07-12 15:08:44 +02:00
ro.yml updated locales 2011-07-12 15:08:44 +02:00
ru.yml updated locales 2011-07-12 15:08:44 +02:00
sk.yml updated locales 2011-07-12 15:08:44 +02:00
sl.yml updated locales 2011-07-12 15:08:44 +02:00
sv.yml updated locales 2011-07-12 15:08:44 +02:00
tr.yml updated locales 2011-07-12 15:08:44 +02:00
zh-CN.yml updated locales 2011-07-12 15:08:44 +02:00
zh-TW.yml updated locales 2011-07-14 20:29:55 +02:00