obsolete.ChilliProject/config/locales
Holger Just 0c87f611e9 Merge branch 'master' into unstable
Conflicts:
	config/locales/bg.yml
	config/locales/bs.yml
	config/locales/ca.yml
	config/locales/cs.yml
	config/locales/da.yml
	config/locales/de.yml
	config/locales/el.yml
	config/locales/en-GB.yml
	config/locales/es.yml
	config/locales/eu.yml
	config/locales/fa.yml
	config/locales/fi.yml
	config/locales/fr.yml
	config/locales/gl.yml
	config/locales/he.yml
	config/locales/hr.yml
	config/locales/hu.yml
	config/locales/id.yml
	config/locales/it.yml
	config/locales/ja.yml
	config/locales/ko.yml
	config/locales/lt.yml
	config/locales/lv.yml
	config/locales/mk.yml
	config/locales/mn.yml
	config/locales/nl.yml
	config/locales/no.yml
	config/locales/pl.yml
	config/locales/pt-BR.yml
	config/locales/pt.yml
	config/locales/ro.yml
	config/locales/ru.yml
	config/locales/sk.yml
	config/locales/sl.yml
	config/locales/sr-YU.yml
	config/locales/sr.yml
	config/locales/sv.yml
	config/locales/th.yml
	config/locales/tr.yml
	config/locales/uk.yml
	config/locales/vi.yml
	config/locales/zh-TW.yml
	config/locales/zh.yml
	db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb
	lib/chili_project/version.rb
2012-01-04 16:41:10 +01:00
..
bg.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
bs.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
ca.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
cs.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
da.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
de.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
el.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
en-GB.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
en.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
es.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
eu.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
fa.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
fi.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
fr.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
gl.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
he.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
hr.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
hu.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
id.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
it.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
ja.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
ko.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
lt.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
lv.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
mk.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
mn.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
nl.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
no.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
pl.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
pt-BR.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
pt.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
ro.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
ru.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
sk.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
sl.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
sr-YU.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
sr.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
sv.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
th.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
tr.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
uk.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
vi.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
zh-TW.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00
zh.yml Merge branch 'master' into unstable 2012-01-04 16:41:10 +01:00