Added language specific translations (Issue #50)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	spec/spec_helper.rb