diff --git a/index.php b/index.php
index 50c2625968..0cd9122780 100755
--- a/index.php
+++ b/index.php
@@ -151,7 +151,7 @@ $announcements_block = null;
 
 
 // Display the Site Use Cookie Warning Validation
-$useCookieValidation = api_get_configuration_value('chamilo_use_cookie_warning_validation');
+$useCookieValidation = api_get_configuration_value('cookie_warning');
 if ($useCookieValidation) {
     if (isset($_POST['acceptCookies'])) {
         api_set_site_use_cookie_warning_cookie();
diff --git a/main/admin/index.php b/main/admin/index.php
index ccbb7df266..71b6986be4 100644
--- a/main/admin/index.php
+++ b/main/admin/index.php
@@ -340,7 +340,7 @@ $admin_ajax_url = api_get_path(WEB_AJAX_PATH).'admin.ajax.php';
 $tpl = new Template();
 
 // Display the Site Use Cookie Warning Validation
-$useCookieValidation = api_get_configuration_value('chamilo_use_cookie_warning_validation');
+$useCookieValidation = api_get_configuration_value('cookie_warning');
 if ($useCookieValidation) {
     if (isset($_POST['acceptCookies'])) {
         api_set_site_use_cookie_warning_cookie();
diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php
index ac98ffd6a9..8936040688 100755
--- a/main/install/configuration.dist.php
+++ b/main/install/configuration.dist.php
@@ -282,5 +282,5 @@ $_configuration['system_stable']     = NEW_VERSION_STABLE;
 //$_configuration['name_order_conventions'] = array(
 //  'french' => array('format' => 'title last_name first_name',  'sort_by' => 'last_name')
 //);
-// Shows a warning message that the site use cookies
-//$_configuration['chamilo_use_cookie_warning_validation'] = false;
+// Shows a warning message explaining that the site uses cookies
+//$_configuration['cookie_warning'] = false;
diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php
index 38747d2dfe..994ea43d32 100755
--- a/main/lang/english/trad4all.inc.php
+++ b/main/lang/english/trad4all.inc.php
@@ -2,6 +2,10 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$HelpCookieUsageValidation = "In order for this site to work and be able to measure the use of content, this platform uses cookies.<br /><br />
+If needed, the Help section of your browser indicates how to configure cookies.<br /><br />
+For more information on cookies, you can visit the <a href=\"http://www.aboutcookies.org/\">About Cookies</a> website.";
+$YouAcceptCookies = "By continuing to use this site, you declare you accept its use of cookies.";
 $TemplateCertificateComment = "An example certificate format";
 $TemplateCertificateTitle = "Certificate";
 $ResultsVisibility = "Results visibility";
diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php
index 7052a1a52c..89aa25fb69 100755
--- a/main/lang/french/trad4all.inc.php
+++ b/main/lang/french/trad4all.inc.php
@@ -2,6 +2,8 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$HelpCookieUsageValidation = "Dans un soucis de bon fonctionnement et de mesure de fréquentation de la plate forme, Chamilo utilise les cookies.<br/><br/>Au besoin, La rubrique « Aide » des navigateurs vous indique comment paramétrer les cookies.<br/><br/>Pour plus d'informations sur les cookies, visitez le site de la <a href='http://www.cnil.fr/vos-obligations/sites-web-cookies-et-autres-traceurs/que-dit-la-loi/' target='_blank'>CNIL</a>.";
+$YouAcceptCookies = "En continuant votre navigation sur ce site, vous vous engagez à accepter l’utilisation des cookies.";
 $TemplateCertificateComment = "Exemple de certificat";
 $TemplateCertificateTitle = "Certificat";
 $ResultsVisibility = "Visibilité des résultats";
diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php
index 198efd2698..d9d75d8cf9 100755
--- a/main/lang/spanish/trad4all.inc.php
+++ b/main/lang/spanish/trad4all.inc.php
@@ -2,6 +2,10 @@
 /*
 for more information: see languages.txt in the lang folder.
 */
+$HelpCookieUsageValidation = "Para el buen funcionamiento de este sitio y la medición de su uso, esta plataforma usa cookies.<br /><br />
+Si lo considera necesario, la sección de ayuda de su navegador le informará sobre los prcedimientos para configurar los cookies.<br /><br />
+Para mayor información sobre cookies, puede visitar el sitio <a href=\"http://www.aboutcookies.org/\">About Cookies</a> (en inglés) o cualquier equivalente en español.";
+$YouAcceptCookies = "A través del uso de este sitio web, declara aceptar el uso de cookies.";
 $TemplateCertificateComment = "Ejemplo de certificado";
 $TemplateCertificateTitle = "Certificado";
 $ResultsVisibility = "Visibilidad de los resultados";
diff --git a/main/template/default/layout/main_header.tpl b/main/template/default/layout/main_header.tpl
index 0b40700e7f..364daa6058 100755
--- a/main/template/default/layout/main_header.tpl
+++ b/main/template/default/layout/main_header.tpl
@@ -20,12 +20,12 @@
     <form onSubmit="$(this).toggle('slow')" action="" method="post">
         <input value=1 type="hidden" name="acceptCookies"/>
         <div class="cookieUsageValidation">
-            {{ "youDeclareToAcceptCookies" | get_lang }}
+            {{ "YouAcceptCookies" | get_lang }}
             <span style="margin-left:20px;" onclick="$(this).next().toggle('slow'); $(this).toggle('slow')">
                 ({{"More" | get_lang }})
             </span>
             <div style="display:none; margin:20px 0;">
-                {{ "helpCookieUsageValidation" | get_lang}}
+                {{ "HelpCookieUsageValidation" | get_lang}}
             </div>
             <span style="margin-left:20px;" onclick="$(this).parent().parent().submit()">
                 ({{"Accept" | get_lang }})
diff --git a/user_portal.php b/user_portal.php
index 365f9d63dd..2a7428e70c 100755
--- a/user_portal.php
+++ b/user_portal.php
@@ -166,7 +166,7 @@ if (api_get_setting('allow_browser_sniffer') == 'true') {
 
 
 // Display the Site Use Cookie Warning Validation
-$useCookieValidation = api_get_configuration_value('chamilo_use_cookie_warning_validation');
+$useCookieValidation = api_get_configuration_value('cookie_warning');
 if ($useCookieValidation) {
 	if (isset($_POST['acceptCookies'])) {
 		api_set_site_use_cookie_warning_cookie();