// MERGE with 1.4 r7770

modules/livezilla/de.php

@@ -2,7 +2,6 @@
 
 global $_MODULE;
 $_MODULE = array();
-$_MODULE['<{livezilla}prestashop>livezilla_2bc19baeea1dd9e939091b1d414da0f7'] = 'LiveZilla Live Help';
 $_MODULE['<{livezilla}prestashop>livezilla_2b6ffc604d5470a856c3a7bba581d1ae'] = 'Live Support Chat';
 $_MODULE['<{livezilla}prestashop>livezilla_c888438d14855d7d96a2724ee9c306bd'] = 'Einstellungen aktualisiert';
 $_MODULE['<{livezilla}prestashop>livezilla_1445650302f377af43ee1f7738dc7b50'] = 'Anleitungen';
@@ -17,5 +16,4 @@ $_MODULE['<{livezilla}prestashop>livezilla_a1c537e365d5243201b00d3ea5a1ea00'] =
 $_MODULE['<{livezilla}prestashop>livezilla_c718af0f8ee7235462f7c70ef974b2e7'] = '- ODER -';
 $_MODULE['<{livezilla}prestashop>livezilla_66a4362239a5cf0c365bacbf13e98ee0'] = 'Kopieren das von LiveZilla erhaltene Skript ';
 $_MODULE['<{livezilla}prestashop>livezilla_b17f3f4dcf653a5776792498a9b44d6a'] = 'Einstellungen aktualisieren';
-
-?>
+$_MODULE['<{livezilla}prestashop>livezilla_2bc19baeea1dd9e939091b1d414da0f7'] = 'LiveZilla Live Help';

modules/livezilla/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;