edit
Merge branch 'master' of https://github.com/JoomliC/iCagenda-Translations