Merge tag '1.3.12'

Conflicts:
	lib/tolk/engine.rb
Sort translations before export