Merge translation string changes from Ushahidi 2.7