Merge branch 'altomarketing-patch-1' into develop

# Conflicts:
#	src/application/language/spanish/translations_lang.php
This commit is contained in:
Alex Tselegidis 2020-03-10 20:48:40 +01:00
commit 6ae4835015

View file

@ -296,7 +296,7 @@ $lang['read_and_agree_to_terms_and_conditions'] = 'I have read and agree to the
$lang['read_and_agree_to_privacy_policy'] = 'I have read and agree to the {$link}Privacy Policy{/$link}.';
$lang['delete_personal_information_hint'] = 'Delete all personal information from the system.';
$lang['delete_personal_information'] = 'Delete Personal Information';
$lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
$lang['delete_personal_information_prompt'] = '¿ Esta seguro que desea eliminar su información personal ? Esta acción no tiene vuelta atrás.';
$lang['location'] = 'Location';
$lang['extra_period'] = '';
$lang['extra_periods'] = '';