dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix update english key of translations in all files

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14143 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-03-14 12:25:51 +00:00
parent b217bc4ad8
commit 0e9e23aaae
553 changed files with 17474 additions and 20745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+4 -4
View File
@@ -28,12 +28,12 @@
<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 0}selected="selected"{/if}>{l s='Shipping excluded'}</option>
<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 1}selected="selected"{/if}>{l s='Shipping included'}</option>
</select>
<p class="preference_description">{l s='You can choose a minimum amount for the cart either with or without the taxes, with or without shipping.'}</p>
<p class="preference_description">{l s='You can choose a minimum amount for the cart either with or without the taxes, and with or without shipping.'}</p>
</div>
<label>{l s='Total available'}</label>
<div class="margin-form">
<input type="text" name="quantity" value="{$currentTab->getFieldValue($currentObject, 'quantity')|intval}" />
<p class="preference_description">{l s='The cart rule will be applied to the X first customers only.'}</p>
<p class="preference_description">{l s='The cart rule will be applied to the first X customers only.'}</p>
</div>
<label>{l s='Total available for each user'}</label>
<div class="margin-form">
@@ -138,7 +138,7 @@
{/if}
{if $cart_rules.unselected|@count + $cart_rules.selected|@count > 0}
<br />
<input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} /> <strong>{l s='Other cart rules compatibility'}</strong>
<input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} /> <strong>{l s='Compatibility with other cart rules'}</strong>
<div id="cart_rule_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3">
<table>
<tr>
@@ -177,7 +177,7 @@
{/foreach}
</table>
<a href="javascript:addProductRuleGroup();">
<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" /> {l s='Add a new rule group'}
<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" /> {l s='Product selection'}
</a>
</div>
{if $shops.unselected|@count + $shops.selected|@count > 1}
admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+1 -1
View File
@@ -33,7 +33,7 @@
{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
<div id="cart_rule_informations" class="cart_rule_tab">
<h4>{l s='Cart rule informations'}</h4>
<h4>{l s='Cart rule information'}</h4>
<div class="separation"></div>
{include file='controllers/cart_rules/informations.tpl'}
</div>
admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
+1 -1
View File
@@ -40,7 +40,7 @@
<label>{l s='Priority'}</label>
<div class="margin-form">
<input type="text" name="priority" value="{$currentTab->getFieldValue($currentObject, 'priority')|intval}" />
<p class="preference_description">{l s='Cart rules are applied to the cart by priority. A cart rule with priority of "1" will be processed before a cart rule with a priority of "2".'}</p>
<p class="preference_description">{l s='Cart rules are applied to the cart by priority. A cart rule with priority of \\"1\\" will be processed before a cart rule with a priority of \\"2\\".'}</p>
</div>
<label>{l s='Status'}</label>
<div class="margin-form">