Conflicts: include/identity.php include/widgets.php util/messages.po view/it/messages.po view/it/strings.php