Code

Merge branch 'ar/i18n-no-gettext'