Clean Cache after editing + few tweaks + i10n