fix l10n modification
Merge remote-tracking branch 'origin/master' into app-control-panel