Merge pull request #299 from lrozanski/master

Fixed test for MIFOS-5995: Error with Data Import
Localisation updates from http://translatewiki.net.
Localisation updates from http://translatewiki.net.
Localisation updates from http://translatewiki.net.
Fixed test for MIFOS-5995: Error with Data Import
Merge remote-tracking branch 'upstream/master'