diaspora/config/locales/diaspora
Raphael Sofaer 1af945de11 Merge branch 'master' into oauth
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
..
ar.yml updated locales 2011-06-18 23:18:04 +02:00
bg.yml updated locales 2011-06-05 00:59:58 +02:00
br.yml updated locales 2011-06-03 23:04:52 +02:00
ca.yml Better message for what's on your mind. 2011-06-17 21:14:50 +02:00
cs.yml updated locales 2011-06-10 02:15:03 +02:00
cy.yml updated locales 2011-06-03 23:04:52 +02:00
da.yml updated locales 2011-06-03 23:04:52 +02:00
de.yml updated locales 2011-06-18 23:18:04 +02:00
el.yml updated locales 2011-06-08 19:13:20 +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 branch 'master' into oauth 2011-06-28 17:13:38 -07:00
en_shaw.yml updated locales 2011-06-03 23:04:52 +02:00
eo.yml updated locales 2011-06-08 19:13:20 +02:00
es-AR.yml updated locales 2011-06-03 23:04:52 +02:00
es-CL.yml updated locales 2011-06-06 23:06:32 +02:00
es.yml updated locales 2011-06-18 23:18:04 +02:00
eu.yml updated locales 2011-06-06 23:06:32 +02:00
fi.yml updated locales 2011-06-03 23:04:52 +02:00
fr.yml updated locales 2011-06-18 23:18:04 +02:00
ga.yml updated locales 2011-06-03 23:04:52 +02:00
gl.yml updated locales 2011-04-02 15:15:31 +02:00
he.yml updated locales 2011-06-10 02:15:03 +02:00
hu.yml updated locales 2011-06-03 23:04:52 +02:00
id.yml updated locales 2011-06-03 23:04:52 +02:00
is.yml updated locales 2011-06-03 23:04:52 +02:00
it.yml updated locales 2011-06-18 23:18:04 +02:00
ja.yml updated locales 2011-06-03 23:04:52 +02:00
ko.yml updated locales 2011-06-03 23:04:52 +02:00
lt.yml updated locales 2011-06-03 23:04:52 +02:00
mk.yml updated locales 2011-06-03 23:04:52 +02:00
ml.yml fixed type in ml.yml 2011-06-03 00:29:23 +02:00
nb.yml updated locales 2011-06-03 23:04:52 +02:00
nl.yml updated locales 2011-06-23 14:06:54 +02:00
pa.yml updated locales 2011-06-03 23:04:52 +02:00
pl.yml updated locales 2011-06-03 23:04:52 +02:00
pt-BR.yml updated locales 2011-06-03 23:04:52 +02:00
pt-PT.yml updated locales 2011-06-08 19:13:20 +02:00
ro.yml updated locales 2011-06-03 23:04:52 +02:00
ru.yml updated locales 2011-06-10 02:15:03 +02:00
sk.yml updated locales 2011-06-03 23:04:52 +02:00
sl.yml updated locales 2011-06-03 23:04:52 +02:00
sv.yml updated locales 2011-06-03 23:04:52 +02:00
tr.yml updated locales 2011-06-03 23:04:52 +02:00
zh-CN.yml updated locales 2011-06-03 23:04:52 +02:00
zh-TW.yml updated locales 2011-06-18 23:18:04 +02:00