foodsoft/config/locales
wvengen 5e2a3fb3f0 fix articles controller i18n
Conflicts:

	app/controllers/articles_controller.rb
2013-04-12 16:17:12 +02:00
..
de fix articles controller i18n 2013-04-12 16:17:12 +02:00
en update en translation 2013-04-12 01:30:02 +02:00