notsecure/uTox — pull request #298 by Ansa89 (2014-08-23 11:36:28+00:00)
Title: Fix translations conflicts

I joined notsecure/uTox#289, notsecure/uTox#290 and notsecure/uTox#292 together to fix merge conflicts.

If @Imppy and @v2e agree, we can close the respective PRs.