Merge changes made in en.yml:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 2 Jun 2009 00:05:28 +0000 (00:05 +0000)
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 2 Jun 2009 00:05:28 +0000 (00:05 +0000)
commitdf47c1305d0eff9d3dd5590362d4fee1d6ee6e28
tree5bec4870be74fa1e867da89030e2c032a0323c99
parentd9ab9793c2b381c96720705bea8b120c82e17df8
Merge changes made in en.yml:

 * imported activerecord stuff, still untranslated
 * view_history -> view_details
 * upload -> upload_trace

Found with my lang-diff.pl tool
config/locales/is.yml