Merge branch 'ticket/r16345-lang' into develop

Conflicts:
	.gitignore

adm/ajax.php

@@ -730,4 +730,3 @@ if (Tools::isSubmit('getChildrenCategories') && Tools::getValue('id_category_par
 	$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), $cookie->id_lang);
 	die(Tools::jsonEncode($children_categories));
 }
-

mails/es/lang.php

@@ -10,12 +10,11 @@ $_LANGMAIL['Virtual product to download'] = 'Producto virtual a descargar';
 $_LANGMAIL['Fwd: Customer message'] = 'Fw: Mensaje de cliente';
 $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Su cuenta de invitado se transformo en cuenta de cliente';
 $_LANGMAIL['Package in transit'] = 'Paquete en transito';
-$_LANGMAIL['[Log'] = '[Log';
 $_LANGMAIL['Order confirmation'] = 'Confirmación de pedido';
 $_LANGMAIL['Message from a customer'] = 'Mensaje de un cliente';
 $_LANGMAIL['New message regarding your order'] = 'Nuevo mensaje en su orden';
 $_LANGMAIL['Your order return state has changed'] = 'El estado de retorno de su orden ha cambiado';
-$_LANGMAIL['Your password'] = 'Tu contrase<EFBFBD>a';
+$_LANGMAIL['Your password'] = 'Tu contraseña';
 $_LANGMAIL['Password query confirmation'] = 'Confirmación de password';
 $_LANGMAIL['An answer to your message is available'] = 'Hay una respuesta a su mensaje ';
 $_LANGMAIL['New voucher regarding your order'] = 'Nuevo cupon correspondiente a su orden';
@@ -24,7 +23,6 @@ $_LANGMAIL['Newsletter confirmation'] = 'Confirmación de newsletter';
 $_LANGMAIL['Newsletter voucher'] = 'Cupon de newsletter';
 $_LANGMAIL['Your wishlist\\\'s link'] = 'Su enlace de Lista de deseos';
 $_LANGMAIL['Message from '] = 'Mensaje de';
-$_LANGMAIL['$subject'] = '$subject';
 $_LANGMAIL['Your cart and your discount'] = 'Su cesta y su descuento';
 $_LANGMAIL['Thanks for your order'] = 'Gracias por su pedido';
 $_LANGMAIL['You are one of our best customers'] = 'Usted es uno de nuestros mejores clientes';
@@ -35,10 +33,6 @@ $_LANGMAIL['Error reporting from your PayPal module'] = 'Error desde el modulo p
 $_LANGMAIL['Congratulations!'] = 'Felicitaciones!';
 $_LANGMAIL['Referral Program'] = 'Programa de referidos';
 $_LANGMAIL['A friend sent you a link to'] = 'Un amigo te ha enviado un link';
-$_LANGMAIL['Log: You have a new alert from your shop'] = 'Log: Tiene un nuevo alerta desde su tienda';
-$_LANGMAIL['Message from \').$customer->lastname.\' '] = 'Mensaje de \').$customer->lastname.\'';
-$_LANGMAIL[' $subject'] = '$subject';
-$_LANGMAIL['A friend sent you a link to\').\' '] = 'Un amigo le envio un enlace a\').\'';
 $_LANGMAIL['New voucher after refund'] = 'Nuevo código de reducción tras su devolución';
 $_LANGMAIL['Your loyalty credits'] = 'Mi crédito de fidelidad';
 

mails/fr/lang.php

@@ -10,7 +10,6 @@ $_LANGMAIL['Virtual product to download'] = 'Produit virtuel à télécharger';
 $_LANGMAIL['Fwd: Customer message'] = 'TR: Message d\'un client';
 $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Votre compte invité a été transformé en compte client';
 $_LANGMAIL['Package in transit'] = 'Livraison en cours';
-$_LANGMAIL['[Log'] = '[Log';
 $_LANGMAIL['Order confirmation'] = 'Confirmation de commande';
 $_LANGMAIL['Message from a customer'] = 'Message d\'un client';
 $_LANGMAIL['New message regarding your order'] = 'Nouveau message concernant votre commande';
@@ -24,7 +23,6 @@ $_LANGMAIL['Newsletter confirmation'] = 'Confirmation newsletter';
 $_LANGMAIL['Newsletter voucher'] = 'Bon de réduction newsletter';
 $_LANGMAIL['Your wishlist\\\'s link'] = '';
 $_LANGMAIL['Message from '] = 'Message de ';
-$_LANGMAIL['$subject'] = '';
 $_LANGMAIL['Your cart and your discount'] = 'Votre panier et votre bon de réduction';
 $_LANGMAIL['Thanks for your order'] = 'Merci pour votre commande';
 $_LANGMAIL['You are one of our best customers'] = 'Vous êtes l\'un de nos meilleurs clients';

modules/landingpages/fr.php

@@ -42,6 +42,7 @@ $_MODULE['<{landingpages}prestashop>home_footer_bf2957630c4209f61a388a08c2154915
 $_MODULE['<{landingpages}prestashop>home_footer_8fdb2298a0db461ac64e71192a562ca1'] = 'Adresse du parrain (facultatif)';
 $_MODULE['<{landingpages}prestashop>home_footer_6f6162d3a052bb330e9c60285c74c6c9'] = ' J\'accepte d\'adhérer au club Bébéboutik et de recevoir des invitations aux prochaines ventes';
 $_MODULE['<{landingpages}prestashop>home_footer_0ba7583639a274c434bbe6ef797115a4'] = 'S\'incrire';
+$_MODULE['<{landingpages}prestashop>home_footer_59e7ac55563a4f1fff63c9179e6c8937'] = 'Veuillez accepter nos conditions d\'utilisation pour continuer';
 $_MODULE['<{landingpages}prestashop>home_footer_19f823c6453c2b1ffd09cb715214813d'] = 'Champs requis';
 $_MODULE['<{landingpages}prestashop>landingpages_3f2c2a34c3171295dd8b50ee4d258846'] = 'Landing Pages';
 $_MODULE['<{landingpages}prestashop>landingpages_28246f7ad0a25c90ae84ac061aa81560'] = 'Gestion de landing page pour Prestashop';

modules/privatesales/.hg/branch

@@ -1 +0,0 @@
-default

modules/privatesales/.hg/cache/branchheads

@@ -1,2 +0,0 @@
-ce0a13d9b6fc2b97d932a265ec436ff5a411015b 32
-ce0a13d9b6fc2b97d932a265ec436ff5a411015b default

modules/privatesales/.hg/cache/tags

@@ -1,2 +0,0 @@
-32 ce0a13d9b6fc2b97d932a265ec436ff5a411015b
-

modules/privatesales/.hg/hgrc

@@ -1,2 +0,0 @@
-[paths]
-default = ssh://ewen@localhost//hg/privatesales

modules/privatesales/.hg/requires

@@ -1,4 +0,0 @@
-revlogv1
-fncache
-store
-dotencode

modules/privatesales/.hg/store/fncache

@@ -1,38 +0,0 @@
-data/featured.php.i
-data/AdminPrivateSalesSales.php.i
-data/showsale.php.i
-data/featured_brand.tpl.i
-data/dropdown.gif.i
-data/AdminPrivateSales.php.i
-data/home.tpl.i
-data/dropdown_hover.gif.i
-data/trailer.tpl.i
-data/img/index.html.i
-data/atom.tpl.i
-data/product.tpl.i
-data/dropdown_active.gif.i
-data/category.tpl.i
-data/Sale.php.i
-data/AdminPrivateSales.gif.i
-data/fr.php.i
-data/feed.php.i
-data/dropdown.blue.active.png.i
-data/privatesale.js.i
-data/header.tpl.i
-data/privatesales.php.i
-data/cron.php.i
-data/prefs.gif.i
-data/salechange.php.i
-data/jQuery.tubeplayer.min.js.i
-data/table.png.i
-data/config.xml.i
-data/featured.tpl.i
-data/dropdown.blue.hover.png.i
-data/dropdown.blue.png.i
-data/rss.tpl.i
-data/add.png.i
-data/jquery.multiSelect.js.i
-data/salechange.tpl.i
-data/trailer.php.i
-data/footer.tpl.i
-data/logo.gif.i

modules/privatesales/.hg/undo.branch

@@ -1 +0,0 @@
-default

modules/privatesales/.hg/undo.desc

@@ -1,3 +0,0 @@
-0
-pull
-ssh://ewen@localhost//hg/privatesales

themes/site/modules/privatesales/home.tpl

@@ -167,7 +167,7 @@
 					<input type="hidden" name="is_new_customer" value="1" />
 					{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />
 					{else}<input type="hidden" class="hidden" name="back" value="{$smarty.const.__PS_BASE_URI__}" />{/if}
-					<input type="submit" name="submitAccount" id="submitAccount" value="{l s='Register' mod='privatesales'}" class="exclusive" onclick="if($('#newsletter:checked').length == 0) { alert('{l s='Please accept our terms of use to continue' js=1}'); return false; }" />
+					<input type="submit" name="submitAccount" id="submitAccount" value="{l s='Register' mod='privatesales'}" class="exclusive" onclick="if($('#newsletter:checked').length == 0) { alert('{l s='Please accept our terms of use to continue' mod='privatesales' js=1}'); return false; }" />
 					<span><sup>*</sup>{l s='Required field' mod='privatesales'}</span>
 				</p>
 			</fieldset>