Add the ability to place the translation strings in with a key and use it to clear up the menus
Log the default translations
Merge pull request #1553 from zz9pzza/issue_3795_2

Add the ability to place the translation strings in with a key and use i
Merge branch 'master' into i18n
Test: testing deploy to i18n
Merge branch 'i18n' of git://github.com/otwcode/otwarchive into deploy_to_i18n
Merge branch 'master' of git://github.com/otwcode/otwarchive into i18n
Merge pull request #1623 from zz9pzza/i18n

Bring i18n upto date.
Issue 4022: More detailed orphaning warning
Issue 4022: Moar grammar
Issue 4022: Fixed HTML
Issue 4022: Hopefully fix the test
Merge branch 'master' into i18n

Conflicts:
	app/views/layouts/_footer.html.erb
Revert "End of Line."

This reverts commit 25918a9dc411f85b69bf0eca121b0b29b21b6188.
Revert "Issue 3418: Multiple collections doesnt catch moderated status"

This reverts commit bc3fb835976966bcc0ce05469d51f4329ab31f28.

Conflicts:

	app/controllers/works_controller.rb
The auto revert missed something

It might have to do with the skipping over the merge
Merge pull request #1725 from zz9pzza/issue_3418_revert

Issue 3418 revert
Merge pull request #1723 from LadyOscar/issue_4022

Issue 4022: More detailed orphaning warning
Merge branch 'i18n' of git://github.com/otwcode/otwarchive