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

//Changed English strings using the translationsenglish module.

Browse Source
This commit is contained in:
djfm
2013-01-04 16:58:58 +01:00
parent cb818d1ece
commit 714a5e08cc
319 changed files with 5991 additions and 5991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin-dev/backup.php
View File

@@ -39,7 +39,7 @@ if ($tabAccess['view'] !== '1')
$backupdir = realpath(_PS_ADMIN_DIR_ . '/backups/');
if ($backupdir === false)
die (Tools::displayError('Backups directory does not exist.'));
die (Tools::displayError('"Backup" directory does not exist.'));
if (!$backupfile = Tools::getValue('filename'))
die (Tools::displayError('No file specified'));

2
admin-dev/functions.php
View File

@@ -265,7 +265,7 @@ function checkingTab($tab)
$adminObj = new $tab;
if (!$adminObj->viewAccess() AND ($adminObj->table != 'employee' OR Context::getContext()->employee->id != Tools::getValue('id_employee') OR !Tools::isSubmit('updateemployee')))
{
$adminObj->_errors = array(Tools::displayError('Access denied'));
$adminObj->_errors = array(Tools::displayError('Access denied.'));
echo $adminObj->displayErrors();
return false;
}

2
admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
View File

@@ -369,7 +369,7 @@
{if !count($modules)}
<tr>
<td colspan="3">{l s='No modules installed'}</td>
<td colspan="3">{l s='No modules are installed'}</td>
</tr>
{else}
{foreach $modules[$profile.id_profile] AS $module}

2
admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
View File

@@ -37,7 +37,7 @@
{/if}
{if $input.type == 'text_customer' && !isset($customer)}
<label>{l s='Customer e-mail'}</label>
<label>{l s='Customer email'}</label>
{else}
{$smarty.block.parent}
{/if}

20
admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
View File

@@ -24,8 +24,8 @@
*}
<script type="text/javascript">
i18n_tax_exc = '{l s='Tax Excl.:'} ';
i18n_tax_inc = '{l s='Tax Incl.:'} ';
i18n_tax_exc = '{l s='Tax Excluded'} ';
i18n_tax_inc = '{l s='Tax Included'} ';
var product_tax = '{$tax_rates}';
function calcPrice(element, element_has_tax)
@@ -75,9 +75,9 @@
</div>
</div>
<div style="float: left; width: 570px;">
<div class="hint" style="width: 570px; padding-left: 45px; margin-bottom: 15px; display: block; position: inherit;">{l s='The Combinations Generator is a tool which allows you to easily create a series of combinations by selecting the related attributes. For example, if you are selling T-Shirts in 3 different sizes and 2 different colors, the Generator will create 6 combinations for you.'}</div>
<p>{l s='You are currently generating combinations for the following product:'} <b>{$product_name|escape:'htmlall':'UTF-8'}</b></p>
<h4>{l s='Step 1: On the left side, Select the attributes you want to use (Hold down the "CTRL" Key on your keyboard and validate by clicking on "Add")'}</h4>
<div class="hint" style="width: 570px; padding-left: 45px; margin-bottom: 15px; display: block; position: inherit;">{l s='The Combinations Generator is a tool that allows you to easily create a series of combinations by selecting the related attributes. For example, if you\'re selling t-shirts in three different sizes and two different colors, the generator will create six combinations for you.'}</div>
<p>{l s='You\'re currently generating combinations for the following product:'} <b>{$product_name|escape:'htmlall':'UTF-8'}</b></p>
<h4>{l s='Step 1: On the left side, select the attributes you want to use (Hold down the "Ctrl" key on your keyboard and validate by clicking on "Add")'}</h4>
<div>
{foreach $attribute_groups as $k => $attribute_group}
{if isset($attribute_js[$attribute_group['id_attribute_group']])}
@@ -85,8 +85,8 @@
<thead>
<tr>
<th id="tab_h1" style="width: 150px">{$attribute_group['name']|escape:'htmlall':'UTF-8'}</th>
<th id="tab_h2" style="width: 350px" colspan="2">{l s='Impact on the Product Price'} ({$currency_sign})</th>
<th style="width: 150px">{l s='Impact on the Product Weight'} ({$weight_unit})</th>
<th id="tab_h2" style="width: 350px" colspan="2">{l s='Impact on the product price'} ({$currency_sign})</th>
<th style="width: 150px">{l s='Impact on the product weight'} ({$weight_unit})</th>
</tr>
</thead>
<tbody id="table_{$attribute_group['id_attribute_group']}" name="result_table">
@@ -103,7 +103,7 @@
{/if}
{/foreach}
</div>
<h4>{l s='Step 2 (optional): Select a default Quantity and Reference for all the combinations that the Generator will create for this product'}</h4>
<h4>{l s='Select a default quantity, and reference, for each combination the generator will create for this product.'}</h4>
<table border="0" class="table" cellpadding="0" cellspacing="0">
<tr>
<td>{l s='Default Quantity:'}</td>
@@ -114,8 +114,8 @@
<td><input type="text" size="20" name="reference" value="{$product_reference|escape:'htmlall':'UTF-8'}" /></td>
</tr>
</table>
<h4>{l s='Finally, click on "Generate these combinations"'}</h4>
<p><input type="submit" class="button" style="margin-bottom:5px;" name="generate" value="{l s='Generate these combinations'}" /></p>
<h4>{l s='Please click on "Generate these Combinations"'}</h4>
<p><input type="submit" class="button" style="margin-bottom:5px;" name="generate" value="{l s='Generate these Combinations'}" /></p>
</div>
</fieldset>
</form>

36
admin-dev/themes/default/template/controllers/backup/download/view.tpl
View File

@@ -31,22 +31,22 @@
<legend><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /> {l s='Download'}</legend>
<p style="font-size: 13px;">
<a href="{$backup_url}"><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /></a>
<b><a href="{$backup_url}">{l s='Download the Backup file'} ({$backup_weight}{l s='MB'})</a></b><br /><br />
{l s='Tip: You can also download this file over your FTP. Backup files are located in "admin/backups" directory.'}</p>
<b><a href="{$backup_url}">{l s='Download the backup file'} ({$backup_weight}{l s='MB'})</a></b><br /><br />
{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}</p>
</fieldset><br /><br />
<div class="error width1" style="float: left; margin-right: 10px;">
<p>{l s='Disclaimer before creating a new Backup'}</p>
<p>{l s='Disclaimer before creating a new backup'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px; padding-left: 10px;">
<li>{l s='PrestaShop is not responsible for your database, Backups, data and recovery.'}</li>
<li>{l s='PrestaShop is Open-source software, you are using it at your own risk under the license agreement.'}</li>
<li>{l s='You should Backup your data on a regular basis (both files and database).'}</li>
<li>{l s='PrestaShop is not responsible for your database, its backups and/or recovery.'}</li>
<li>{l s='PrestaShop is open-source software. You are using it at your own risk under the license agreement.'}</li>
<li>{l s='You should backup your data on a regular basis (both files and database).'}</li>
<li>{l s='This function only backs up your database, not your files.'}</li>
<li>{l s='By default, your existing database tables will be dropped during Backup recovery (see "Backup options" below).'}</li>
<li>{l s='Always verify the quality and integrity of your Backup files.'}</li>
<li>{l s='Always verify that your Backup files are complete, up-to-date and valid, even if you had a success message during the Backup process.'}</li>
<li>{l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}</li>
<li>{l s='Always verify the quality and integrity of your backup files!'}</li>
<li>{l s='Always verify that your backup files are complete, up-to-date and valid, even if you had a success message appear during the backup process.'}</li>
<li>{l s='Always check your data.'}</li>
<li>{l s='Never restore a Backup on a live site.'}</li>
<li>{l s='Never restore a backup on a live site.'}</li>
</ol>
</div>
@@ -54,15 +54,15 @@
<p>{l s='How to restore a database Backup in 10 easy steps:'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px;">
<li>{l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}</li>
<li>{l s='Download the Backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
<li>{l s='Check the Backup integrity: look for errors, incomplete file, etc. Be sure to verify all your data.'}</li>
<li>{l s='Ask your hosting provider for "phpMyAdmin" access to your database'}</li>
<li>{l s='Connect to "phpMyAdmin" and select your current database'}</li>
<li>{l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
<li>{l s='Check the backup integrity: Look for errors, incomplete file, etc... Be sure to verify all of your data.'}</li>
<li>{l s='Please ask your hosting provider for "phpMyAdmin" access to your database.'}</li>
<li>{l s='Connect to "phpMyAdmin" and select your current database.'}</li>
<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
<li>{l s='At the top of the screen select the "Import" tab'}</li>
<li>{l s='Click on the "Browse..." button and select the Backup file from your hard drive'}</li>
<li>{l s='Check the max. allowed filesize (e.g. Max: 16MB)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
<li>{l s='Click on the "Go" button and wait during the import, the process can take several minutes'}</li>
<li>{l s='At the top of the screen, please select the "Import" tab'}</li>
<li>{l s='Click on the "Browse" button and select the backup file from your hard drive.'}</li>
<li>{l s='Check the max. allowed filesize (e.g. Max: 16MB)'}<br />{l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}</li>
<li>{l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}</li>
</ol>
</div>

38
admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
View File

@@ -32,28 +32,28 @@
<legend><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /> {l s='Download'}</legend>
<p style="font-size: 13px;">
<a href="{$backup_url}"><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /></a>
<b><a href="{$backup_url}">{l s='Download the Backup file'} ({$backup_weight}{l s='MB'})</a></b><br /><br />
{l s='Tip: You can also download this file over your FTP. Backup files are located in "admin/backups" directory.'}</p>
<b><a href="{$backup_url}">{l s='Download the backup file'} ({$backup_weight}{l s='MB'})</a></b><br /><br />
{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}</p>
</fieldset><br /><br />
{/if}
<div class="error width1" style="float: left; margin-right: 10px;">
<p>{l s='Disclaimer before creating a new Backup'}</p>
<p>{l s='Disclaimer before creating a new backup'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px; padding-left: 10px;">
<li>{l s='PrestaShop is not responsible for your database, Backups, data and recovery.'}</li>
<li>{l s='PrestaShop is Open-source software, you are using it at your own risk under the license agreement.'}</li>
<li>{l s='You should Backup your data on a regular basis (both files and database).'}</li>
<li>{l s='PrestaShop is not responsible for your database, its backups and/or recovery.'}</li>
<li>{l s='PrestaShop is open-source software. You are using it at your own risk under the license agreement.'}</li>
<li>{l s='You should backup your data on a regular basis (both files and database).'}</li>
<li>{l s='This function only backs up your database, not your files.'}</li>
<li>{l s='By default, your existing database tables will be dropped during Backup recovery (see "Backup options" below).'}</li>
<li>{l s='Always verify the quality and integrity of your Backup files.'}</li>
<li>{l s='Always verify that your Backup files are complete, up-to-date and valid, even if you had a success message during the Backup process.'}</li>
<li>{l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}</li>
<li>{l s='Always verify the quality and integrity of your backup files!'}</li>
<li>{l s='Always verify that your backup files are complete, up-to-date and valid, even if you had a success message appear during the backup process.'}</li>
<li>{l s='Always check your data.'}</li>
<li>{l s='Never restore a Backup on a live site.'}</li>
<li>{l s='Never restore a backup on a live site.'}</li>
</ol>
<br />
<form action="{$currentIndex}&add{$table}&token={$token}" method="post" style="text-align:center;">
<input type="submit" class="button" value="{l s='I have read the disclaimer - Create a new Backup'}" style="padding:10px;font-weight:bold;border:1px solid;cursor:pointer;" />
<input type="submit" class="button" value="{l s='I have read the disclaimer. Please create a new backup.'}" style="padding:10px;font-weight:bold;border:1px solid;cursor:pointer;" />
</form>
</div>
@@ -62,15 +62,15 @@
<p>{l s='How to restore a database Backup in 10 easy steps:'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px;">
<li>{l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}</li>
<li>{l s='Download the Backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
<li>{l s='Check the Backup integrity: look for errors, incomplete file, etc. Be sure to verify all your data.'}</li>
<li>{l s='Ask your hosting provider for "phpMyAdmin" access to your database'}</li>
<li>{l s='Connect to "phpMyAdmin" and select your current database'}</li>
<li>{l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
<li>{l s='Check the backup integrity: Look for errors, incomplete file, etc... Be sure to verify all of your data.'}</li>
<li>{l s='Please ask your hosting provider for "phpMyAdmin" access to your database.'}</li>
<li>{l s='Connect to "phpMyAdmin" and select your current database.'}</li>
<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
<li>{l s='At the top of the screen select the "Import" tab'}</li>
<li>{l s='Click on the "Browse..." button and select the Backup file from your hard drive'}</li>
<li>{l s='Check the max. allowed filesize (e.g. Max: 16MB)'}<br />{l s='If your Backup file exceeds this limit, contact your hosting provider'}</li>
<li>{l s='Click on the "Go" button and wait during the import, the process can take several minutes'}</li>
<li>{l s='At the top of the screen, please select the "Import" tab'}</li>
<li>{l s='Click on the "Browse" button and select the backup file from your hard drive.'}</li>
<li>{l s='Check the max. allowed filesize (e.g. Max: 16MB)'}<br />{l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}</li>
<li>{l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}</li>
</ol>
</div>

4
admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl
View File

@@ -27,9 +27,9 @@
{block name="override_tpl"}
<div class="conf">{l s='Beginning download ...'}</div>
<div class="conf">{l s='Beginning the download ...'}</div>
<p>{l s='Backup file should automatically download.'}</p>
<p>{l s='Backup files should automatically download.'}</p>
<p>{l s='If not,'} <b><a href="{$url_backup}">{l s='please click here!'}</a></b></p>

2
admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
View File

@@ -43,7 +43,7 @@
</div>
</div>
<div id="apply_discount_to_div">
<label>{l s='Apply discount to'}</label>
<label>{l s='Apply a discount to'}</label>
<div class="margin-form">
&nbsp;&nbsp;
<input type="radio" name="apply_discount_to" id="apply_discount_to_order" value="order" {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == 0}checked="checked"{/if} />

12
admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
View File

@@ -2,17 +2,17 @@
<div class="margin-form">
<input type="hidden" id="id_customer" name="id_customer" value="{$currentTab->getFieldValue($currentObject, 'id_customer')|intval}" />
<input type="text" id="customerFilter" name="customerFilter" value="{$customerFilter|escape:'htmlall':'UTF-8'}" style="width:400px" />
<p class="preference_description">{l s='Optional, the cart rule will be available for everyone if you leave this field blank.'}</p>
<p class="preference_description">{l s='Optional: The cart rule will be available to everyone if you leave this field blank.'}</p>
</div>
<label>{l s='Valid'}</label>
<div class="margin-form">
<strong>{l s='from'}</strong>
<strong>{l s='From'}</strong>
<input type="text" class="datepicker" name="date_from"
value="{if $currentTab->getFieldValue($currentObject, 'date_from')}{$currentTab->getFieldValue($currentObject, 'date_from')|escape}{else}{$defaultDateFrom}{/if}" />
<strong>{l s='to'}</strong>
<strong>{l s='To'}</strong>
<input type="text" class="datepicker" name="date_to"
value="{if $currentTab->getFieldValue($currentObject, 'date_to')}{$currentTab->getFieldValue($currentObject, 'date_to')|escape}{else}{$defaultDateTo}{/if}" />
<p class="preference_description">{l s='Default period is one month.'}</p>
<p class="preference_description">{l s='The default period is one month.'}</p>
</div>
<label>{l s='Minimum amount'}</label>
<div class="margin-form">
@@ -37,14 +37,14 @@
<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, and 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 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 first X customers only.'}</p>
</div>
<label>{l s='Total available for each user'}</label>
<label>{l s='Total available for each user.'}</label>
<div class="margin-form">
<input type="text" name="quantity_per_user" value="{$currentTab->getFieldValue($currentObject, 'quantity_per_user')|intval}" />
<p class="preference_description">{l s='A customer will only be able to use the cart rule X time(s).'}</p>

8
admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
View File

@@ -11,12 +11,12 @@
</div>
{/foreach}
</div>
<p class="preference_description">{l s='Will be displayed in the cart summary as well as on the invoice.'}</p>
<p class="preference_description">{l s='This will be displayed in the cart summary, as well as on the invoice.'}</p>
</div>
<label>{l s='Description'}</label>
<div class="margin-form">
<textarea name="description" style="width:80%;height:100px">{$currentTab->getFieldValue($currentObject, 'description')|escape}</textarea>
<p class="preference_description">{l s='For you only, never displayed to the customer.'}</p>
<p class="preference_description">{l s='For your eyes only. This will never be displayed to the customer.'}</p>
</div>
<label>{l s='Code'}</label>
<div class="margin-form">
@@ -46,13 +46,13 @@
<label class="t" for="partial_use_off"> <img src="../img/admin/disabled.gif" alt="{l s='Not allowed'}" title="{l s='Not allowed'}" style="cursor:pointer" /></label>
<p class="preference_description">
{l s='Only applicable if the voucher value is greater than the cart total.'}<br />
{l s='If you do not allow partial use, the voucher value will be lowered to the total order amount, but if you do, a new voucher will be created with the remainder.'}
{l s='If you do not allow partial use, the voucher value will be lowered to the total order amount. If you allow partial use, however, a new voucher will be created with the remainder.'}
</p>
</div>
<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 by priority. A cart rule with a 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">

2
admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
View File

@@ -8,7 +8,7 @@
<input type="hidden" name="product_rule_{$product_rule_group_id|intval}[]" value="{$product_rule_id}" />
<input type="hidden" name="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_type" value="{$product_rule_type|escape}" />
{* Everything is on a single line in order to avoid a empty space between the [ ] and the word *}
[{if $product_rule_type == 'products'}{l s='Products'}{elseif $product_rule_type == 'categories'}{l s='Categories'}{elseif $product_rule_type == 'manufacturers'}{l s='Manufacturers'}{elseif $product_rule_type == 'suppliers'}{l s='Suppliers'}{elseif $product_rule_type == 'attributes'}{l s='Attributes'}{/if}]
[{if $product_rule_type == 'products'}{l s='Products:'}{elseif $product_rule_type == 'categories'}{l s='Categories:'}{elseif $product_rule_type == 'manufacturers'}{l s='Manufacturers:'}{elseif $product_rule_type == 'suppliers'}{l s='Suppliers:'}{elseif $product_rule_type == 'attributes'}{l s='Attributes'}{/if}]
</td>
<td>
{l s='The product(s) are matching on of these'}

10
admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl
View File

@@ -8,7 +8,7 @@
<input type="hidden" name="product_rule_group[]" value="{$product_rule_group_id|intval}" />
{l s='The cart must contain at least'}
<input type="text" name="product_rule_group_{$product_rule_group_id|intval}_quantity" value="{$product_rule_group_quantity|intval}" style="width:30px" />
{l s='product(s) matching the following rules:'}
{l s='Product(s) matching the following rules:'}
<br />
<a href="javascript:addProductRule({$product_rule_group_id|intval});">
<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" />
@@ -16,11 +16,11 @@
</a>
<select id="product_rule_type_{$product_rule_group_id|intval}">
<option value="">{l s='-- Choose --'}</option>
<option value="products">{l s='Products'}</option>
<option value="products">{l s='Products:'}</option>
<option value="attributes">{l s='Attributes'}</option>
<option value="categories">{l s='Categories'}</option>
<option value="manufacturers">{l s='Manufacturers'}</option>
<option value="suppliers">{l s='Suppliers'}</option>
<option value="categories">{l s='Categories:'}</option>
<option value="manufacturers">{l s='Manufacturers:'}</option>
<option value="suppliers">{l s='Suppliers:'}</option>
</select>
<a href="javascript:addProductRule({$product_rule_group_id|intval});">
<input type="button" class="button" value="OK" />

12
admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
View File

@@ -28,7 +28,7 @@
{block name="override_tpl"}
<div id="container-customer">
<h2><img src="../img/admin/basket.png" /><span>{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"}</span><span style="color:#585A69;padding-left:10px;">{l s='on'} {$cart->date_upd}</span></h2>
<h2><img src="../img/admin/basket.png" /><span>{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"}</span><span style="color:#585A69;padding-left:10px;">{l s='On'} {$cart->date_upd}</span></h2>
<div class="separation"></div>
<div class="info-customer-left">
@@ -54,15 +54,15 @@
<br /><br />
{l s='Made on:'} {dateFormat date=$order->date_add}<br /><br /><br /><br />
{else}
{l s='No order created from this cart'}</span>
{if $customer->id}<p><a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&id_cart={$cart->id}&addorder">{l s='Create an order with from cart'}</a></p>{/if}
{l s='No order was created from this cart.'}</span>
{if $customer->id}<p><a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&id_cart={$cart->id}&addorder">{l s='Create an order from this cart.'}</a></p>{/if}
{/if}
</div>
<br style="clear:both;" />
<div class="separation"></div>
<h2><img src="../img/admin/cart.gif" alt="{l s='Products'}" />{l s='Cart summary'}</h2>
<h2><img src="../img/admin/cart.gif" alt="{l s='Products:'}" />{l s='Cart summary'}</h2>
<br/>
<table style="width:100%;" cellspacing="0" cellpadding="0" class="table" id="orderProducts">
<thead>
@@ -150,7 +150,7 @@
{/if}
{if $total_wrapping > 0}
<tr class="cart_total_voucher">
<td colspan="5">{l s='Total gift-wrapping:'}</td>
<td colspan="5">{l s='Total cost of gift wrapping:'}</td>
<td class="price-discount bold right">{displayWtPriceWithCurrency price=$total_wrapping currency=$currency}</td>
</tr>
{/if}
@@ -181,7 +181,7 @@
</table>
{/if}
<div style="float:left; margin-top:15px;">
{l s='For this customer\'s group, prices are displayed as:'} <b>{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC}{l s='tax excluded'}{else}{l s='tax included'}{/if}</b>
{l s='For this particular customer group, prices are displayed as:'} <b>{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC}{l s='Tax excluded'}{else}{l s='Tax included'}{/if}</b>
</div>
<div class="clear" style="height:20px;">&nbsp;</div>

2
admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
View File

@@ -32,7 +32,7 @@
{$fields_value.image}
<p align="center">{l s='File size'} {$fields_value.size}kb</p>
{if $shared_category}
<p class="warn">{l s='If you delete this picture it\'s will be deleted for all shared shop'}</p>
<p class="warn">{l s='If you delete this picture, it will be deleted in all of your shared shops!'}</p>
{/if}
<br>
<a href="{$current}&{$identifier}={$form_id}&token={$token}&{if $shared_category}forcedeleteImage=1{else}deleteImage=1{/if}">

8
admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
View File

@@ -47,7 +47,7 @@
<div class="warn">
<h2>
{if $need_delete_mode}
{l s='Do you want to delete products too?'}
{l s='Do you want to delete the products too?'}
{else}
{l s='Deleting this category will remove products linked only within this category and no others. Are you sure you want to continue?'}
{/if}
@@ -56,15 +56,15 @@
<ul class="listForm">
<li>
<input type="radio" name="deleteMode" value="linkanddisable" id="deleteMode_linkanddisable" />
<label for="deleteMode_linkanddisable" style="float:none;">{l s='No, I want to link products without other categories within the parent category and then disable them.'}</label>
<label for="deleteMode_linkanddisable" style="float:none;">{l s='No. I want to link products without other categories -- within the parent category -- and then disable them.'}</label>
</li>
<li>
<input type="radio" name="deleteMode" value="link" id="deleteMode_link" />
<label for="deleteMode_link" style="float:none;">{l s='No, I want to link products without other categories within the parent category.'}</label>
<label for="deleteMode_link" style="float:none;">{l s='No. I want to link products without other categories and within the parent category.'}</label>
</li>
<li>
<input type="radio" name="deleteMode" value="delete" id="deleteMode_delete" />
<label for="deleteMode_delete" style="float:none">{l s='Yes, I want to remove products linked only within this category and no others.'}</label>
<label for="deleteMode_delete" style="float:none">{l s='Yes. I want to remove products linked only within this category and no others.'}</label>
</li>
</ul>
{else}

6
admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
View File

@@ -67,15 +67,15 @@
});
$('#useLastDefaultLayout').mouseover(function() {
switchExplanationText("{l s='This will restore your last registered address format'}");
switchExplanationText("{l s='This will restore your last registered address format.'}");
});
$('#useDefaultLayoutSystem').mouseover(function() {
switchExplanationText("{l s='This will restore the default address format for this country'}");
switchExplanationText("{l s='This will restore the default address format for this country.'}");
});
$('#useCurrentLastModifiedLayout').mouseover(function() {
switchExplanationText("{l s='This will restore your current address format'}");
switchExplanationText("{l s='This will restore your current address format.'}");
});
$('#eraseCurrentLayout').mouseover(function() {

10
admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl
View File

@@ -51,12 +51,12 @@
</p>
<div id="message_forward_email" style="display:none">
<b>{l s='E-mail'}</b> <input type="text" name="email" />
<b>{l s='Email:'}</b> <input type="text" name="email" />
</div>
<div id="message_forward" style="display:none;margin-bottom:10px">
<textarea name="message_forward" style="width:500px;height:80px;margin-top:15px;">{l s='You can add a comment here.'}</textarea><br />
<input type="Submit" name="submitForward" class="button" value="{l s='Forward this discussion'}" style="margin-top: 10px;" />
<input type="Submit" name="submitForward" class="button" value="{l s='Forward this discussion.'}" style="margin-top: 10px;" />
</div>
</fieldset>
@@ -74,9 +74,9 @@
<tr>
<th class="center">{l s='ID'}</th>
<th class="center">{l s='Date'}</th>
<th class="center">{l s='Products'}</th>
<th class="center">{l s='Products:'}</th>
<th class="center">{l s='Total paid'}</th>
<th class="center">{l s='Payment'}</th>
<th class="center">{l s='Payment: '}</th>
<th class="center">{l s='State'}</th>
<th class="center">{l s='Actions'}</th>
</tr>
@@ -106,7 +106,7 @@
{/if}
{if $products && count($products)}
<div>
<h2>{l s='Products'}</h2>
<h2>{l s='Products:'}</h2>
<table cellspacing="0" cellpadding="0" class="table">
<tr>
<th class="center">{l s='Date'}</th>

8
admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
View File

@@ -37,16 +37,16 @@
{if isset($delete_customer) && $delete_customer}
<form action="{$REQUEST_URI}" method="post">
<div class="warn">
<h2>{l s='How do you want to delete your customer(s)?'}</h2>
<p>{l s='You have two ways to delete a customer, please choose what you want to do.'}</p>
<h2>{l s='How do you want to delete these customer(s)?'}</h2>
<p>{l s='There are two ways of deleting a customer. Please choose your preferred method.'}</p>
<ul class="listForm">
<li>
<input type="radio" name="deleteMode" value="real" id="deleteMode_real" />
<label for="deleteMode_real" style="float:none;">{l s='I want to delete my customer(s) for real. All data will be removed from the database. A customer with the same e-mail address will be able to register again.'}</label>
<label for="deleteMode_real" style="float:none;">{l s='I want to delete my customer(s) (All data will be removed from the database, and customers with the same e-mail address will be able to re-register.'}</label>
</li>
<li>
<input type="radio" name="deleteMode" value="deleted" id="deleteMode_deleted" />
<label for="deleteMode_deleted" style="float:none">{l s='I don\'t want my customer(s) to register again. The customer(s) will be removed from this list but all data will be kept in the database.'}</label>
<label for="deleteMode_deleted" style="float:none">{l s='I don\'t want my customer(s) to register again. Therefore, each customer(s) will be removed from this list but all corresponding data will be kept in the database.'}</label>
</li>
</ul>
{foreach $POST as $key => $value}

32
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
View File

@@ -41,13 +41,13 @@
$('#note_feedback').html('').hide();
if (r == 'ok')
{
$('#note_feedback').html("<b style='color:green'>{l s='Your note has been saved'}</b>").fadeIn(400);
$('#note_feedback').html("<b style='color:green'>{l s='Your note has been saved.'}</b>").fadeIn(400);
$('#submitCustomerNote').attr('disabled', true);
}
else if (r == 'error:validation')
$('#note_feedback').html("<b style='color:red'>({l s='Error: your note is not valid'}</b>").fadeIn(400);
$('#note_feedback').html("<b style='color:red'>({l s='Error: Your note is not valid.'}</b>").fadeIn(400);
else if (r == 'error:update')
$('#note_feedback').html("<b style='color:red'>{l s='Error: cannot save your note'}</b>").fadeIn(400);
$('#note_feedback').html("<b style='color:red'>{l s='Error: Your note cannot be saved.'}</b>").fadeIn(400);
$('#note_feedback').fadeOut(3000);
}
});
@@ -82,22 +82,22 @@
</a>
</div>
{l s='Newsletter:'} {if $customer->newsletter}<img src="../img/admin/enabled.gif" />{else}<img src="../img/admin/disabled.gif" />{/if}<br />
{l s='Opt-in:'} {if $customer->optin}<img src="../img/admin/enabled.gif" />{else}<img src="../img/admin/disabled.gif" />{/if}<br />
{l s='Opt in:'} {if $customer->optin}<img src="../img/admin/enabled.gif" />{else}<img src="../img/admin/disabled.gif" />{/if}<br />
{l s='Age:'} {$customer_stats['age']} {if isset($customer->birthday['age'])}({$customer_birthday}){else}{l s='unknown'}{/if}<br /><br />
{l s='Last update:'} {$last_update}<br />
{l s='Status:'} {if $customer->active}<img src="../img/admin/enabled.gif" />{else}<img src="../img/admin/disabled.gif" />{/if}
{if $customer->isGuest()}
<div>
{l s='This customer is registered as'} <b>{l s='guest'}</b>
{l s='This customer is registered as.'} <b>{l s='guest'}</b>
{if !$customer_exists}
<form method="post" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
<input type="hidden" name="id_lang" value="{$id_lang}" />
<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform to customer account'}" /></p>
{l s='This feature generates a random password and sends an e-mail to the customer'}
{l s='This feature generates a random password before sending an email to your customer.'}
</form>
{else}
</div><div><b style="color:red;">{l s='A registered customer account already exists with this e-mail address'}</b>
</div><div><b style="color:red;">{l s='A registered customer account using the defined email address already exists. '}</b>
{/if}
</div>
{/if}
@@ -110,10 +110,10 @@
<h2>
<img src="../img/admin/cms.gif" /> {l s='Add a private note'}
</h2>
<p>{l s='This note will be displayed to all employees but not to the customer.'}</p>
<p>{l s='This note will be displayed to all employees but not to customers.'}</p>
<form action="ajax.php" method="post" onsubmit="saveCustomerNote();return false;" id="customer_note">
<textarea name="note" id="noteContent" style="width:600px;height:100px" onkeydown="$('#submitCustomerNote').removeAttr('disabled');">{$customer_note}</textarea><br />
<input type="submit" id="submitCustomerNote" class="button" value="{l s=' Save '}" style="float:left;margin-top:5px" disabled="disabled" />
<input type="submit" id="submitCustomerNote" class="button" value="{l s='Save '}" style="float:left;margin-top:5px" disabled="disabled" />
<span id="note_feedback" style="position:relative; top:10px; left:10px;"></span>
</form>
</div>
@@ -202,9 +202,9 @@
<tr>
<th height="39px" class="center">{l s='ID'}</th>
<th class="left">{l s='Date'}</th>
<th class="left">{l s='Payment'}</th>
<th class="left">{l s='Payment: '}</th>
<th class="left">{l s='State'}</th>
<th class="left">{l s='Products'}</th>
<th class="left">{l s='Products:'}</th>
<th class="left">{l s='Total spent'}</th>
<th class="center">{l s='Actions'}</th>
</tr>
@@ -239,9 +239,9 @@
<tr>
<th height="39px" class="center">{l s='ID'}</th>
<th class="center">{l s='Date'}</th>
<th class="center">{l s='Payment'}</th>
<th class="center">{l s='Payment: '}</th>
<th class="center">{l s='State'}</th>
<th class="center">{l s='Products'}</th>
<th class="center">{l s='Products:'}</th>
<th class="center">{l s='Total spent'}</th>
<th class="center">{l s='Actions'}</th>
</tr>
@@ -266,7 +266,7 @@
{if $products AND count($products)}
<div class="clear">&nbsp;</div>
<h2>{l s='Products'} ({count($products)})</h2>
<h2>{l s='Products:'} ({count($products)})</h2>
<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
<colgroup>
<col width="50px">
@@ -394,13 +394,13 @@
{/foreach}
</table>
{else}
{l s='No cart available'}.
{l s='No cart is available'}.
{/if}
</div>
{if count($interested)}
<div>
<h2>{l s='Products'} ({count($interested)})</h2>
<h2>{l s='Products:'} ({count($interested)})</h2>
<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
<colgroup>
<col width="10px">

10
admin-dev/themes/default/template/controllers/emails/content.tpl
View File

@@ -24,12 +24,12 @@
*}
<script type="text/javascript">
var textMsg = "{l s='This is a test message, your server is now configured to send e-mail' js=1}";
var textSubject = "{l s='Test message - Prestashop' js=1}";
var textSendOk = "{l s='A test e-mail has been sent to the e-mail address you specified' js=1}";
var textSendError= "{l s='Error: please check your configuration' js=1}";
var textMsg = "{l s='This is a test message. Your server is now configured to send email.' js=1}";
var textSubject = "{l s='Test message -- Prestashop' js=1}";
var textSendOk = "{l s='A test email has been sent to the email address you provided.' js=1}";
var textSendError= "{l s='Error: Please check your configuration' js=1}";
var token_mail = '{$token}';
var errorMail = "{l s='This e-mail address is invalid' js=1}";
var errorMail = "{l s='This email address is not valid' js=1}";
$(document).ready(function() {
if ($('input[name=PS_MAIL_METHOD]:checked').val() == 2)
$('#smtp').show();

6
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
View File

@@ -106,7 +106,7 @@
if ($(this).attr('name') == 'category_reduction['+$('[name="id_category"]:checked').val()+']')
{
exist = true;
jAlert('{l s='This category already exist for this group'}');
jAlert('{l s='This category already exists for this group.'}');
return false;
}
@@ -182,10 +182,10 @@
<div style="display:none" id="group_discount_category_fancybox">
<fieldset style="text-align:left"><legend><img src="../img/admin/tab-groups.gif" />{l s='New group category discount'}</legend>
<div class="hintGroup" style="font-size: 13px;">
{l s='Caution: the discount applied to a category does not stack with the overall reduction but instead replaces it.'}
{l s='Caution: The discount applied to a category does not stack with the overall reduction but instead replaces it.'}
</div>
{$categoryTreeView}
<div class="warn">{l s='Only products that have this category as the default category will be affected'}</div>
<div class="warn">{l s='Only products that have this category as the default category will be affected.'}</div>
<div class="clear">&nbsp;</div>
<label>{l s='Discount (%):'}</label>
<input type="text" name="category_reduction_fancybox" id="category_reduction_fancybox" value="0.00" size="33">

12
admin-dev/themes/default/template/controllers/home/content.tpl
View File

@@ -34,13 +34,13 @@
{if $upgrade}
<div id="blockNewVersionCheck">
{if $upgrade->need_upgrade}
<div class="warning warn" style="margin-bottom:10px;"><h3>{l s='New version of PrestaShop is available'} : <a style="text-decoration: underline;" href="{$upgrade->link}" target="_blank">{l s='Download'} {$upgrade->version_name}</a> !</h3></div>
<div class="warning warn" style="margin-bottom:10px;"><h3>{l s='A new version of PrestaShop is available.'} : <a style="text-decoration: underline;" href="{$upgrade->link}" target="_blank">{l s='Download'} {$upgrade->version_name}</a> !</h3></div>
{/if}
</div>
{else}
<p>{l s='Update notification unavailable'}</p>
<p>{l s='Update notifications are unavailable'}</p>
<p>&nbsp;</p>
<p>{l s='To receive PrestaShop update warnings, you need to activate'} <b>allow_url_fopen</b> [<a href="http://www.php.net/manual/{$isoUser}/ref.filesystem.php">{l s='more info on php.net'}</a>]</p>
<p>{l s='To receive PrestaShop update warnings, you need to activate you account. '} <b>allow_url_fopen</b> [<a href="http://www.php.net/manual/{$isoUser}/ref.filesystem.php">{l s='more info on php.net'}</a>]</p>
<p>{l s='If you don\'t know how to do this, please contact your hosting provider!'}</p><br />
{/if}
@@ -51,12 +51,12 @@
<a href="{$protocol}://screencasts.prestashop.com/v1.5/screencast.php?iso_lang={$isoUser}" id="screencast_fancybox"><img height="128" width="220" src="../img/admin/preview_fr.jpg" /><span class="mask-player"></span></a>
</div>
<div id="video-content">
<p>{l s='Take part in the e-commerce adventure with PrestaShop, the fast, powerful, and customizable e-commerce solution. With more than 275 features, PrestaShop will help you create a world of opportunities without limits. Discover the solution that already powers more than 120,000 active stores worldwide!'}</p>
<p>{l s='Take part in the e-commerce adventure with PrestaShop, the best open-source shopping-cart solution on the planet. With more than 310 native features, PrestaShop comes fully equipped to help create a world of opportunity without limits. '}</p>
</div>
<div id="footer_iframe_home">
<!--<a href="#">{l s='View more video tutorials'}</a>-->
<!--<a href="#">{l s='View more video tutorials.'}</a>-->
<input type="checkbox" id="screencast_dont_show_again">
<label for="screencast_dont_show_again">{l s='Do not show again'}</label>
<label for="screencast_dont_show_again">{l s='Do not show me this again.'}</label>
</div>
<div class="separation"></div>
</div>

10
admin-dev/themes/default/template/controllers/images/content.tpl
View File

@@ -30,7 +30,7 @@
{l s='Regenerates thumbnails for all existing images'}<br /><br />
<div class="width4">
<div class="warn">
{l s='Please be patient, this can take several minutes'}<br />
{l s='Please be patient. This can take several minutes.'}<br />
{l s='Be careful! Manually uploaded thumbnails will be erased and replaced by automatically generated thumbnails.'}
</div>
</div>
@@ -78,7 +78,7 @@
{if isset($display_move)}
<br /><h2 class="space">{l s='Move images'}</h2>
{l s='PrestaShop now uses a new storage system for product images. It offers better performance if your shop has a very large number of products.'}<br />
{l s='PrestaShop now uses a new storage system for product images. It offers better performance if your shop has a large number of products.'}<br />
<br />
{if $safe_mode}
<div class="warn">
@@ -88,11 +88,11 @@
<form action="{$current}&token={$token}" method="post">
<fieldset class="width4">
<legend><img src="../img/admin/picture.gif" /> {l s='Move images'}</legend><br />
{l s='You can choose to keep your images stored in the previous system - there is nothing wrong with that.'}<br />
{l s='You can also decide to move your images to the new storage system: in this case, click on the "Move images" button below. Please be patient, this can take several minutes.'}
{l s='You can choose to keep your images stored in the previous system. There\'s nothing wrong with that.'}<br />
{l s='You can also decide to move your images to the new storage system. In this case, click on the "Move images" button below. Please be patient. This can take several minutes.'}
<br /><br />
<div class="hint clear" style="display: block;">&nbsp;
{l s='After moving all your product images, for best performance, set the "Use the legacy image filesystem" option above to "No".'}
{l s='After moving all of your product images, set the "Use the legacy image filesystem" option above to "No" for best performance.'}
</div>
<center><input type="Submit" name="submitMoveImages{$table}" value="{l s='Move images'}" class="button space" onclick="return confirm('{l s='Are you sure?'}');" /></center>
</fieldset>

14
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
View File

@@ -57,7 +57,7 @@
}
else
{
jAlert('{l s='You do not have permission to delete here. When the multi-store is enable, only a SuperAdmin can delete all items before import.'}');
jAlert('{l s='You do not have permission to delete here. When the multistore is enabled, only a SuperAdmin can delete all items before an import.'}');
return false;
}
}
@@ -111,7 +111,7 @@
class="clear">
<fieldset style="float: left; margin: 0pt 20px 0pt 0pt; width: 70%;">
<legend><img src="../img/admin/import.gif" />{l s='Import'}</legend>
<legend><img src="../img/admin/import.gif" />{l s='Import '}</legend>
<label class="clear">{if count($files_to_import) > 1}{l s='Your CSV file (%d files):' sprintf=count($files_to_import)}{else}{l s='Your CSV file (%d file):' sprintf=count($files_to_import)}{/if}</label>
<div class="margin-form">
@@ -142,7 +142,7 @@
</ul>
<div class="clear">&nbsp;</div>
</div>
<label class="clear">{l s='What kind of Entity would you like to import?'} </label>
<label class="clear">{l s='What kind of entity would you like to import?'} </label>
<div class="margin-form">
<select name="entity" id="entity">
{foreach $entities AS $entity => $i}
@@ -184,9 +184,9 @@
<div class="margin-form">
<input name="match_ref" id="match_ref" type="checkbox" style="margin-top: 6px; display:none"/>
</div>
<label for="forceIDs" class="clear">{l s='Force all ids during import?'} </label>
<label for="forceIDs" class="clear">{l s='Force all ID\'s during import?'} </label>
<div class="margin-form">
<input name="forceIDs" id="forceIDs" type="checkbox"/> {l s='If you don\'t use this option, all IDs will be auto-incremented.'}
<input name="forceIDs" id="forceIDs" type="checkbox"/> {l s='If you don\'t use this option, all ID\'s will be auto-incremented.'}
</div>
<div class="space margin-form">
<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="button" {if empty($files_to_import)}disabled{/if}/>
@@ -201,9 +201,9 @@
</div>
{if !count($files_to_import)}
<div class="warn" style="margin-top: 20px;">
<p>{l s='There is no CSV file available, please upload one using the \'Upload\' button above.'}</p>
<p>{l s='There is no CSV file available. Please upload one using the \'Upload\' button above.'}</p>
<ul>
<li>{l s='You can read informations on CSV import at:'} <a href="http://doc.prestashop.com/display/PS14/Troubleshooting#Troubleshooting-HowtocorrectlyimportaccentuatedcontentusingaCSVfile%3F" target="_blank">http://doc.prestashop.com/display/PS14/Troubleshooting</a></li>
<li>{l s='You can read information on CSV import at:'} <a href="http://doc.prestashop.com/display/PS14/Troubleshooting#Troubleshooting-HowtocorrectlyimportaccentuatedcontentusingaCSVfile%3F" target="_blank">http://doc.prestashop.com/display/PS14/Troubleshooting</a></li>
<li>{l s='Read more about CSV format at:'} <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a></li>
</ul>
</div>

2
admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
View File

@@ -33,7 +33,7 @@
<div id="container-customer">
<h2>{l s='View your data'}</h2>
<div>
<b>{l s='Save and load your matching configuration'} : </b><br><br>
<b>{l s='Save and load your configuration for importing files'} : </b><br><br>
<input type="text" name="newImportMatchs" id="newImportMatchs">
<a id="saveImportMatchs" class="button" href="#">{l s='Save'}</a><br><br>
<div id="selectDivImportMatchs" {if !$import_matchs}style="display:none"{/if}>

6
admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
View File

@@ -46,7 +46,7 @@
};
if (json.missing.length || json.updated.length)
$('#changedFiles').html('<div class="warn">{l s='Changed/missing files have been detected'}</div>');
$('#changedFiles').html('<div class="warn">{l s='Changed/missing files have been detected.'}</div>');
else
$('#changedFiles').html('<div class="conf">{l s='No change has been detected in your files'}</div>');
@@ -75,7 +75,7 @@
</fieldset>
<br />
<fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Information about your configuration'}</legend>
<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Information about your configuration.'}</legend>
<h3>{l s='Server information'}</h3>
{if count($uname)}
<p>
@@ -127,7 +127,7 @@
<b>{l s='Mail method'}:</b>
{if $mail}
{l s='You are using the PHP mail() function.'}</p>
{l s='You are using the PHP mail function.'}</p>
{else}
{l s='You are using your own SMTP parameters.'}</p>
<p>

8
admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
View File

@@ -36,9 +36,9 @@
{/block}
{block name=script}
var langPackOk = "<img src=\"{$smarty.const._PS_IMG_}admin/information.png\" alt=\"\" /> {l s='A language pack is available for this ISO (name is'}";
var langPackVersion = "{l s='The compatible Prestashop version for this language and your system is:'}";
var langPackInfo = "{l s='After creating the language, you can import the content of the language pack, which you can download above under "Localization - Translations"'}";
var langPackOk = "<img src=\"{$smarty.const._PS_IMG_}admin/information.png\" alt=\"\" /> {l s='A language pack is available for this ISO.'}";
var langPackVersion = "{l s='The Prestashop version compatible with this language and your system is:'}";
var langPackInfo = "{l s='After creating the language, you can import the content of the language pack, which you can download under "Localization -- Translations."'}";
var noLangPack = "<img src=\"{$smarty.const._PS_IMG_}admin/information.png\" alt=\"\" /> {l s='No language pack available on prestashop.com for this ISO code'}";
var download = "{l s='Download'}";
@@ -62,7 +62,7 @@
{if isset($field.image)}<img src="{$field.image}" alt="{$field.title}" />{/if}
{$field.title}
</legend>
<p>{l s='This language is NOT complete and cannot be used in the Front or Back Office because some files are missing.'}</p>
<p>{l s='This language pack is NOT complete and cannot be used in the Front or Back Office because some files are missing.'}</p>
<br />
{elseif $key == 'list_files'}
{foreach $field as $list}

6
admin-dev/themes/default/template/controllers/login/content.tpl
View File

@@ -51,7 +51,7 @@
{if !isset($wrong_folder_name)}
<form action="#" id="login_form" method="post">
<div class="field">
<label for="email">{l s='E-mail address:'}</label>
<label for="email">{l s='Email address:'}</label>
<input type="text" id="email" name="email" class="input email_field" value="{if isset($email)}{$email|escape:'htmlall':'UTF-8'}{/if}" />
</div>
@@ -77,10 +77,10 @@
<form action="#" id="forgot_password_form" method="post" class="hide">
<h2 class="no-margin">{l s='Forgot your password?'}</h2>
<p class="bold">{l s='Please enter the e-mail address you provided during the registration process in order to receive your access code by e-mail'}</p>
<p class="bold">{l s='In order to receive your access code by email, please enter the address you provided during the registration process.'}</p>
<div class="field">
<label>{l s='E-mail address:'}</label>
<label>{l s='Email address:'}</label>
<input type="text" name="email_forgot" id="email_forgot" class="input email_field" />
</div>

2
admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl
View File

@@ -34,7 +34,7 @@
<li style="color: green;">{l s='Informative only'}</li>
<li style="color: orange;">{l s='Warning'}</li>
<li style="color: orange;">{l s='Error'}</li>
<li style="color: red;">{l s='Major issue (crash)'}</li>
<li style="color: red;">{l s='Major issue (crash)!'}</li>
</ol>
</fieldset><br />

2
admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
View File

@@ -33,7 +33,7 @@
<hr />
{if !count($addresses)}
{l s='No address for this manufacturer'}
{l s='No address has been found for this manufacturer.'}
{else}
{foreach $addresses AS $addresse}
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width: 600px;">

2
admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl
View File

@@ -33,7 +33,7 @@
<input type="radio" name="{$key}" id="{$key}_off" value="0" {if !$field['value']} checked="checked"{/if}{if isset($field['js']['off'])} {$field['js']['off']}{/if}/>
<label class="t" for="{$key}_off"> {l s='No'}</label>
{if !$field['mod_rewrite']}
<span class="warning_mod_rewrite">{l s='URL rewriting (mod_rewrite) is not active on your server or it is not possible to check your server configuration. If you want to use Friendly URLs you must activate this mod.'}</span>
<span class="warning_mod_rewrite">{l s='URL rewriting (mod_rewrite) is not active on your server, or it is not possible to check your server configuration. If you want to use Friendly URLs, you must activate this mod.'}</span>
<div class="clear"></div>
{/if}
{else}

2
admin-dev/themes/default/template/controllers/modules/favorites.tpl
View File

@@ -27,7 +27,7 @@
<th>{l s='Module Name'}</th>
<th>{l s='Description'}</th>
<th>{l s='Status'}</th>
<th>{l s='Categories'}</th>
<th>{l s='Categories:'}</th>
<th>{l s='Interest'}</th>
<th>{l s='Favorite'}</th>
<th>&nbsp;</th>

8
admin-dev/themes/default/template/controllers/modules/filters.tpl
View File

@@ -29,12 +29,12 @@
<!--start addons login-->
<div class="filter-module" id="addons_login_div">
<p>{l s='You are logged into PrestaShop Addons'}</p>
<p>{l s='You are logged into PrestaShop Addons.'}</p>
<div style="float:right">
<label><img src="themes/default/img/module-profile.png" /> {l s='Welcome'} {$username_addons}</label>
<label>|</label>
<label><a href="#" id="addons_logout_button"><img src="themes/default/img/module-logout.png" /> {l s='Log out from PrestaShop Addons'}</a></label>
<label><a href="#" id="addons_logout_button"><img src="themes/default/img/module-logout.png" /> {l s='Log out from PrestaShop Addons.'}</a></label>
</div>
</div>
@@ -76,7 +76,7 @@
<div class="filter-module">
<form id="filternameForm" method="post">
<input type="text" value="" name="filtername" autocomplete="off" class="ac_input">
<input type="submit" class="button" value="{l s='Search'}">
<input type="submit" class="button" value="{l s='Search:'}">
</form>
<form method="post">
@@ -101,7 +101,7 @@
<select name="module_install" id="module_install_filter" {if $showInstalledModules ne 'installedUninstalled' && $showInstalledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Not Installed'}</option>
<option value="installed" {if $showInstalledModules eq 'installed'}selected="selected"{/if}>{l s='Installed Modules'}</option>
<option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Not Installed Modules'}</option>
<option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Modules Not Installed '}</option>
</select>
&nbsp;
<select name="module_status" id="module_status_filter" {if $showEnabledModules ne 'enabledDisabled' && $showEnabledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>

6
admin-dev/themes/default/template/controllers/modules/header.tpl
View File

@@ -29,9 +29,9 @@
<ul class="cc_button">
{if $add_permission eq '1'}
<li>
<a id="desc-module-new" class="toolbar_btn" href="#top_container" onclick="$('#module_install').slideToggle();" title="{l s='Add new module'}">
<a id="desc-module-new" class="toolbar_btn" href="#top_container" onclick="$('#module_install').slideToggle();" title="{l s='Add a new module'}">
<span class="process-icon-new-module" ></span>
<div>{l s='Add new module'}</div>
<div>{l s='Add a new module'}</div>
</a>
</li>
{/if}
@@ -49,7 +49,7 @@
<div id="module_install" style="width:500px;margin-top:5px;{if !isset($smarty.post.downloadflag)}display: none;{/if}">
<fieldset>
<legend><img src="../img/admin/add.gif" alt="{l s='Add a new module'}" class="middle" /> {l s='Add a new module'}</legend>
<p>{l s='The module must be either a zip file or a tarball.'}</p>
<p>{l s='The module must either be a zip file or a tarball.'}</p>
<div style="float:left;margin-right:50px">
<form action="{$currentIndex}&token={$token}" method="post" enctype="multipart/form-data">
<label style="width: 100px">{l s='Module file'}</label>

2
admin-dev/themes/default/template/controllers/modules/js.tpl
View File

@@ -33,7 +33,7 @@
var ajaxCurrentIndex = '{$ajaxCurrentIndex}';
var installed_modules = {if isset($installed_modules) && count($installed_modules)}{$installed_modules}{else}false{/if};
var by = '{l s='by'}';
var errorLogin = '{l s='PrestaShop was unable to login to Addons, please check your credentials and your internet connection.'}';
var errorLogin = '{l s='PrestaShop was unable to login to Addons. Please check your credentials and your internet connection.'}';
var confirmPreferencesSaved = '{l s='Preferences saved'}';
{if isset($smarty.get.anchor) && !isset($error_module)}var anchor = '{$smarty.get.anchor|htmlentities|replace:'(':''|replace:')':''|replace:'{':''|replace:'}':''|replace:'\'':''|replace:'/':''}';{else}var anchor = '';{/if}

2
admin-dev/themes/default/template/controllers/modules/list.tpl
View File

@@ -68,7 +68,7 @@
{/if}
<dl class="">
<dt>{l s='Version'} :</dt>
<dd>{$module->version}
<dd>{$module->version}
{if isset($module->version_addons)}({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'}){/if}
</dd>|
</dl>

2
admin-dev/themes/default/template/controllers/modules/page.tpl
View File

@@ -38,7 +38,7 @@
<!--start sidebar module-->
<div class="sidebar">
<div class="categorieTitle">
<h3>{l s='Categories'}</h3>
<h3>{l s='Categories:'}</h3>
<div class="subHeadline">&nbsp;</div>
<ul class="categorieList">
<li {if isset($categoryFiltered.favorites)}style="background-color:#EBEDF4"{/if} class="categoryModuleFilterLink">

4
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
View File

@@ -88,8 +88,8 @@
{$value}
{/foreach}
{/if}
{l s='Please specify the files for which you do not want the module to be displayed'}.<br />
{l s='Please type each filename separated by a comma'}.
{l s='Please specify the files for which you do not want the module to be displayed.'}.<br />
{l s='Please input each filename, separated by a comma.'}.
<br /><br />
</div>

4
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
View File

@@ -65,7 +65,7 @@
<input class="button floatr" type="submit" name="unhookform" value="{l s='Unhook the selection'}"/></div>
{if !$can_move}
<br /><div><b>{l s='If you want to order/move the following data, please select a shop from the shop list'}</b></div>
<br /><div><b>{l s='If you want to order/move the following data, please select a shop from the shop list.'}</b></div>
{/if}
{foreach $hooks as $hook}
<a name="{$hook['name']}"/>
@@ -121,7 +121,7 @@
{/if}
{/foreach}
{else}
<tr><td colspan="5">{l s='No module for this hook'}</td></tr>
<tr><td colspan="5">{l s='No module was found for this hook.'}</td></tr>
{/if}
</table>
{/foreach}

4
admin-dev/themes/default/template/controllers/not_found/content.tpl
View File

@@ -24,6 +24,6 @@
*}
<h1>{l s='The controller %s is missing or invalid.' sprintf=$controller}</h1>
<ul>
<li><a href="index.php">{l s='Go to Dashboard'}</a></li>
<li><a href="#" onclick="window.history.back();">{l s='Back to previous page'}</a></li>
<li><a href="index.php">{l s='Go to the dashboard.'}</a></li>
<li><a href="#" onclick="window.history.back();">{l s='Back to the previous page.'}</a></li>
</ul>

2
admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
View File

@@ -28,7 +28,7 @@
<td align="center">{if isset($product.image) && $product.image->id}{$product.image_tag}{else}--{/if}</td>
<td>
<a href="index.php?controller=adminproducts&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminProducts'}">
<span class="productName">{$product['product_name']} - {l s='customized'}</span><br />
<span class="productName">{$product['product_name']} - {l s='Customized'}</span><br />
{if ($product['product_reference'])}{l s='Ref:'} {$product['product_reference']}<br />{/if}
{if ($product['product_supplier_reference'])}{l s='Ref Supplier:'} {$product['product_supplier_reference']}{/if}
</a>

4
admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
View File

@@ -49,7 +49,7 @@
{/if}
<span id="discount_percent_symbol">%</span>
<p class="preference_description" id="discount_value_help" style="width: 95%;display: none;">
{l s='This value must be taxes included.'}
{l s='This value must include taxes.'}
</p>
</div>
</div>
@@ -64,7 +64,7 @@
</select><br />
<input type="checkbox" name="discount_all_invoices" id="discount_all_invoices" value="1" /> <label class="t" for="discount_all_invoices">{l s='Apply on all invoices'}</label>
<p class="preference_description" style="width: 95%">
{l s='If you select to create this discount for all invoices, one discount will be created per order invoice.'}
{l s='If you chooses to create this discount for all invoices, only one discount will be created per order invoice.'}
</p>
</div>
{/if}

2
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
View File

@@ -71,7 +71,7 @@
<div class="margin-form">
<input type="checkbox" name="add_invoice[free_shipping]" value="1" />
<label class="t">{l s='Free shipping'}</label>
<p>{l s='If you don\'t select "Free shipping," the normal shipping cost will be applied'}</p>
<p>{l s='If you don\'t select "Free shipping," the normal shipping cost will be applied.'}</p>
</div>
</td>
</tr>

22
admin-dev/themes/default/template/controllers/orders/form.tpl
View File

@@ -33,7 +33,7 @@
var currencies = new Array();
var id_currency = '';
var id_lang = '';
var txt_show_carts = '{l s='Show carts and orders for this customer'}';
var txt_show_carts = '{l s='Show carts and orders for this customer.'}';
var txt_hide_carts = '{l s='Hide carts and orders for this customer'}';
var defaults_order_state = new Array();
var customization_errors = false;
@@ -111,7 +111,7 @@
},
parse: function(data) {
if (!data.found)
$('#vouchers_err').html('{l s='No voucher found'}').show();
$('#vouchers_err').html('{l s='No voucher was found'}').show();
else
$('#vouchers_err').hide();
var mytab = new Array();
@@ -680,7 +680,7 @@
$.each(gifts, function() {
cart_content += '<tr><td><img src="'+this.image_link+'" title="'+this.name+'" /></td><td>'+this.name+'<br />'+this.attributes_small+'</td><td>'+this.reference+'</td>';
cart_content += '<td>{l s='Gift !'}</td><td>'+this.cart_quantity+'</td><td>{l s='Gift !'}</td></tr>';
cart_content += '<td>{l s='Gift'}</td><td>'+this.cart_quantity+'</td><td>{l s='Gift'}</td></tr>';
});
$('#customer_cart tbody').html(cart_content);
}
@@ -981,7 +981,7 @@
<label>{l s='Search customers:'}</label>
<div class="margin-form">
<input type="text" id="customer" value="" />
<p>{l s='Search a customer by tapping the first letters of his name'}</p>
<p>{l s='Search a customer by tapping the first letters of his/her name'}</p>
<a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&addcustomer&liteDisplaying=1&submitFormAjax=1#">
<img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span>
</a>
@@ -996,7 +996,7 @@
<div class="margin-form">
<input type="hidden" value="" id="id_cart" name="id_cart" />
<input type="text" id="product" value="" />
<p>{l s='Search a product by tapping the first letters of his name'}</p>
<p>{l s='Search a product by tapping the first letters of his/her name.'}</p>
</div>
<div id="products_found">
<div id="product_list">
@@ -1111,9 +1111,9 @@
<tr>
<th height=39px" class="left">{l s='ID'}</th>
<th class="left">{l s='Date'}</th>
<th class="left">{l s='Products'}</th>
<th class="left">{l s='Products:'}</th>
<th class="left">{l s='Total paid'}</th>
<th class="left">{l s='Payment'}</th>
<th class="left">{l s='Payment: '}</th>
<th class="left">{l s='Status'}</th>
<th class="left">{l s='Action'}</th>
</tr>
@@ -1129,7 +1129,7 @@
<fieldset id="vouchers_part" style="display:none;">
<legend><img src="../img/t/AdminCartRules.gif" />{l s='Vouchers'}</legend>
<p>
<label>{l s='Search a voucher:'} </label>
<label>{l s='Search for a voucher:'} </label>
<input type="text" id="voucher" value="" />
<a class="fancybox button" href="{$link->getAdminLink('AdminCartRules')|escape:'htmlall':'UTF-8'}&addcart_rule&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new voucher'}</a>
</p>
@@ -1167,11 +1167,11 @@
<div id="address_invoice_detail">
</div>
</div>
<a class="fancybox button" id="new_address" href="{$link->getAdminLink('AdminAddresses')|escape:'htmlall':'UTF-8'}&addaddress&id_customer=42&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new address'}</a>
<a class="fancybox button" id="new_address" href="{$link->getAdminLink('AdminAddresses')|escape:'htmlall':'UTF-8'}&addaddress&id_customer=42&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add a new address'}</a>
</fieldset>
<br />
<fieldset id="carriers_part" style="display:none;">
<legend><img src="../img/t/AdminCarriers.gif" />{l s='Shipping'}</legend>
<legend><img src="../img/t/AdminCarriers.gif" />{l s='Shipping:'}</legend>
<div id="carriers_err" style="display:none;" class="warn"></div>
<div id="carrier_form">
<div>
@@ -1219,7 +1219,7 @@
<textarea name="order_message" id="order_message" rows="3" cols="45"></textarea>
</div>
<div class="margin-form">
<a href="#" id="send_email_to_customer" class="button">{l s='Send an e-mail to the customer with the link to process the payment.'}</a>
<a href="#" id="send_email_to_customer" class="button">{l s='Send an email to the customer with the link to process the payment.'}</a>
</div>
<div class="margin-form">
<a target="_blank" id="go_order_process" href="" class="button">{l s='Go on payment page to process the payment.'}</a>

38
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
View File

@@ -41,11 +41,11 @@
var token = "{$smarty.get.token|escape:'htmlall':'UTF-8'}";
var stock_management = {$stock_management|intval};
var txt_add_product_stock_issue = "{l s='You want to add more product than are available in stock, are you sure you want to add this quantity?' js=1}";
var txt_add_product_stock_issue = "{l s='Are you sure you want to add this quantity?' js=1}";
var txt_add_product_new_invoice = "{l s='Are you sure you want to create a new invoice?' js=1}";
var txt_add_product_no_product = "{l s='Error: No product has been selected' js=1}";
var txt_add_product_no_product_quantity = "{l s='Error: Quantity of product must be set' js=1}";
var txt_add_product_no_product_price = "{l s='Error: Price of product must be set' js=1}";
var txt_add_product_no_product_quantity = "{l s='Error: Quantity of products must be set' js=1}";
var txt_add_product_no_product_price = "{l s='Error: Product price must be set' js=1}";
var txt_confirm = "{l s='Are you sure?' js=1}";
var statesShipped = new Array();
@@ -162,10 +162,10 @@
<form method="post" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
<input type="hidden" name="id_lang" value="{$order->id_lang}" />
<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform guest into customer'}" /></p>
{l s='This feature will generate a random password and send an e-mail to the customer'}
{l s='This feature will generate a random password and send an email to the customer.'}
</form>
{else}
<div><b style="color:red;">{l s='A registered customer account already exists with this e-mail address'}</b></div>
<div><b style="color:red;">{l s='A registered customer account has already claimed this email address'}</b></div>
{/if}
{else}
{l s='Account registered:'} <b>{dateFormat date=$customer->date_add full=true}</b><br />
@@ -215,7 +215,7 @@
<thead>
<tr>
<th width="10%">
{l s='Order no.'}
{l s='Order no. '}
</th>
<th>
{l s='Status'}
@@ -261,7 +261,7 @@
<!-- Payments block -->
<fieldset>
<legend><img src="../img/admin/money.gif" /> {l s='Payment'}</legend>
<legend><img src="../img/admin/money.gif" /> {l s='Payment: '}</legend>
{if (!$order->valid && sizeof($currencies) > 1)}
<form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
@@ -332,7 +332,7 @@
{/if}
</td>
<td class="right">
<a href="#" class="open_payment_information"><img src="../img/admin/details.gif" title="{l s='See payment informations'}" alt="{l s='See payment informations'}" /></a>
<a href="#" class="open_payment_information"><img src="../img/admin/details.gif" title="{l s='See payment information'}" alt="{l s='See payment information'}" /></a>
</td>
</tr>
<tr class="payment_information" style="display: none;">
@@ -421,7 +421,7 @@
<!-- Shipping block -->
{if !$order->isVirtual()}
<fieldset>
<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping'}</legend>
<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping:'}</legend>
<div class="clear" style="float: left; margin-right: 10px;">
<span>{l s='Recycled packaging:'}</span>
@@ -492,7 +492,7 @@
</tbody>
</table>
{else}
{l s='No merchandise returns yet.'}
{l s='No merchandise returned yet.'}
{/if}
{if $carrierModuleCall}
@@ -569,13 +569,13 @@
<div class="clear" style="margin-bottom: 10px;"></div>
</div>
<form style="width: 98%" class="container-command-top-spacing" action="{$current_index}&vieworder&token={$smarty.get.token}&id_order={$order->id}" method="post" onsubmit="return orderDeleteProduct('{l s='Cannot return this product'}', '{l s='Quantity to cancel is greater than quantity available'}');">
<form style="width: 98%" class="container-command-top-spacing" action="{$current_index}&vieworder&token={$smarty.get.token}&id_order={$order->id}" method="post" onsubmit="return orderDeleteProduct('{l s='This product cannot be returned.'}', '{l s='Quantity to cancel is greater than quantity available.'}');">
<input type="hidden" name="id_order" value="{$order->id}" />
<fieldset style="width: 100%; ">
<div style="display: none">
<input type="hidden" value="{$order->getWarehouseList()|implode}" id="warehouse_list" />
</div>
<legend><img src="../img/admin/cart.gif" alt="{l s='Products'}" />{l s='Products'}</legend>
<legend><img src="../img/admin/cart.gif" alt="{l s='Products:'}" />{l s='Products:'}</legend>
<div style="float:left;width: 100%;">
{if $can_edit}
{if !$order->hasBeenDelivered()}<div style="float: left;"><a href="#" class="add_product button"><img src="../img/admin/add.gif" alt="{l s='Add a product'}" /> {l s='Add a product'}</a></div>{/if}
@@ -599,7 +599,7 @@
<th style="width: 10%; text-align: center">{l s='Total'} <sup>*</sup></th>
<th colspan="2" style="display: none;" class="add_product_fields">&nbsp;</th>
<th colspan="2" style="display: none;" class="edit_product_fields">&nbsp;</th>
<th colspan="2" style="display: none;" class="standard_refund_fields"><img src="../img/admin/delete.gif" alt="{l s='Products'}" />
<th colspan="2" style="display: none;" class="standard_refund_fields"><img src="../img/admin/delete.gif" alt="{l s='Products:'}" />
{if ($order->hasBeenDelivered() || $order->hasBeenShipped())}
{l s='Return'}
{elseif ($order->hasBeenPaid())}
@@ -645,7 +645,7 @@
<div style="float:right; margin-top: 20px;">
<table class="table" width="450px;" style="border-radius:0px;"cellspacing="0" cellpadding="0">
<tr id="total_products">
<td width="150px;"><b>{l s='Products'}</b></td>
<td width="150px;"><b>{l s='Products:'}</b></td>
<td class="amount" align="right">{displayPrice price=$order->total_products_wt currency=$currency->id}</td>
<td class="partial_refund_fields current-edit" style="display:none;">&nbsp;</td>
</tr>
@@ -660,7 +660,7 @@
<td class="partial_refund_fields current-edit" style="display:none;">&nbsp;</td>
</tr>
<tr id="total_shipping">
<td><b>{l s='Shipping'}</b></td>
<td><b>{l s='Shipping:'}</b></td>
<td class="amount" align="right">{displayPrice price=$order->total_shipping_tax_incl currency=$currency->id}</td>
<td class="partial_refund_fields current-edit" style="display:none;">{$currency->prefix}<input type="text" size="3" name="partialRefundShippingCost" value="0" />{$currency->suffix}</td>
</tr>
@@ -722,7 +722,7 @@
<input type="checkbox" name="reinjectQuantities" class="button" />&nbsp;<label for="reinjectQuantities" style="float:none; font-weight:normal;">{l s='Re-stock products'}</label><br />
{/if}
{if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
<input type="checkbox" id="generateCreditSlip" name="generateCreditSlip" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateCreditSlip" style="float:none; font-weight:normal;">{l s='Generate a credit slip'}</label><br />
<input type="checkbox" id="generateCreditSlip" name="generateCreditSlip" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateCreditSlip" style="float:none; font-weight:normal;">{l s='Generate a credit card slip'}</label><br />
<input type="checkbox" id="generateDiscount" name="generateDiscount" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateDiscount" style="float:none; font-weight:normal;">{l s='Generate a voucher'}</label><br />
<span id="spanShippingBack" style="display:none;"><input type="checkbox" id="shippingBack" name="shippingBack" class="button" />&nbsp;<label for="shippingBack" style="float:none; font-weight:normal;">{l s='Repay shipping costs'}</label><br /></span>
{/if}
@@ -746,9 +746,9 @@
<fieldset style="width: 400px;">
<legend style="cursor: pointer;" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><img src="../img/admin/email_edit.gif" /> {l s='New message'}</legend>
<div id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if}; overflow: auto; width: 400px;">
<a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><b>{l s='Click here'}</b> {l s='to add a comment or send a message to the customer'}</a>
<a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><b>{l s='Click here'}</b> {l s='to add a comment or send a message to the customer.'}</a>
</div>
<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}"><b>{l s='Click here'}</b> {l s='to see all messages'}</a><br>
<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}"><b>{l s='Click here'}</b> {l s='to see all messages.'}</a><br>
<div id="message" style="display: {if Tools::getValue('message')}block{else}none{/if}">
<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
<option value="0" selected="selected">-- {l s='Choose a standard message'} --</option>
@@ -760,7 +760,7 @@
<input type="radio" name="visibility" id="visibility" value="0" /> {l s='Yes'}
<input type="radio" name="visibility" value="1" checked="checked" /> {l s='No'}
<p id="nbchars" style="display:inline;font-size:10px;color:#666;"></p><br /><br />
<textarea id="txt_msg" name="message" cols="50" rows="8" onKeyUp="var length = document.getElementById('txt_msg').value.length; if (length > 600) length = '600+'; document.getElementById('nbchars').innerHTML = '{l s='600 chars max'} (' + length + ')';">{Tools::getValue('message')|escape:'htmlall':'UTF-8'}</textarea><br /><br />
<textarea id="txt_msg" name="message" cols="50" rows="8" onKeyUp="var length = document.getElementById('txt_msg').value.length; if (length > 600) length = '600+'; document.getElementById('nbchars').innerHTML = '{l s='600 characters, max.'} (' + length + ')';">{Tools::getValue('message')|escape:'htmlall':'UTF-8'}</textarea><br /><br />
<input type="hidden" name="id_order" value="{$order->id}" />
<input type="hidden" name="id_customer" value="{$order->id_customer}" />
<input type="submit" class="button" name="submitMessage" value="{l s='Send'}" />

2
admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
View File

@@ -26,7 +26,7 @@
{extends file="helpers/view/view.tpl"}
{block name="override_tpl"}
{if !$shop_context}
<div class="warn">{l s='You have more than one shop. You need to select one to configure payment.'}</div>
<div class="warn">{l s='You have more than one shop and must select one to configure payment.'}</div>
{else}
<h2 class="space">{l s='Payment modules list'}</h2>
{if isset($url_modules)}

2
admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
View File

@@ -27,7 +27,7 @@
{block name="label"}
{if $input.type == 'text' && $input.name == 'ps_cache_fs_directory_depth'}
<div id="directory_depth">
<div class="warn">{l s='The CacheFS system should be used only when the infrastructure contains only one front-end server. If you are not sure, ask your hosting company.'}</div>
<div class="warn">{l s='The CacheFS system should be used only when the infrastructure contains one front-end server. If you are not sure, ask your hosting company.'}</div>
{else}
{$smarty.block.parent}
{/if}

4
admin-dev/themes/default/template/controllers/products/associations.tpl
View File

@@ -67,7 +67,7 @@
<option value="{$cat.id_category}" {if $id_category_default == $cat.id_category}selected="selected"{/if} >{$cat.name}</option>
{/foreach}
</select>
<div class="hint" style="display:block;">{l s='The default category is the category which is displayed by default.'}</div>
<div class="hint" style="display:block;">{l s='The default category is the category displayed by default.'}</div>
</td>
</tr>
</table>
@@ -82,7 +82,7 @@
<div id="ajax_choose_product">
<p style="clear:both;margin-top:0;">
<input type="text" value="" id="product_autocomplete_input" />
{l s='Begin typing the first letters of the product name, then select the product from the drop-down list'}
{l s='Begin typing the first letters of the product name, then select the product from the drop-down list.'}
</p>
<p class="preference_description">{l s='(Do not forget to save the product afterward)'}</p>
<!--<img onclick="$(this).prev().search();" style="cursor: pointer;" src="../img/admin/add.gif" alt="{l s='Add an accessory'}" title="{l s='Add an accessory'}" />-->

22
admin-dev/themes/default/template/controllers/products/combinations.tpl
View File

@@ -24,9 +24,9 @@
*}
<script type="text/javascript">
var msg_combination_1 = '{l s='Please choose an attribute'}';
var msg_combination_2 = '{l s='Please choose a value'}';
var msg_combination_3 = '{l s='You can only add one combination per type of attribute'}';
var msg_combination_1 = '{l s='Please choose an attribute.'}';
var msg_combination_2 = '{l s='Please choose a value.'}';
var msg_combination_3 = '{l s='You can only add one combination per attribute type.'}';
var msg_new_combination = '{l s='New combination'}';
</script>
@@ -34,7 +34,7 @@
<input type="hidden" name="submitted_tabs[]" value="Combinations" />
<script type="text/javascript">
var attrs = new Array();
var modifyattributegroup = "{l s='Modify this attribute combination' js=1}";
var modifyattributegroup = "{l s='Modify this attribute combination.' js=1}";
attrs[0] = new Array(0, "---");
{foreach from=$attributeJs key=idgrp item=group}
attrs[{$idgrp}] = new Array(0
@@ -45,15 +45,15 @@
);
{/foreach}
</script>
<h4>{l s='Add or modify combinations for this product'}</h4>
<h4>{l s='Add or modify combinations for this product.'}</h4>
<div class="separation"></div> {l s='or use the'}
&nbsp;<a class="button bt-icon confirm_leave" href="index.php?tab=AdminAttributeGenerator&id_product={$product->id}&attributegenerator&token={$token_generator}"><img src="../img/admin/appearance.gif" alt="combinations_generator" class="middle" title="{l s='Product combinations generator'}" /><span>{l s='Product combinations generator'}</span></a>
{l s='in order to create automatically a set of combinations'}
{l s='in order to automatically create a set of combinations'}
{if $combination_exists}
<div class="warn" style="display:block">
<ul>
<li>{l s='Some combinations already exist. If you want to generate some new combinations, the quantities for the actual combinations will be lost.'}</li>
<li>{l s='You still can add a combination by clicking the link "Add new combination" on the toolbar.'}</li>
<li>{l s='Some combinations already exist. If you want to generate new combinations, the quantities for the existing combinations will be lost.'}</li>
<li>{l s='You can add a combination by clicking the link "Add new combination" on the toolbar.'}</li>
</ul>
</div>
{/if}
@@ -206,7 +206,7 @@
<td style="padding-bottom:5px;">{if $currency->format % 2 != 0}{$currency->sign}{/if}
<input type="text" size="3" name="attribute_ecotax" id="attribute_ecotax" value="0.00" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
{if $currency->format % 2 == 0} {$currency->sign}{/if}
({l s='overrides Eco-tax on "Information" tab'})
({l s='overrides Eco-tax in the "Information" tab'})
</td>
</tr>
{/if}
@@ -227,7 +227,7 @@
</td>
<td style="padding-bottom:5px;">
<input class="datepicker" id="available_date_attribute" name="available_date_attribute" value="{$available_date}" style="text-align: center;" type="text" />
<p>{l s='The available date when this product is out of stock'}</p>
<p>{l s='The available date when this product is out of stock.'}</p>
<script type="text/javascript">
$(document).ready(function(){
$(".datepicker").datepicker({
@@ -267,7 +267,7 @@
</td>
<td style="padding-bottom:5px;">
<input type="checkbox" name="attribute_default" id="attribute_default" value="1" />
&nbsp;{l s='Make this the default combination for this product'}<br /><br />
&nbsp;{l s='Make this combination the default combination for this product'}<br /><br />
</td>
</tr>
<tr>

2
admin-dev/themes/default/template/controllers/products/customization.tpl
View File

@@ -25,7 +25,7 @@
{if isset($obj->id)}
<input type="hidden" name="submitted_tabs[]" value="Customization" />
<h4>{l s='Add or modify customizable properties'}</h4>
<h4>{l s='Add or modify customizable properties.'}</h4>
{include file="controllers/products/multishop/check_fields.tpl" product_tab="Customization"}
<div class="separation"></div><br />

6
admin-dev/themes/default/template/controllers/products/features.tpl
View File

@@ -28,8 +28,8 @@
<h4>{l s='Assign features to this product:'}</h4>
<div class="separation"></div>
<ul>
<li>{l s='You can specify a value for each relevant feature regarding this product, empty fields will not be displayed.'}</li>
<li>{l s='You can either create a specific value or select among existing pre-defined values you added previously.'}</li>
<li>{l s='You can specify a value for each relevant feature regarding this product. Empty fields will not be displayed.'}</li>
<li>{l s='You can either create a specific value, or select among the existing pre-defined values you\'ve previously added.'}</li>
</ul>
</td>
</tr>
@@ -87,7 +87,7 @@
</tr>
{foreachelse}
<tr><td colspan="3" style="text-align:center;">{l s='No features defined'}</td></tr>
<tr><td colspan="3" style="text-align:center;">{l s='No features have been defined'}</td></tr>
{/foreach}
</table>

14
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
View File

@@ -90,11 +90,11 @@
var has_combinations = {$has_combinations};
var toload = new Array();
var empty_pack_msg = '{l s='Pack is empty. You need to add at least one product to the pack before you can save the pack.' slashes=1}';
var empty_name_msg = '{l s='Product name is empty. You need to enter a name at least for the default language before you can save the product.' slashes=1}';
var empty_link_rewrite_msg = '{l s='Friendly URL is empty. You need to enter a friendly URL at least for the default language before you can save the product.' slashes=1}';
var empty_pack_msg = '{l s='This pack is empty. You will need to add at least one product to the pack before you can save.' slashes=1}';
var empty_name_msg = '{l s='The product name is empty. You will at least need to enter a name for the default language before you can save the product.' slashes=1}';
var empty_link_rewrite_msg = '{l s='The friendly URL is empty. You will at least need to enter a friendly URL for the default language before you can save the product.' slashes=1}';
var reload_tab_title = '{l s='Confirmation' slashes=1}';
var reload_tab_description = '{l s='Some tabs was not loaded correctly, do you want to reload them?' slashes=1}';
var reload_tab_description = '{l s='Some tabs was not loaded correctly. Would you like to reload them?' slashes=1}';
$('#product-tab-content-wait').show();
var post_data = {$post_data};
@@ -191,7 +191,7 @@
$('.confirm_leave').live('click', function(){
// Double quotes are necessary when the translated string has single quotes
return confirm("{l s='You will lose all unsaved modifications, do you want to proceed?' js=1}");
return confirm("{l s='You will lose all unsaved modifications. Are you sure that you\'d like to proceed?' js=1}");
});
});
@@ -242,8 +242,8 @@
<div class="warn draft" >
<p>
<span style="float: left">
{l s='Your product will be saved as a draft'}</span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >{l s='Save and preview'}</a></span>
{l s='Your product will be saved as a draft.'}</span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >{l s='Save and preview.'}</a></span>
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
<br />
</p>

2
admin-dev/themes/default/template/controllers/products/images.tpl
View File

@@ -106,7 +106,7 @@
var upbutton = '{l s='Upload an image'}';
var token = '{$token}';
var come_from = '{$table}';
var success_add = '{l s='image has been successfully added'}';
var success_add = '{l s='The image has been successfully added.'}';
var id_tmp = 0;
var current_shop_id = {$current_shop_id|intval};
{literal}

10
admin-dev/themes/default/template/controllers/products/informations.tpl
View File

@@ -100,7 +100,7 @@
<input type="radio" name="type_product" id="pack_product" value="{Product::PTYPE_PACK}" {if $product_type == Product::PTYPE_PACK}checked="checked"{/if} />
<label class="radioCheck" for="pack_product">{l s='Pack'}</label>
<input type="radio" name="type_product" id="virtual_product" value="{Product::PTYPE_VIRTUAL}" {if $product_type == Product::PTYPE_VIRTUAL}checked="checked"{/if} />
<label class="radioCheck" for="virtual_product">{l s='Virtual Product (services, booking and downloadable products)'}</label>
<label class="radioCheck" for="virtual_product">{l s='Virtual Product (services, booking or downloadable products)'}</label>
</div>
<div class="separation"></div>
@@ -237,7 +237,7 @@
<ul class="listForm">
<li>
<input type="checkbox" name="available_for_order" id="available_for_order" value="1" {if $product->available_for_order}checked="checked"{/if} />
<label for="available_for_order" class="t">{l s='available for order'}</label>
<label for="available_for_order" class="t">{l s='Available for order'}</label>
</li>
<li>
<input type="checkbox" name="show_price" id="show_price" value="1" {if $product->show_price}checked="checked"{/if} {if $product->available_for_order}disabled="disabled"{/if}/>
@@ -245,7 +245,7 @@
</li>
<li>
<input type="checkbox" name="online_only" id="online_only" value="1" {if $product->online_only}checked="checked"{/if} />
<label for="online_only" class="t">{l s='online only (not sold in store)'}</label>
<label for="online_only" class="t">{l s='Online only (not sold in store)'}</label>
</li>
</ul>
</td>
@@ -271,7 +271,7 @@
<td class="col-left">
{include file="controllers/products/multishop/checkbox.tpl" field="description_short" type="tinymce" multilang="true"}
<label>{l s='Short description:'}<br /></label>
<p class="product_description">({l s='appears in the product lists and on the top of the product page'})</p>
<p class="product_description">({l s='Appears in the product list(s), and on the top of the product page.'})</p>
</td>
<td style="padding-bottom:5px;">
{include file="controllers/products/textarea_lang.tpl"
@@ -286,7 +286,7 @@
<td class="col-left">
{include file="controllers/products/multishop/checkbox.tpl" field="description" type="tinymce" multilang="true"}
<label>{l s='Description:'}<br /></label>
<p class="product_description">({l s='appears in the body of the product page'})</p>
<p class="product_description">({l s='Appears in the body of the product page'})</p>
</td>
<td style="padding-bottom:5px;">
{include file="controllers/products/textarea_lang.tpl" languages=$languages

2
admin-dev/themes/default/template/controllers/products/multishop/check_fields.tpl
View File

@@ -26,6 +26,6 @@
{if isset($display_multishop_checkboxes) && $display_multishop_checkboxes}
<label style="float: none">
<input type="checkbox" style="vertical-align: text-bottom" onclick="$('#product-tab-content-{$product_tab} input[name^=\'multishop_check[\']').attr('checked', this.checked); ProductMultishop.checkAll{$product_tab}()" />
{l s='Check/uncheck all (you are editing this page for several shops, some fields like "name" or "price" are disabled, you have to check these fields in order to edit them for these shops)'}
{l s='Check/uncheck all. (If you are editing this page for several shops, some fields like "name" or "price" are may be disabled. You will need check these fields in order to edit them)'}
</label>
{/if}

2
admin-dev/themes/default/template/controllers/products/pack.tpl
View File

@@ -43,7 +43,7 @@
<div id="ppackdiv" {if !($product_type == Product::PTYPE_PACK)}style="display: none;"{/if}>
<label for="curPackItemName" style="width:560px;text-align:left;">
{l s='Begin typing the first letters of the product name, then select the product from the drop-down list:'}
{l s='Begin typing the first letters of the product name. Then select the product from the drop-down list:'}
</label><br /><br />
<input type="text" size="25" id="curPackItemName" />

8
admin-dev/themes/default/template/controllers/products/prices.tpl
View File

@@ -122,7 +122,7 @@ $(document).ready(function () {
</td>
<td style="padding-bottom:5px;">
{$currency->prefix}<input size="11" maxlength="14" name="wholesale_price" id="wholesale_price" type="text" value="{{toolsConvertPrice price=$product->wholesale_price}|string_format:'%.2f'}" onchange="this.value = this.value.replace(/,/g, '.');" />{$currency->suffix}
<p class="preference_description">{l s='The wholesale price at which you bought this product'}</p>
<p class="preference_description">{l s='Wholesale price'}</p>
</td>
</tr>
@@ -208,7 +208,7 @@ $(document).ready(function () {
{l s='per'} <span id="unity_second">{$product->unity}</span> {l s='with tax'}
</span>
{/if}
<p>{l s='e.g. per lb'}</p>
<p>{l s='e.g. per lb.'}</p>
</td>
</tr>
<tr>
@@ -217,7 +217,7 @@ $(document).ready(function () {
<label>&nbsp;</label>
</td>
<td>
<input type="checkbox" name="on_sale" id="on_sale" style="padding-top: 5px;" {if $product->on_sale}checked="checked"{/if} value="1" />&nbsp;<label for="on_sale" class="t">{l s='Display "on sale" icon on product page and text on product listing'}</label>
<input type="checkbox" name="on_sale" id="on_sale" style="padding-top: 5px;" {if $product->on_sale}checked="checked"{/if} value="1" />&nbsp;<label for="on_sale" class="t">{l s='Display the "on sale" icon on the product page, and in the text found within the product listing.'}</label>
</td>
</tr>
<tr>
@@ -240,7 +240,7 @@ $(document).ready(function () {
{if isset($specificPriceModificationForm)}
<h4>{l s='Specific prices'}</h4>
<div class="hint" style="display:block;min-height:0;">
{l s='You can set specific prices for clients belonging to different groups, different countries, etc.'}
{l s='You can set specific prices for clients belonging to different groups, different countries, etc...'}
</div>
<br />
<a class="button bt-icon" href="#" id="show_specific_price"><img src="../img/admin/add.gif" alt="" /><span>{l s='Add a new specific price'}</span></a>

24
admin-dev/themes/default/template/controllers/products/quantities.tpl
View File

@@ -29,12 +29,12 @@
{include file="controllers/products/multishop/check_fields.tpl" product_tab="Quantities"}
<div class="separation"></div>
<div class="hint" style="display:block; position:'auto';">
<p>{l s='This interface allows you to manage the available quantities for sale of the current product and its combinations on the current shop.'}</p>
<p>{l s='This interface allows you to manage available quantities for sale for products. It also allows you to manage product combinations in the current shop.'}</p>
<p>{l s='You can choose whether or not to use the advanced stock management system for this product.'}</p>
<p>{l s='You can manually specify the quantities for the product/each product combination, or choose to automatically determine these quantities based on your stock (if advanced stock management is activated).'}</p>
<p>{l s='In this case, the quantities correspond to the quantitites of the real stock in the warehouses associated to the current shop or current group of shops.'}</p>
<p>{l s='You can manually specify the quantities for the product/each product combination, or you can choose to automatically determine these quantities based on your stock (if advanced stock management is activated).'}</p>
<p>{l s='In this case, quantities correspond to the real-stock quantities in the warehouses connected with the current shop, or current group of shops.'}</p>
<br/>
<p>{l s='For packs, if it has products that use advanced stock management, you have to specify a common warehouse for these products in the pack.'}</p>
<p>{l s='For packs: If it has products that use advanced stock management, you have to specify a common warehouse for these products in the pack.'}</p>
<p>{l s='Also, please note that when a product has combinations, its default combination will be used in stock movements.'}</p>
</div>
<br />
@@ -60,7 +60,7 @@
{/if}
type="checkbox" name="advanced_stock_management" class="advanced_stock_management" id="advanced_stock_management" />
<label style="float:none;font-weight:normal" for="advanced_stock_management">
{l s='I want to use the advanced stock management system for this product'}
{l s='I want to use the advanced stock management system for this product.'}
{if $stock_management_active == 0 && !$product->cache_is_pack}
&nbsp;-&nbsp;<b>{l s='This requires you to enable advanced stock management.'}</b>
{else if $product->cache_is_pack}
@@ -81,7 +81,7 @@
{/if}
type="radio" name="depends_on_stock" class="depends_on_stock" id="depends_on_stock_1" value="1"/>
<label style="float:none;font-weight:normal" for="depends_on_stock_1">
{l s='Available quantities for current product and its combinations are based on stock in the warehouses'}
{l s='Available quantities for current product and its combinations are based on warehouse stock. '}
{if ($stock_management_active == 0 || $product->advanced_stock_management == 0) && !$product->cache_is_pack}
&nbsp;-&nbsp;<b>{l s='This requires you to enable advanced stock management globally or for this product.'}</b>
{else if $product->cache_is_pack}
@@ -100,7 +100,7 @@
{/if}
type="radio" name="depends_on_stock" class="depends_on_stock" id="depends_on_stock_0" value="0"/>
<label style="float:none;font-weight:normal" for="depends_on_stock_0">
{l s='I want to specify available quantities manually'}
{l s='I want to specify available quantities manually.'}
</label>
<br /><br />
</td>
@@ -183,9 +183,9 @@
<div class="warn">
<p>{l s='It is not possible to manage quantities when:'}</p>
<ul>
<li>{l s='You are managing all shops.'}</li>
<li>{l s='You are managing a group of shops where quantities are not shared between all shops of this group.'}</li>
<li>{l s='You are managing a shop which is in a group where quantities are shared between all shops of this group.'}</li>
<li>{l s='You are currently managing all of your shops.'}</li>
<li>{l s='You are currently managing a group of shops where quantities are not shared between every shop in this group.'}</li>
<li>{l s='You are currently managing a shop that is in a group where quantities are shared between every shop in this group.'}</li>
</ul>
</div>
{/if}
@@ -222,7 +222,7 @@
<tr>
<td class="col-left">
{include file="controllers/products/multishop/checkbox.tpl" field="available_later" type="default" multilang="true"}
<label>{l s='Displayed text when allowed to be back-ordered:'}</label>
<label>{l s='Displayed text when back-ordereding is allowed:'}</label>
</td>
<td style="padding-bottom:5px;" class="col-right">
{include file="controllers/products/input_text_lang.tpl"
@@ -238,7 +238,7 @@
<td style="padding-bottom:5px;">
<input id="available_date" name="available_date" value="{$product->available_date}" class="datepicker"
style="text-align: center;" type="text" />
<p>{l s='The available date when this product is out of stock'}</p>
<p>{l s='The available date when this product is out of stock.'}</p>
</td>
</tr>
{/if}

10
admin-dev/themes/default/template/controllers/products/seo.tpl
View File

@@ -41,7 +41,7 @@
languages=$languages
input_name='meta_title'
input_value=$product->meta_title}
<p class="preference_description">{l s='Product page title; leave blank to use product name'}</p>
<p class="preference_description">{l s='Product page title: Leave blank to use the product name'}</p>
</td>
</tr>
<tr>
@@ -55,7 +55,7 @@
input_name='meta_description'
input_value=$product->meta_description
input_hint='{l s=\'Forbidden characters:\'\} <>;=#{\}'}
<p class="preference_description">{l s='A single sentence for HTML header'}</p>
<p class="preference_description">{l s='A single sentence for the HTML header is needed. '}</p>
</td>
</tr>
<tr>
@@ -67,7 +67,7 @@
{include file="controllers/products/input_text_lang.tpl" languages=$languages
input_value=$product->meta_keywords
input_name='meta_keywords'}
<p class="preference_description">{l s='Keywords for HTML header, separated by commas'}</p>
<p class="preference_description">{l s='Keywords for HTML header, separated by commas.'}</p>
</td>
</tr>
<tr>
@@ -84,8 +84,8 @@
<p class="clear" style="padding:10px 0 0 0">
<a style="cursor:pointer" class="button"
onmousedown="updateFriendlyURLByName();">{l s='Generate'}</a>&nbsp;
{l s='Friendly URL from product name.'}<br /><br />
{l s='Product link will look like this:'}
{l s='Friendly URL. From the product name.'}<br /><br />
{l s='The product link will look like this:'}
{$curent_shop_url|escape:'htmlall':'UTF-8'}lang/{if isset($product->id)}{$product->id}{else}<b>id_product</b>{/if}-<span id="friendly-url">{$product->link_rewrite[$default_language]}</span>.html</p>
</td>
</tr>

6
admin-dev/themes/default/template/controllers/products/shipping.tpl
View File

@@ -25,7 +25,7 @@
<input type="hidden" name="submitted_tabs[]" value="Shipping" />
<h4 class="tab">1. {l s='Info.'}</h4>
<h4>{l s='Shipping'}</h4>
<h4>{l s='Shipping:'}</h4>
{if isset($display_common_field) && $display_common_field}
<div class="hint" style="display: block">{l s='Warning, if you change the value of fields with an orange bullet %s, the value will be changed for all other shops for this product' sprintf=$bullet_common_field}</div>
@@ -63,7 +63,7 @@
<td style="padding-bottom:5px;">{$currency->prefix}<input type="text" name="additional_shipping_cost"
value="{$product->additional_shipping_cost|htmlentities}" />{$currency->suffix}
{if $country_display_tax_label}{l s='tax excl.'}{/if}
<p class="preference_description">{l s='Carrier tax will be applied.'}</p>
<p class="preference_description">{l s='A carrier tax will be applied.'}</p>
</td>
</tr>
<tr>
@@ -78,7 +78,7 @@
</select>
<br>
<button class="button" onclick="unselectAllCarriers(); return false;">{l s='Unselect all'}</button>
<p class="preference_description">{l s='If no carrier selected, all carriers could be used to ship this product.'}</p>
<p class="preference_description">{l s='If no carrier selected, all carriers can be used to ship this product.'}</p>
</td>
</tr>
</table>

12
admin-dev/themes/default/template/controllers/products/suppliers.tpl
View File

@@ -30,13 +30,13 @@
<div class="separation"></div>
<div class="hint" style="display:block; position:'auto';">
<p>{l s='This interface allows you to specify the suppliers of the current product and eventually its combinations.'}</p>
<p>{l s='It is also possible to specify for each product/product combinations the supplier reference according to previously associated suppliers.'}</p>
<p>{l s='It is also possible to specify supplier references according to previously associated suppliers.'}</p>
<br />
<p>{l s='When using the advanced stock management (see Preferences/Products), the values you fill here (prices, references) will be used in the supply orders.'}</p>
<p>{l s='When using the advanced stock management tool (see Preferences/Products), the values you define (prices, references) will be used in supply orders.'}</p>
</div>
<p>{l s='Please choose the suppliers associated with this product, and the default one.'}</p>
<p>{l s='Please choose the suppliers associated with this product. Please select a default supplier, as well.'}</p>
<a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminSuppliers')|escape:'htmlall':'UTF-8'}&addsupplier">
<img src="../img/admin/add.gif" alt="{l s='Create new supplier'}" title="{l s='Create new supplier'}" /><span>{l s='Create new supplier'}</span>
<img src="../img/admin/add.gif" alt="{l s='Create a new supplier.'}" title="{l s='Create a new supplier.'}" /><span>{l s='Create a new supplier.'}</span>
</a>
<table cellpadding="5" style="width:100%">
<tbody>
@@ -68,9 +68,9 @@
<h4>{l s='Product reference(s)'}</h4>
<div class="separation"></div>
{if $associated_suppliers|@count == 0}
<p>{l s='You have to specify the suppliers associated to this product and the default one before setting references.'}</p>
<p>{l s='You must specify the suppliers associated with this product. You must also select the default product supplier before setting references.'}</p>
{else}
<p>{l s='You can specify product reference(s) for each supplier associated.'}</p>
<p>{l s='You can specify product reference(s) for each associated supplier.'}</p>
{/if}
<p>{l s='Click "Save and Stay" after changing selected suppliers to display the associated product references.'}</p>
<div id="suppliers_accordion" style="margin-top:10px; display:block;">

14
admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
View File

@@ -106,7 +106,7 @@
</script>
<input type="hidden" name="submitted_tabs[]" value="VirtualProduct" />
<h4>{l s='Virtual Product (services, booking and downloadable products)'}</h4>
<h4>{l s='Virtual Product (services, booking or downloadable products)'}</h4>
<div class="separation"></div>
<div>
<div class="is_virtual_good">
@@ -147,7 +147,7 @@
</td>
<td class="col-right">
<input type="file" id="virtual_product_file" name="virtual_product_file" onchange="uploadFile();" maxlength="{$upload_max_filesize}" />
<p class="preference_description">{l s='Your server\'s maximum upload file size is'}:&nbsp;{$upload_max_filesize} {l s='MB'}</p>
<p class="preference_description">{l s='Your server\'s maximum file-upload size is'}:&nbsp;{$upload_max_filesize} {l s='MB'}</p>
</td>
</tr>
<tr id="upload-error" style="display:none">
@@ -194,7 +194,7 @@
</td>
<td class="col-right">
<input type="text" id="virtual_product_nb_downloable" name="virtual_product_nb_downloable" value="{$product->productDownload->nb_downloadable|htmlentities}" class="" size="6" />
<p class="preference_description">{l s='Number of allowed downloads per customer - (Set to 0 for unlimited downloads)'}</p>
<p class="preference_description">{l s='Number of downloads allowed per customer. (Set to 0 for unlimited downloads)'}</p>
</td>
</tr>
<tr>
@@ -203,7 +203,7 @@
</td>
<td class="col-right">
<input class="datepicker" type="text" id="virtual_product_expiration_date" name="virtual_product_expiration_date" value="{$product->productDownload->date_expiration}" size="11" maxlength="10" autocomplete="off" /> {l s='Format: YYYY-MM-DD'}
<p class="preference_description">{l s='If set, the file will not be downloadable anymore after this date. Leave this blank for no expiration date'}</p>
<p class="preference_description">{l s='If set, the file will not be downloadable after this date. Leave blank if you do not wish to attach an expiration date.'}</p>
</td>
</tr>
<td class="col-left">
@@ -211,7 +211,7 @@
</td>
<td class="col-right">
<input type="text" id="virtual_product_nb_days" name="virtual_product_nb_days" value="{$product->productDownload->nb_days_accessible|htmlentities}" class="" size="4" /><sup> *</sup>
<p class="preference_description">{l s='How many days this file can be accessed by customers'} - <em>({l s='Set to zero for unlimited access'})</em></p>
<p class="preference_description">{l s='Number of days this file can be accessed by customers'} - <em>({l s='Set to zero for unlimited access.'})</em></p>
</td>
</tr>
{* Feature not implemented *}
@@ -221,11 +221,11 @@
{*</td>*}
{*<td class="col-right">*}
{*<input type="checkbox" id="virtual_product_is_shareable" name="virtual_product_is_shareable" value="1" {if $product->productDownload->is_shareable}checked="checked"{/if} />*}
{*<span class="hint" name="help_box" style="display:none">{l s='Specify if the file can be shared'}</span>*}
{*<span class="hint" name="help_box" style="display:none">{l s='Please specify if the file can be shared.'}</span>*}
{*</td>*}
{*</tr>*}
{else}
<div class="hint clear" style="display: block;width: 70%;">{l s='You cannot edit your file here because you used combinations. Please edit it in the Combinations tab'}</div>
<div class="hint clear" style="display: block;width: 70%;">{l s='You cannot edit your file here because you used combinations. Please edit this file in the Combinations tab.'}</div>
<br />
{$error_product_download}
{/if}

8
admin-dev/themes/default/template/controllers/products/warehouses.tpl
View File

@@ -29,13 +29,13 @@
<h4>{l s='Product location in warehouses'}</h4>
<div class="separation"></div>
<div class="hint" style="display:block; position:'auto';">
<p>{l s='This interface allows you to specify in which warehouses the product is stocked.'}</p>
<p>{l s='It is also possible to specify for each product/product combination its location in each warehouse.'}</p>
<p>{l s='This interface allows you to specify the warehouse in which the product is stocked.'}</p>
<p>{l s='You can also specify product/product combinations as it relates to warehouse location. '}</p>
</div>
<p>{l s='Please choose the warehouses associated with this product, and the default one.'}</p>
<p>{l s='Please choose the warehouses associated with this product. You must also select a default warehouse. '}</p>
<a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminWarehouses')|escape:'htmlall':'UTF-8'}&addwarehouse">
<img src="../img/admin/add.gif" alt="{l s='Create new warehouse'}" title="{l s='Create new warehouse'}" /><span>{l s='Create new warehouse'}</span>
<img src="../img/admin/add.gif" alt="{l s='Create a new warehouse'}" title="{l s='Create a new warehouse'}" /><span>{l s='Create a new warehouse'}</span>
</a>
<div id="warehouse_accordion" style="margin-top:10px; display:block;">

8
admin-dev/themes/default/template/controllers/referrers/form_settings.tpl
View File

@@ -31,7 +31,7 @@
<img src="../img/admin/tab-preferences.gif" /> {l s='Settings'}
</legend>
<form action="{$current}&token={$token}" method="post" id="settings_form" name="settings_form">
<label>{l s='Save direct traffic'}</label>
<label>{l s='Save direct traffic?'}</label>
<div class="margin-left">
<label class="t" for="tracking_dt_on"><img src="../img/admin/enabled.gif" alt="{l s='Yes'}" title="{l s='Yes'}" /></label>
<input type="radio" name="tracking_dt" id="tracking_dt_on" value="1" {if $tracking_dt}checked="checked"{/if} />
@@ -40,19 +40,19 @@
<input type="radio" name="tracking_dt" id="tracking_dt_off" value="0" {if !$tracking_dt}checked="checked"{/if}/>
<label class="t" for="tracking_dt_off"> {l s='No'}</label>
</div>
<p>{l s='Direct traffic can be quite resource-intensive. You should consider enabling it only if you have a strong database server and a strong need for it.'}</p>
<p>{l s='Direct traffic can be quite resource-intensive. You should consider enabling it only if you have a strong need for it.'}</p>
<input type="submit" class="button" value="{l s=' Save '}" name="submitSettings" id="submitSettings" />
</form>
<div class="separation"></div>
<form action="{$current}&token={$token}" method="post" id="refresh_index_form" name="refresh_index_form">
<h3>{l s='Indexation'}</h3>
<p>{l s='There is a huge quantity of data, so each connection corresponding to a referrer is indexed. You can refresh this index by clicking on the button above. Be aware that it may take a long time and it is only needed if you modified or added a referrer and if you want your changes to be retroactive.'}</p>
<p>{l s='There is a huge quantity of data, so each connection corresponding to a referrer is indexed. You can also refresh this index by clicking the button above. This process may take awhile, and it\'s only needed if you modified or added a referrer, or if you want changes to be retroactive.'}</p>
<input type="submit" class="button" value="{l s='Refresh index'}" name="submitRefreshIndex" id="submitRefreshIndex" />
</form>
<div class="separation"></div>
<form action="{$current}&token={$token}" method="post" id="refresh_cache_form" name="refresh_cache_form">
<h3>{l s='Cache'}</h3>
<p>{l s='For you to sort and filter your data, it is cached. You can refresh the cache by clicking on the button above.'}</p>
<p>{l s='In order to sort and filter your data, it\'s cached. You can refresh the cache by clicking on the button above.'}</p>
<input type="submit" class="button" value="{l s='Refresh cache'}" name="submitRefreshCache" id="submitRefreshCache" />
</form>
</fieldset>

16
admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
View File

@@ -36,17 +36,17 @@
<ul style="list-style: disc; margin-left: 20px;">
<li>
{l s='The field `http_referer` is the website from which your customers arrive.'}<br />
{l s='For example, visitors coming from Google will have a `http_referer` like this one: "http://www.google.com/search?q=prestashop".'}<br />
{l s='If the visitor arrives directly (by typing the URL of your shop or by using their bookmarks, for example), `http_referer` will be empty.'}<br />
{l s='So if you want all the visitors coming from google, you can type "%google%" in this field, or "%google.fr%" if you want the visitors coming from Google France only.'}<br />
{l s='For example, visitors coming from Google will have an `http_referer` like this one: "http://www.google.com/search?q=prestashop".'}<br />
{l s='If the visitor arrives directly (by typing the URL of your shop, or by using their bookmarks, for example), `http_referer` will be empty.'}<br />
{l s='If you\'d like to view all the visitors coming from Google, you can type "%google%" in this field. Alternatively, you can type "%google.fr%" if you want to view visitors coming from Google France, only.'}<br />
</li>
<br />
<li>
{l s='The field `request_uri` is the URL from which the customers come to your website.'}<br />
{l s='For example, if the visitor accesses a product page, the URL will be'} "{$uri}music-ipods/1-ipod-nano.html".<br />
{l s='This is helpful because you can add some tags or tokens in the links pointing to your website.'}
{l s='For example, you can post a link "%dindex.php?prestashop" in the forum and get statistics by entering "%prestashop" in the field `request_uri`. You will get all the visitors coming from the forum.'}
{l s='This method is more reliable than the `http_referer` one, but there is a danger: if a search engine read a page with your link, then it will be displayed in its results and you will have not only the forum visitors, but also the ones from the search engine.'}
{l s='This is helpful because you can add tags or tokens in the links pointing to your website.'}
{l s='For example, you can post a link "%dindex.php?prestashop" in the forum and get statistics by entering "%prestashop" in the field `request_uri`. '}
{l s='This method is more reliable than the `http_referer`, but there is one disadvantage. If a search engine references a page with your link, then it will be displayed in the search results and you will not only have visitors from the forum, but also those from the search engine.'}
</li>
<br />
<li>
@@ -58,7 +58,7 @@
</li>
<br />
<li>
{l s='When using the simple mode, you can use some generic characters which can replace any characters:'}
{l s='When using simple mode, you can use a wide variety of generic characters to replace other characters:'}
<ul>
<li>{l s='"_" will replace one character. If you want to use the real "_", you should type'} "\\_".</li>
<li>{l s='"%" will replace any number of characters. If you want to use the real "%", you should type'} "\\%".</li>
@@ -67,7 +67,7 @@
<br />
<li>
{l s='The simple mode uses the MySQL "LIKE", but for a higher potency you can use MySQL regular expressions.'}
<a href="http://dev.mysql.com/doc/refman/5.0/en/regexp.html" target="_blank" style="font-style: italic;">{l s='Take a look at our documentation for more details...'}</a>
<a href="http://dev.mysql.com/doc/refman/5.0/en/regexp.html" target="_blank" style="font-style: italic;">{l s='Take a look at our documentation for more details.'}</a>
</li>
</ul>
</div>

4
admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
View File

@@ -76,7 +76,7 @@
html += "<tr>";
html += "<td>"+data[i].Field+"</td>";
html += "<td>"+data[i].Type+"</td>";
html += "<td><input type=\"button\" class=\"add_attribute\" value=\"{l s='add attribute'}\" onclick=\"javascript:AddRequestSql('"+data[i].Field+"');\"/></td>";
html += "<td><input type=\"button\" class=\"add_attribute\" value=\"{l s='Add attribute'}\" onclick=\"javascript:AddRequestSql('"+data[i].Field+"');\"/></td>";
html += "</tr>";
}
html += "</tbody>";
@@ -90,7 +90,7 @@
var table = $('#selectTables select').val();
if (!table)
jAlert("{l s='Please choose table.'}");
jAlert("{l s='Please choose a table.'}");
else
AddRequestSql(table);
});

4
admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl
View File

@@ -29,12 +29,12 @@
{if $input.type == 'text_customer'}
<span class="normal-text">{$customer->firstname} {$customer->lastname}</span>
<p style="clear: both">
<a href="{$url_customer}">{l s='View details on customer page'}</a>
<a href="{$url_customer}">{l s='View details on the customer page'}</a>
</p>
{elseif $input.type == 'text_order'}
<span class="normal-text">{$text_order}</span>
<p style="clear: both">
<a href="{$url_order}">{l s='View details on order page'}</a>
<a href="{$url_order}">{l s='View details on the order page'}</a>
</p>
{elseif $input.type == 'list_products'}
<table cellpadding="0" cellspacing="0">

6
admin-dev/themes/default/template/controllers/shipping/content.tpl
View File

@@ -25,12 +25,12 @@
{$content}
<br /><br />
<h2>{l s='Fees by carrier, geographical zone, and ranges'}</h2>
<h2>{l s='Fees by carrier, geographical zone and ranges'}</h2>
<form action="{$action_fees}" id="fees" name="fees" method="post">
<fieldset>
<legend><img src="../img/admin/delivery.gif" />{l s='Fees'}</legend>
{if empty($carriers)}
{l s='You only have free carriers, there is no need to configure your delivery prices.'}
{l s='If you only have free carriers, there\'s no need to configure delivery prices.'}
{else}
<b>{l s='Carrier:'} </b>
<select name="id_carrier2" onchange="$('#fees').attr('action', $('#fees').attr('action')+'&id_carrier='+$(this).attr('value')+'#fees'); $('#fees').submit();">
@@ -94,7 +94,7 @@
{else if $carrierSelected->is_free}
{l s='This is a free carrier'}
{else}
{l s='No ranges set for this carrier'}
{l s='No ranges is set for this carrier'}
{/if}
</td>
</tr>

2
admin-dev/themes/default/template/controllers/shop/helpers/list/list_action_delete.tpl
View File

@@ -24,7 +24,7 @@
*}
<a href="{$href}" class="delete"
{if in_array($id_shop, $shops_having_dependencies)}
onclick="jAlert('{l s='You cannot delete this shop (customer and/or order dependency)'}'); return false;"
onclick="jAlert('{l s='You cannot delete this shop\'s (customer and/or order dependency)'}'); return false;"
{elseif isset($confirm)}
onclick="if (confirm('{$confirm}')){ return true; }else{ event.stopPropagation(); event.preventDefault();};"
{/if} title="{$action}">

2
admin-dev/themes/default/template/controllers/shop/helpers/list/list_content.tpl
View File

@@ -30,7 +30,7 @@
{if isset($tr.$key)}
<a href="{$tr.$key}" onmouseover="$(this).css('text-decoration', 'underline')" onmouseout="$(this).css('text-decoration', 'none')" target="_blank">{$tr.$key}</a>
{else}
<a href="{$link->getAdminLink('AdminShopUrl')|escape:'htmlall':'UTF-8'}&id_shop={$tr.$identifier}&addshop_url" class="multishop_warning">{l s='Click here to set an URL for this shop'}</a>
<a href="{$link->getAdminLink('AdminShopUrl')|escape:'htmlall':'UTF-8'}&id_shop={$tr.$identifier}&addshop_url" class="multishop_warning">{l s='Click here to set a URL for this shop.'}</a>
{/if}
{else}
{$smarty.block.parent}

4
admin-dev/themes/default/template/controllers/shop/tree.tpl
View File

@@ -69,7 +69,7 @@ function customMenu(node)
"add_shop_group" : {
"separator_before" : false,
"separator_after" : false,
"label" : "{l s='Add new shop group'}",
"label" : "{l s='Add a new shop group'}",
"icon" : "../img/admin/add.gif",
"action" : function (obj){
location.href = '{$link->getAdminLink('AdminShopGroup')}&addshop_group';
@@ -154,7 +154,7 @@ function customMenu(node)
"add_shop_group" : {
"separator_before" : false,
"separator_after" : false,
"label" : "{l s='Add new shop group'}",
"label" : "{l s='Add a new shop group'}",
"icon" : "../img/admin/add.gif",
"action" : function (obj){
location.href = '{$link->getAdminLink('AdminShopGroup')}&addshop_group';

4
admin-dev/themes/default/template/controllers/stats/engines.tpl
View File

@@ -38,7 +38,7 @@
</select>
{else}
{l s='No graph engine module installed'}
{l s='No graph engine module has been installed.'}
{/if}
</div>
@@ -51,7 +51,7 @@
{/foreach}
</select>
{else}
{l s='No grid engine module installed'}
{l s='No grid engine module has been installed.'}
{/if}
</div>

2
admin-dev/themes/default/template/controllers/stats/menu.tpl
View File

@@ -35,7 +35,7 @@
{/if}
{/foreach}
{else}
{l s='No module installed'}
{l s='No module has been installed.'}
{/if}
</ul>

2
admin-dev/themes/default/template/controllers/stats/stats.tpl
View File

@@ -31,7 +31,7 @@
{l s='Module not found'}
{/if}
{else}
<h3 class="space">{l s='Please select a module in the left column.'}</h3>
<h3 class="space">{l s='Please select a module from the left column.'}</h3>
{/if}
</div>
</div>

8
admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl
View File

@@ -35,10 +35,10 @@
<fieldset>
<legend>
<img alt="Supply Order Management" src="../img/admin/edit.gif">
{l s='Manage the products you want to order from your supplier'}
{l s='Manage the products you want to order from the supplier.'}
</legend>
<p class="clear">{l s='To add a product to the order, type the first letters of the product name, then select it from the drop-down list:'}</p>
<p class="clear">{l s='To add a product to the order, type the first letters of the product name, then select it from the drop-down list.'}</p>
<input type="text" size="100" id="cur_product_name" />
<span onclick="addProduct();" style="cursor: pointer;"><img src="../img/admin/add.gif" alt="{l s='Add a product to the supply order'}" title="{l s='Add a product to the supply order'}" /></span>
@@ -106,7 +106,7 @@
</td>
<td class="center">
<a href="#" id="deletelink|{$product.id_product}_{$product.id_product_attribute}" class="removeProductFromSupplyOrderLink">
<img src="../img/admin/delete.gif" alt="{l s='Remove this product from the order'}" title="{l s='Remove this product from the order'}" />
<img src="../img/admin/delete.gif" alt="{l s='Remove this product from the order.'}" title="{l s='Remove this product from the order.'}" />
</a>
</td>
</tr>
@@ -158,7 +158,7 @@
'<td class="center"><input type="text" name="input_discount_rate_'+product_infos.id+'" value="0" size="5" />%</td>'+
'<td class="center"><input type="text" name="input_tax_rate_'+product_infos.id+'" value="0" size="5" />%</td>'+
'<td class="center"><a href="#" class="removeProductFromSupplyOrderLink" id="deletelink|'+product_infos.id+'">'+
'<img src="../img/admin/delete.gif" alt="{l s='Remove this product from the order'}" title="{l s='Remove this product from the order'}" />'+
'<img src="../img/admin/delete.gif" alt="{l s='Remove this product from the order.'}" title="{l s='Remove this product from the order.'}" />'+
'</a></td></tr>'
);

4
admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl
View File

@@ -63,7 +63,7 @@
<div style="margin-top: 20px;">
<fieldset>
<legend>{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Products'}</legend>
<legend>{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Products:'}</legend>
{$supply_order_detail_content}
</fieldset>
</div>
@@ -109,7 +109,7 @@
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='TOTAL TO PAY'}</td>
<td>{l s='Total to pay.'}</td>
<td align="right">{$supply_order_total_ti}</td>
</tr>
</table>

2
admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
View File

@@ -67,7 +67,7 @@ $(document).ready(function() {
<img src="../img/admin/pdf.gif" alt="{l s='Supply Order State'}">
{l s='Print the supply order form'}
</legend>
<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateSupplyOrderFormPDF&id_supply_order={$supply_order->id}" target="_blank" title="Export as PDF">{l s='Click here to download the supply order form'}.</a>
<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateSupplyOrderFormPDF&id_supply_order={$supply_order->id}" target="_blank" title="Export as PDF">{l s='Click here to download the supply order form.'}.</a>
</fieldset>
{/if}

6
admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl
View File

@@ -27,7 +27,7 @@
{block name="other_input"}
{if $key eq 'selects'}
<div class="margin-form">
<h3>{l s='Products'}</h3>
<h3>{l s='Products:'}</h3>
<table class="double_select">
<tr>
<td style="padding-left:20px;">
@@ -36,7 +36,7 @@
<option value="{$product.id_product}">{$product.name}</option>
{/foreach}
</select>
<span class="hint" name="help_box">{l s='Double-click to move to other column'}<span class="hint-pointer">&nbsp;</span></span>
<span class="hint" name="help_box">{l s='Double click to move the item to another column'}<span class="hint-pointer">&nbsp;</span></span>
<br /><br />
<a href="#" id="move_to_right" class="multiple_select_add">
{l s='Add'} &gt;&gt;
@@ -49,7 +49,7 @@
<option selected="selected" value="{$product.id_product}">{$product.name}</option>
{/foreach}
</select>
<span class="hint" name="help_box">{l s='Double-click to move to other column'}<span class="hint-pointer">&nbsp;</span></span>
<span class="hint" name="help_box">{l s='Double click to move the item to another column'}<span class="hint-pointer">&nbsp;</span></span>
<br /><br />
<a href="#" id="move_to_left" class="multiple_select_remove">
&lt;&lt; {l s='Remove'}

2
admin-dev/themes/default/template/controllers/translations/auto_translate.tpl
View File

@@ -23,7 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<input type="button" class="button" id="translate_all" value="{l s='Translate with Google (experimental)'}" />
<input type="button" class="button" id="translate_all" value="{l s='Translate with Google (experimental).'}" />
<script type="text/javascript">
var gg_translate = {
language_code : '{$language_code}',

26
admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
View File

@@ -55,7 +55,7 @@
<fieldset>
<legend><img src="../img/admin/translation.gif" />{l s='Modify translations'}</legend>
{l s='Here you can modify translations for all text input in PrestaShop.'}<br />
{l s='Here you can modify translations for every line of copy inside PrestaShop.'}<br />
{l s='First, select a section (such as Back Office or Modules), then click the flag representing the language you want to edit.'}<br /><br />
<form method="get" action="index.php" id="typeTranslationForm">
<input type="hidden" name="controller" value="AdminTranslations" />
@@ -87,12 +87,12 @@
<img src="../img/admin/import.gif" />{l s='Add / Update a language'}
</legend>
<div id="submitAddLangContent" style="float:left;">
<p>{l s='You can add or update a language directly from prestashop.com here'}</p>
<p>{l s='You can add or update a language directly from the PrestaShop webiste here:'}</p>
<div class="warn">
{l s='If you choose to update an existing language pack, all your previous customization in the theme named "Default" will be lost. This includes Front Office expressions and default e-mail templates.'}
{l s='If you choose to update an existing language pack, all of your previous customization\'s in the theme named "Default" will be lost. This includes Front Office expressions and default email templates.'}
</div>
{if $packs_to_update || $packs_to_install}
<div style="font-weight:bold; float:left;">{l s='Language you want to add or update:'}
<div style="font-weight:bold; float:left;">{l s='Please select the language you want to add or update:'}
<select id="params_import_language" name="params_import_language">
<optgroup label="{l s='Update a language'}">
{foreach $packs_to_update as $lang_pack}
@@ -108,7 +108,7 @@
<input type="submit" value="{l s='Add or update a language'}" name="submitAddLanguage" class="button" />
</div>
{else}
<br /><br /><p class="error">{l s='Cannot connect to prestashop.com to get language list.'}</p></div>
<br /><br /><p class="error">{l s='Cannot connect to the PrestaShop website to get the language list.'}</p></div>
{/if}
</div>
</fieldset>
@@ -117,12 +117,12 @@
<form action="{$url_submit}" method="post" enctype="multipart/form-data">
<fieldset>
<legend>
<img src="../img/admin/import.gif" />{l s='Import a language pack manually'}
<img src="../img/admin/import.gif" />{l s='Import a language pack manually.'}
</legend>
<div id="submitImportContent">
<p>
{l s='If the name format is: isocode.gzip (e.g. us.gzip) and the language corresponding to this package does not exist, it will automatically be created.'}
{l s='Be careful, as this will replace all existing data for the destination language!'}
{l s='If the language file format is: isocode.gzip (e.g. us.gzip), and the language corresponding to this package does not exist, it will automatically be created.'}
{l s='Warning: This will replace all of the existing data inside the destination language.'}
</p>
<p><label for="importLanguage">{l s='Language pack to import:'}</label><input type="file" name="file" id="importLanguage"/>&nbsp;</p>
<p>
@@ -133,7 +133,7 @@
{/foreach}
</select>
</p>
<p class="margin-form"><input type="submit" value="{l s='Import'}" name="submitImport" class="button" /></p>
<p class="margin-form"><input type="submit" value="{l s=' Import '}" name="submitImport" class="button" /></p>
</div>
</fieldset>
</form>
@@ -143,7 +143,7 @@
<fieldset>
<legend><img src="../img/admin/export.gif" />{l s='Export a language'}</legend>
<p>{l s='Export data from one language to a file (language pack).'}<br />
{l s='Choose the theme from which you want to export translations.'}<br />
{l s='Choose which theme you\'d like to export your translations to. '}<br />
<select name="iso_code" style="margin-top:10px;">
{foreach $languages as $language}
<option value="{$language['iso_code']}">{$language['name']}</option>
@@ -163,8 +163,8 @@
<fieldset>
<legend><img src="../img/admin/copy_files.gif" />{l s='Copy'}</legend>
<p>{l s='Copies data from one language to another.'}<br />
{l s='Be careful, as this will replace all existing data for the destination language!'}<br />
{l s='If necessary'}, <b><a href="{$url_create_language}">{l s='first create a new language'}</a></b>.</p>
{l s='Warning: This will replace all of the existing data inside the destination language.'}<br />
{l s='If necessary'}, <b><a href="{$url_create_language}">{l s='you must first create a new language.'}</a></b>.</p>
<div style="float:left;">
<p>
<div style="width:75px; font-weight:bold; float:left;">{l s='From:'}</div>
@@ -198,7 +198,7 @@
<div style="float:left;">
<input type="submit" value="{l s=' Copy '}" name="submitCopyLang" class="button" style="margin:25px 0px 0px 25px;" />
</div>
<p style="clear: left; padding: 16px 0px 0px 0px;"><span style="font-style: bold; color: red;">*</span> {l s='Language files must be complete to allow copying of translations'}</p>
<p style="clear: left; padding: 16px 0px 0px 0px;"><span style="font-style: bold; color: red;">*</span> {l s='Language files must be complete to allow copying of translations.'}</p>
</fieldset>
</form>
{/block}

4
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl
View File

@@ -30,13 +30,13 @@
{if !empty($limit_warning)}
<div class="warn">
{if $limit_warning['error_type'] == 'suhosin'}
{l s='Warning, your hosting provider is using the suhosin patch for PHP, which limits the maximum number of fields to post in a form:'}
{l s='Warning: Your hosting provider is using the suhosin patch for PHP, which limits the maximum number of fields allowed in a form:'}
<b>{$limit_warning['post.max_vars']}</b> {l s='for suhosin.post.max_vars.'}<br/>
<b>{$limit_warning['request.max_vars']}</b> {l s='for suhosin.request.max_vars.'}<br/>
{l s='Please ask your hosting provider to increase the suhosin post and request a limit of'}
{else}
{l s='Warning, your PHP configuration limits the maximum number of fields to post in a form:'}<br/>
{l s='Warning! Your PHP configuration limits the maximum number of fields allowed in a form:'}<br/>
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
{l s='Please ask your hosting provider to increase the this limit to'}
{/if}

4
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl
View File

@@ -30,13 +30,13 @@
{if !empty($limit_warning)}
<div class="warn">
{if $limit_warning['error_type'] == 'suhosin'}
{l s='Warning, your hosting provider is using the suhosin patch for PHP, which limits the maximum number of fields to post in a form:'}
{l s='Warning: Your hosting provider is using the suhosin patch for PHP, which limits the maximum number of fields allowed in a form:'}
<b>{$limit_warning['post.max_vars']}</b> {l s='for suhosin.post.max_vars.'}<br/>
<b>{$limit_warning['request.max_vars']}</b> {l s='for suhosin.request.max_vars.'}<br/>
{l s='Please ask your hosting provider to increase the suhosin post and request a limit of'}
{else}
{l s='Warning, your PHP configuration limits the maximum number of fields to post in a form:'}
{l s='Warning! Your PHP configuration limits the maximum number of fields allowed in a form:'}
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
{l s='Please ask your hosting provider to increase the this limit to'}
{/if}

12
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl
View File

@@ -32,13 +32,13 @@
{if !empty($limit_warning)}
<div class="warn">
{if $limit_warning['error_type'] == 'suhosin'}
{l s='Warning, your hosting provider is using the suhosin patch for PHP, which limits the maximum number of fields to post in a form:'}
{l s='Warning: Your hosting provider is using the suhosin patch for PHP, which limits the maximum number of fields allowed in a form:'}
<b>{$limit_warning['post.max_vars']}</b> {l s='for suhosin.post.max_vars.'}<br/>
<b>{$limit_warning['request.max_vars']}</b> {l s='for suhosin.request.max_vars.'}<br/>
{l s='Please ask your hosting provider to increase the suhosin post and request a limit of'}
{else}
{l s='Warning, your PHP configuration limits the maximum number of fields to post in a form:'}<br/>
{l s='Warning! Your PHP configuration limits the maximum number of fields allowed in a form:'}<br/>
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
{l s='Please ask your hosting provider to increase the this limit to'}
{/if}
@@ -87,12 +87,12 @@
</div>
</div>
<h2>{l s='Core e-mails:'}</h2>
<p class="preference_description">{l s='List of emails which are in the folder'} <strong>"mails/{$lang|strtolower}/"</strong></p>
<h2>{l s='Core emails:'}</h2>
<p class="preference_description">{l s='List of emails in the folder'} <strong>"mails/{$lang|strtolower}/"</strong></p>
{$mail_content}
<h2>{l s='Module e-mails:'}</h2>
<p class="preference_description">{l s='List of emails which are in the folder'} <strong>"modules/name_of_module/mails/{$lang|strtolower}/"</strong></p>
<h2>{l s='Module emails:'}</h2>
<p class="preference_description">{l s='List of emails in the folder'} <strong>"modules/name_of_module/mails/{$lang|strtolower}/"</strong></p>
{foreach $module_mails as $module_name => $mails}
{$mails['display']}
{/foreach}

4
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
View File

@@ -30,13 +30,13 @@
{if !empty($limit_warning)}
<div class="warn">
{if $limit_warning['error_type'] == 'suhosin'}
{l s='Warning, your hosting provider is using the suhosin patch for PHP, which limits the maximum number of fields to post in a form:'}
{l s='Warning: Your hosting provider is using the suhosin patch for PHP, which limits the maximum number of fields allowed in a form:'}
<b>{$limit_warning['post.max_vars']}</b> {l s='for suhosin.post.max_vars.'}<br/>
<b>{$limit_warning['request.max_vars']}</b> {l s='for suhosin.request.max_vars.'}<br/>
{l s='Please ask your hosting provider to increase the suhosin post and request a limit of'}
{else}
{l s='Warning, your PHP configuration limits the maximum number of fields to post in a form:'}<br/>
{l s='Warning! Your PHP configuration limits the maximum number of fields allowed in a form:'}<br/>
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
{l s='Please ask your hosting provider to increase the this limit to'}
{/if}

8
admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl
View File

@@ -28,7 +28,7 @@
{if isset($warehouse)}
<div>
<fieldset>
<legend><img src="../img/t/AdminPreferences.gif" alt="" /> {l s='General informations'}</legend>
<legend><img src="../img/t/AdminPreferences.gif" alt="" /> {l s='General information'}</legend>
<table style="width: 400px;" classe="table">
<tr>
<td>{l s='Reference:'}</td>
@@ -75,7 +75,7 @@
</div>
<div style="margin-top: 30px">
<fieldset>
<legend><img src="../img/t/AdminShop.gif" alt="" /> {l s='Shops'}</legend>
<legend><img src="../img/t/AdminShop.gif" alt="" /> {l s='Shops:'}</legend>
{l s='The following are the shops associated with this warehouse.'}
<table style="width: 400px; margin-top:20px" classe="table">
<tr>
@@ -99,10 +99,10 @@
<div style="margin-top: 30px">
<fieldset>
<legend><img src="../img/t/AdminLogs.gif" alt="" /> {l s='History'}</legend>
<a href="index.php?controller=adminstockmvt&id_warehouse={$warehouse->id}&token={getAdminToken tab='AdminStockMvt'}">{l s='Click here if you want details on what happened in this warehouse'}</a>
<a href="index.php?controller=adminstockmvt&id_warehouse={$warehouse->id}&token={getAdminToken tab='AdminStockMvt'}">{l s='Click here if you want details about this warehouse\'s activity.'}</a>
</fieldset>
</div>
{else}
{l s='This warehouse does not exist'}
{l s='This warehouse does not exist.'}
{/if}
{/block}

2
admin-dev/themes/default/template/controllers/webservice/helpers/form/form.tpl
View File

@@ -27,7 +27,7 @@
{block name="description"}
{$smarty.block.parent}
{if $input.type == 'text' && $input.name == 'key'}
<input type="button" value="{l s=' Generate! '}" class="button" onclick="gencode(32)" />
<input type="button" value="{l s='Generate! '}" class="button" onclick="gencode(32)" />
{/if}
{/block}

4
admin-dev/themes/default/template/helpers/options/options.tpl
View File

@@ -58,7 +58,7 @@
{/if}
{if !$categoryData['hide_multishop_checkbox'] && $use_multishop}
<input type="checkbox" style="vertical-align: text-top" onclick="checkAllMultishopDefaultValue(this)" /> <b>{l s='Check/uncheck all'}</b> {l s='(check boxes if you want to set a custom value for this shop or group shop context)'}
<input type="checkbox" style="vertical-align: text-top" onclick="checkAllMultishopDefaultValue(this)" /> <b>{l s='Check/uncheck all'}</b> {l s='(Check boxes if you want to set a custom value for this shop or group shop context)'}
<div class="separation"></div>
{/if}
@@ -188,7 +188,7 @@
{if isset($field['hint'])}<span class="hint" name="help_box">{$field['hint']}<span class="hint-pointer">&nbsp;</span></span>{/if}
{/block}{* end block input *}
{if isset($field['desc'])}<p class="preference_description">{$field['desc']}</p>{/if}
{if $field['is_invisible']}<p class="warn">{l s='You can\'t change the value of this configuration field in the context of this shop'}</p>{/if}
{if $field['is_invisible']}<p class="warn">{l s='You can\'t change the value of this configuration field in the context of this shop.'}</p>{/if}
</div>
</div>
<div class="clear"></div>

34
classes/controller/AdminController.php
View File

@@ -291,25 +291,25 @@ class AdminControllerCore extends Controller
$token = $this->token;
$this->_conf = array(
1 => $this->l('Deletion successful'), 2 => $this->l('Selection successfully deleted'),
1 => $this->l('Deletion successful'), 2 => $this->l('The selection has been successfully deleted.'),
3 => $this->l('Creation successful'), 4 => $this->l('Update successful'),
5 => $this->l('Status update successful'), 6 => $this->l('Settings update successful'),
7 => $this->l('Image successfully deleted'), 8 => $this->l('Module downloaded successfully'),
9 => $this->l('Thumbnails successfully regenerated'), 10 => $this->l('Message sent to the customer'),
11 => $this->l('Comment added'), 12 => $this->l('Module(s) installed successfully'),
13 => $this->l('Module(s) uninstalled successfully'), 14 => $this->l('Language successfully copied'),
15 => $this->l('Translations successfully added'), 16 => $this->l('Module transplanted successfully to hook'),
17 => $this->l('Module removed successfully from hook'), 18 => $this->l('Upload successful'),
19 => $this->l('Duplication completed successfully'), 20 => $this->l('Translation added successfully but the language has not been created'),
21 => $this->l('Module reset successfully'), 22 => $this->l('Module deleted successfully'),
23 => $this->l('Localization pack imported successfully'), 24 => $this->l('Localization pack imported successfully'),
25 => $this->l('Images successfully moved'),
26 => $this->l('Cover selection saved'),
27 => $this->l('Image shop association modified'),
28 => $this->l('Zone assigned to the selection successfully'),
5 => $this->l('The status has been updated successfully.'), 6 => $this->l('The settings have been updated successfully.'),
7 => $this->l('The image was successfully deleted.'), 8 => $this->l('The module was downloaded successfully.'),
9 => $this->l('The thumbnails were successfully regenerated.'), 10 => $this->l('Message sent to the customer.'),
11 => $this->l('Comment added'), 12 => $this->l('Module(s) installed successfully.'),
13 => $this->l('Module(s) uninstalled successfully.'), 14 => $this->l('The translation was successfully copied.'),
15 => $this->l('The translations have been successfully added.'), 16 => $this->l('The module transplanted successfully to the hook.'),
17 => $this->l('The module was successfully removed from the hook.'), 18 => $this->l('Upload successful'),
19 => $this->l('Duplication was completed successfully.'), 20 => $this->l('The translation was added successfully, but the language has not been created.'),
21 => $this->l('Module reset successfully.'), 22 => $this->l('Module deleted successfully.'),
23 => $this->l('Localization pack imported successfully.'), 24 => $this->l('Localization pack imported successfully.'),
25 => $this->l('The selcted images have successfully been moved.'),
26 => $this->l('Your cover selection has been saved.'),
27 => $this->l('The image shop association has been modified.'),
28 => $this->l('A zone has been assigned to the selection successfully.'),
29 => $this->l('Upgrade successful'),
30 => $this->l('Partial refund successfully created'),
31 => $this->l('The discount successfully generated')
30 => $this->l('A partial refund was successfully created.'),
31 => $this->l('The discount was successfully generated.')
);
if (!$this->identifier) $this->identifier = 'id_'.$this->table;

2
controllers/admin/AdminAccessController.php
View File

@@ -86,7 +86,7 @@ class AdminAccessControllerCore extends AdminController
if ($m)
$module['name'] = $m->displayName;
else
$this->warnings[] = sprintf($this->l('%s: module is installed in database, but its files are missing or incompatible.'), '<b>'.$module['name'].'</b>');
$this->warnings[] = sprintf($this->l('%s module is installed in the database but its files are missing/incompatible.'), '<b>'.$module['name'].'</b>');
}
}

14
controllers/admin/AdminAddressesController.php
View File

@@ -53,10 +53,10 @@ class AdminAddressesControllerCore extends AdminController
$this->fields_list = array(
'id_address' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'firstname' => array('title' => $this->l('First name'), 'width' => 120, 'filter_key' => 'a!firstname'),
'lastname' => array('title' => $this->l('Last name'), 'width' => 140, 'filter_key' => 'a!lastname'),
'firstname' => array('title' => $this->l('First Name'), 'width' => 120, 'filter_key' => 'a!firstname'),
'lastname' => array('title' => $this->l('Last Name'), 'width' => 140, 'filter_key' => 'a!lastname'),
'address1' => array('title' => $this->l('Address')),
'postcode' => array('title' => $this->l('Postal Code/Zip Code'), 'align' => 'right', 'width' => 80),
'postcode' => array('title' => $this->l('Zip/Postal Code'), 'align' => 'right', 'width' => 80),
'city' => array('title' => $this->l('City'), 'width' => 150),
'country' => array('title' => $this->l('Country'), 'width' => 100, 'type' => 'select', 'list' => $this->countries_array, 'filter_key' => 'cl!id_country'));
@@ -141,7 +141,7 @@ class AdminAddressesControllerCore extends AdminController
),
),
'submit' => array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
)
);
@@ -208,7 +208,7 @@ class AdminAddressesControllerCore extends AdminController
$temp_fields[] = array(
'type' => 'text',
'label' => $this->l('Last name'),
'label' => $this->l('Last Name'),
'name' => 'lastname',
'size' => 33,
'required' => true,
@@ -228,7 +228,7 @@ class AdminAddressesControllerCore extends AdminController
$temp_fields[] = array(
'type' => 'text',
'label' => $this->l('First name'),
'label' => $this->l('First Name'),
'name' => 'firstname',
'size' => 33,
'required' => true,
@@ -260,7 +260,7 @@ class AdminAddressesControllerCore extends AdminController
{
$temp_fields[] = array(
'type' => 'text',
'label' => $this->l('Postal Code/Zip Code'),
'label' => $this->l('Zip/Postal Code'),
'name' => 'postcode',
'size' => 33,
'required' => true,

32
controllers/admin/AdminAdminPreferencesController.php
View File

@@ -47,15 +47,15 @@ class AdminAdminPreferencesControllerCore extends AdminController
'fields' => array(
'PRESTASTORE_LIVE' => array(
'title' => $this->l('Automatically check for module updates'),
'desc' => $this->l('New modules and updates are displayed on the modules page'),
'desc' => $this->l('New modules and updates are displayed on the modules page.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
'visibility' => Shop::CONTEXT_ALL
),
'PS_COOKIE_CHECKIP' => array(
'title' => $this->l('Check IP on the cookie'),
'desc' => $this->l('Check the IP address of the cookie in order to avoid your cookie being stolen'),
'title' => $this->l('Check the IP address on the cookie'),
'desc' => $this->l('Check the IP address of the cookie in order to prevent your cookie from being stolen.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
@@ -63,7 +63,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
'PS_COOKIE_LIFETIME_FO' => array(
'title' => $this->l('Lifetime of the Front Office cookie'),
'title' => $this->l('Lifetime of Front Office cookies'),
'desc' => $this->l('Indicate the number of hours'),
'validation' => 'isInt',
'cast' => 'intval',
@@ -72,7 +72,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
),
'PS_COOKIE_LIFETIME_BO' => array(
'title' => $this->l('Lifetime of the Back Office cookie'),
'title' => $this->l('Lifetime of Back Office cookies'),
'desc' => $this->l('Indicate the number of hours'),
'validation' => 'isInt',
'cast' => 'intval',
@@ -88,31 +88,31 @@ class AdminAdminPreferencesControllerCore extends AdminController
'icon' => 'tab-preferences',
'fields' => array(
'PS_ATTACHMENT_MAXIMUM_SIZE' => array(
'title' => $this->l('Attachment maximum size'),
'desc' => $this->l('Set the maximum size of attachment files (in MegaBytes).').' '.$this->l('Maximum:').' '.
'title' => $this->l('Maximum size for attachment'),
'desc' => $this->l('Set the maximum size allowed for attachment files (in MegaBytes).').' '.$this->l('Maximum:').' '.
((int)str_replace('M', '', ini_get('post_max_size')) > (int)str_replace('M', '', ini_get('upload_max_filesize')) ? ini_get('upload_max_filesize') : ini_get('post_max_size')),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'text',
'suffix' => $this->l('Megabytes'),
'suffix' => $this->l('Megabytes:'),
'default' => '2'
),
'PS_LIMIT_UPLOAD_FILE_VALUE' => array(
'title' => $this->l('File value upload limit'),
'desc' => $this->l('Define the limit upload for a downloadable product, this value have to be inferior or equal to your server\'s maximum upload file ').sprintf('(%s MB).', $upload_mb),
'desc' => $this->l('Define the limit upload for a downloadable product. This value has to be less than or equal to the maximum file upload allotted by your server. ').sprintf('(%s MB).', $upload_mb),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'text',
'suffix' => $this->l('Megabytes'),
'suffix' => $this->l('Megabytes:'),
'default' => '1'
),
'PS_LIMIT_UPLOAD_IMAGE_VALUE' => array(
'title' => $this->l('Image value upload limit'),
'desc' => $this->l('Define the limit upload for an image, this value have to be inferior or equal to your server\'s maximum upload file ').sprintf('(%s MB).', $upload_mb),
'desc' => $this->l('Define the limit upload for an image. This value has to be less than or equal to the maximum file upload allotted by your server. ').sprintf('(%s MB).', $upload_mb),
'validation' => 'isInt',
'cast' => 'intval',
'type' => 'text',
'suffix' => $this->l('Megabytes'),
'suffix' => $this->l('Megabytes:'),
'default' => '1'
),
),
@@ -123,7 +123,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
'fields' => array(
'PS_HELPBOX' => array(
'title' => $this->l('Back Office help boxes'),
'desc' => $this->l('Enable yellow help boxes which are displayed under form fields in the Back Office'),
'desc' => $this->l('Allow yellow help boxes to be displayed under the form fields in the Back Office.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
@@ -144,21 +144,21 @@ class AdminAdminPreferencesControllerCore extends AdminController
'fields' => array(
'PS_SHOW_NEW_ORDERS' => array(
'title' => $this->l('Show notifications for new orders'),
'desc' => $this->l('This will display notifications when new orders are made on your shop'),
'desc' => $this->l('This will display notifications when new orders are made in your shop.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
),
'PS_SHOW_NEW_CUSTOMERS' => array(
'title' => $this->l('Show notifications for new customers'),
'desc' => $this->l('This will display notifications when new customers register on your shop'),
'desc' => $this->l('This will display notifications every time a new customer registers in your shop.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
),
'PS_SHOW_NEW_MESSAGES' => array(
'title' => $this->l('Show notifications for new messages'),
'desc' => $this->l('This will display notifications when new messages are posted on your shop'),
'desc' => $this->l('This will display notifications when new messages are posted in your shop.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'

12
controllers/admin/AdminAttachmentsController.php
View File

@@ -83,11 +83,11 @@ class AdminAttachmentsControllerCore extends AdminController
'type' => 'file',
'label' => $this->l('File:'),
'name' => 'file',
'desc' => $this->l('Upload file from your computer')
'desc' => $this->l('Upload a file from your computer.')
),
),
'submit' => array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
)
);
@@ -145,7 +145,7 @@ class AdminAttachmentsControllerCore extends AdminController
{
if ($_FILES['file']['size'] > (Configuration::get('PS_ATTACHMENT_MAXIMUM_SIZE') * 1024 * 1024))
$this->errors[] = sprintf(
$this->l('File too large, maximum size allowed: %1$d kB. File size you\'re trying to upload is: %2$d kB.'),
$this->l('The file is too large. Maximum size allowed is: %1$d kB. The file you\'re trying to upload is: %2$d kB.'),
(Configuration::get('PS_ATTACHMENT_MAXIMUM_SIZE') * 1024),
number_format(($_FILES['file']['size'] / 1024), 2, '.', '')
);
@@ -154,7 +154,7 @@ class AdminAttachmentsControllerCore extends AdminController
do $uniqid = sha1(microtime());
while (file_exists(_PS_DOWNLOAD_DIR_.$uniqid));
if (!copy($_FILES['file']['tmp_name'], _PS_DOWNLOAD_DIR_.$uniqid))
$this->errors[] = $this->l('File copy failed');
$this->errors[] = $this->l('Failed to copy the file.');
$_POST['file_name'] = $_FILES['file']['name'];
@unlink($_FILES['file']['tmp_name']);
$_POST['file'] = $uniqid;
@@ -167,13 +167,13 @@ class AdminAttachmentsControllerCore extends AdminController
$max_post = (int)ini_get('post_max_size');
$upload_mb = min($max_upload, $max_post);
$this->errors[] = sprintf(
$this->l('The File %1$s exceeds the size allowed by the server. The limit is set to %2$d MB.'),
$this->l('The file %1$s exceeds the size allowed by the server. The limit is set to %2$d MB.'),
'<b>'.$_FILES['file']['name'].'</b> ',
'<b>'.$upload_mb.'</b>'
);
}
else if (!empty($_FILES['file']['tmp_name']))
$this->errors[] = $this->l('No file or your file is not uploadable, please check your server configuration for the maximum upload size.');
$this->errors[] = $this->l('Upload error. Please check your server configurations for the maximum upload size allowed.');
}
$this->validateRules();
}

4
controllers/admin/AdminAttributeGeneratorController.php
View File

@@ -222,7 +222,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController
{
$this->toolbar_btn['back'] = array(
'href' => $this->context->link->getAdminLink('AdminProducts').'&id_product='.(int)Tools::getValue('id_product').'&addproduct&key_tab=Combinations',
'desc' => $this->l('Back to product')
'desc' => $this->l('Back to the product')
);
}
@@ -230,7 +230,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController
{
if (!Combination::isFeatureActive())
{
$this->displayWarning($this->l('This feature has been disabled, you can activate it at:').'
$this->displayWarning($this->l('This feature has been disabled. You can activate it at:').'
<a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').'#featuresDetachables">'.
$this->l('Performance').'</a>');
return;

16
controllers/admin/AdminAttributesGroupsController.php
View File

@@ -237,7 +237,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
}
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
@@ -330,7 +330,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
);
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
@@ -430,7 +430,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
{
if (!Combination::isFeatureActive())
{
$this->displayWarning($this->l('This feature has been disabled, you can activate it at:').
$this->displayWarning($this->l('This feature has been disabled. You can activate it at:').
' <a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').
'#featuresDetachables">'.$this->l('Performances').'</a>');
return;
@@ -497,11 +497,11 @@ class AdminAttributesGroupsControllerCore extends AdminController
default: // list
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;token='.$this->token,
'desc' => $this->l('Add new Attributes')
'desc' => $this->l('Add New Attributes')
);
$this->toolbar_btn['newAttributes'] = array(
'href' => self::$currentIndex.'&amp;updateattribute&amp;token='.$this->token,
'desc' => $this->l('Add new Values'),
'desc' => $this->l('Add New Values'),
'class' => 'toolbar-new'
);
}
@@ -514,18 +514,18 @@ class AdminAttributesGroupsControllerCore extends AdminController
switch ($this->display)
{
case 'edit':
$bread_extended[] = $this->l('Edit new Attribute');
$bread_extended[] = $this->l('Edit New Attributes');
break;
case 'add':
$bread_extended[] = $this->l('Add new Attribute');
$bread_extended[] = $this->l('Add New Attributes');
break;
case 'editAttributes':
if ($this->id_attribute)
$bread_extended[] = $this->l('Edit Value');
else
$bread_extended[] = $this->l('Add new Value');
$bread_extended[] = $this->l('Add New Values');
break;
}

14
controllers/admin/AdminBackupController.php
View File

@@ -58,8 +58,8 @@ class AdminBackupControllerCore extends AdminController
'type' => 'bool'
),
'PS_BACKUP_DROP_TABLE' => array(
'title' => $this->l('Drop existing tables during import:'),
'desc' => $this->l('If enabled, the backup script will drop your tables prior to restoring the backed up data').
'title' => $this->l('Drop existing tables during import'),
'desc' => $this->l('If enabled, the backup script will drop your tables prior to restoring data.').
'<br />(ie. "DROP TABLE IF EXISTS")',
'cast' => 'intval',
'type' => 'bool'
@@ -154,7 +154,7 @@ class AdminBackupControllerCore extends AdminController
// Test if the backup dir is writable
if (!is_writable(_PS_ADMIN_DIR_.'/backups/'))
$this->warnings[] = $this->l('"Backups" Directory in admin directory must be writeable (CHMOD 755 / 777)');
$this->warnings[] = $this->l('The "Backups" directory located in the admin directory must be writeable (CHMOD 755 / 777)');
if ($this->display == 'add' && is_writable(_PS_ADMIN_DIR_.'/backups/'))
{
@@ -164,7 +164,7 @@ class AdminBackupControllerCore extends AdminController
$this->errors[] = $object->error;
else
$this->context->smarty->assign(array(
'conf' => $this->l('It appears that the Backup was successful, however, you must download and carefully verify the Backup file.'),
'conf' => $this->l('It appears the backup was successful, however you must download and carefully verify the backup file before proceeding. '),
'backup_url' => $object->getBackupURL(),
'backup_weight' => number_format((filesize($object->id) * 0.000001), 2, '.', '')
));
@@ -234,16 +234,16 @@ class AdminBackupControllerCore extends AdminController
$date = date('Y-m-d H:i:s', $timestamp);
$age = time() - $timestamp;
if ($age < 3600)
$age = '< 1 '.$this->l('hour');
$age = '< 1 '.$this->l('Hour');
else if ($age < 86400)
{
$age = floor($age / 3600);
$age = $age.' '.(($age == 1) ? $this->l('hour') : $this->l('hours'));
$age = $age.' '.(($age == 1) ? $this->l('Hour') : $this->l('Hours'));
}
else
{
$age = floor($age / 86400);
$age = $age.' '.(($age == 1) ? $this->l('day') : $this->l('days'));
$age = $age.' '.(($age == 1) ? $this->l('Day') : $this->l('Days'));
}
$size = filesize(_PS_ADMIN_DIR_.'/backups/'.$file);
$this->_list[] = array(

52
controllers/admin/AdminCarriersController.php
View File

@@ -43,7 +43,7 @@ class AdminCarriersControllerCore extends AdminController
$this->context = Context::getContext();
$this->bulk_actions = array(
'delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')),
'delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Are you sure that you want to delete the selected items?')),
'enableSelection' => array('text' => $this->l('Enable selection')),
'disableSelection' => array('text' => $this->l('Disable selection'))
);
@@ -162,24 +162,24 @@ class AdminCarriersControllerCore extends AdminController
'&nbsp;<b>'.$this->l('How do I create a new carrier?').'</b>
<br />
<ul>
<li>'.$this->l('Click "Add new."').'<br /></li>
<li>'.$this->l('Click "Add New."').'<br /></li>
<li>'.$this->l('Fill in the fields and click "Save."').'</li>
<li>'.
$this->l('You need to set a price range or a weight range for which the new carrier will be available.').' '.
$this->l('You need to set a price range -- or weight range -- for which the new carrier will be available.').' '.
$this->l('Under the "Shipping" menu, click either "Price Ranges" or "Weight Ranges".').'
</li>
<li>'.$this->l('Click "Add new."').'</li>
<li>'.$this->l('Click "Add New."').'</li>
<li>'.
$this->l('Select the name of the carrier and define the price range or the weight range.').' '.
$this->l('Select the name of the carrier before defining the price or weight range.').' '.
$this->l('For example, the carrier can be made available for a weight range between 0 and 5lbs. Another carrier can have a range between 5 and 10lbs.').'
</li>
<li>'.$this->l('When you are done, click "Save."').'</li>
<li>'.$this->l('Click on the "Shipping" menu.').'</li>
<li>'.
$this->l('You need to set the fees that will be applied for this carrier.').' '.
$this->l('At the bottom on the page, in the "Fees" section, select the name of the carrier.').'
$this->l('At the bottom on the page -- in the "Fees" section -- select the name of the carrier.').'
</li>
<li>'.$this->l('For each zone, enter a price and click "Save."').'</li>
<li>'.$this->l('For each zone, enter a price and then click "Save."').'</li>
<li>'.$this->l('You\'re all set! The new carrier will be displayed to your customers.').'</li>
</ul>'
);
@@ -196,7 +196,7 @@ class AdminCarriersControllerCore extends AdminController
{
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Carriers'),
'title' => $this->l('Carriers:'),
'image' => '../img/admin/delivery.gif'
),
'input' => array(
@@ -209,14 +209,14 @@ class AdminCarriersControllerCore extends AdminController
'hint' => sprintf($this->l('Allowed characters: letters, spaces and %s'), '().-'),
'desc' => array(
$this->l('Carrier name displayed during checkout'),
$this->l('For in-store pickup, enter 0 to replace the carrier name with your shop name')
$this->l('For in-store pickup, enter 0 to replace the carrier name with your shop name.')
)
),
array(
'type' => 'file',
'label' => $this->l('Logo:'),
'name' => 'logo',
'desc' => $this->l('Upload a logo from your computer').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
'desc' => $this->l('Upload a logo from your computer.').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
),
array(
'type' => 'text',
@@ -226,7 +226,7 @@ class AdminCarriersControllerCore extends AdminController
'required' => true,
'size' => 41,
'maxlength' => 128,
'desc' => $this->l('Estimated delivery time, displayed during checkout')
'desc' => $this->l('Estimated delivery time will be displayed during checkout.')
),
array(
'type' => 'text',
@@ -234,14 +234,14 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'grade',
'required' => false,
'size' => 1,
'desc' => $this->l('"0" for a longest shipping delay, "9" for the shortest shipping delay.')
'desc' => $this->l('Enter "0" for a longest shipping delay, or "9" for the shortest shipping delay.')
),
array(
'type' => 'text',
'label' => $this->l('URL:'),
'name' => 'url',
'size' => 40,
'desc' => $this->l('Delivery tracking URL; type \'@\' where the tracking number will appear, it will be automatically replaced by the tracking number')
'desc' => $this->l('Delivery tracking URL: Type \'@\' where the tracking number should appear. It will then be automatically replaced by the tracking number.')
),
array(
'type' => 'checkbox',
@@ -252,14 +252,14 @@ class AdminCarriersControllerCore extends AdminController
'id' => 'id_zone',
'name' => 'name'
),
'desc' => $this->l('The zones in which this carrier is to be used')
'desc' => $this->l('The zones in which this carrier will be used')
),
array(
'type' => 'group',
'label' => $this->l('Group access:'),
'name' => 'groupBox',
'values' => Group::getGroups(Context::getContext()->language->id),
'desc' => $this->l('Mark all groups for which you want to give access to this carrier')
'desc' => $this->l('Mark the groups that are allowed access to this carrier.')
),
array(
'type' => 'radio',
@@ -280,7 +280,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Enable carrier in the Front Office')
'desc' => $this->l('Enable the carrier in the Front Office')
),
array(
'type' => 'radio',
@@ -300,7 +300,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('No').'" title="'.$this->l('No').'" />'
)
),
'desc' => $this->l('Apply both regular shipping cost and product-specific additional shipping costs')
'desc' => $this->l('Apply both regular shipping cost and product-specific shipping costs.')
),
array(
'type' => 'select',
@@ -318,7 +318,7 @@ class AdminCarriersControllerCore extends AdminController
),
array(
'type' => 'radio',
'label' => $this->l('Shipping & handling:'),
'label' => $this->l('Shipping and handling:'),
'name' => 'shipping_handling',
'required' => false,
'class' => 't',
@@ -335,7 +335,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Include the shipping & handling costs in carrier price')
'desc' => $this->l('Include the shipping and handling costs in the carrier price.')
),
array(
'type' => 'radio',
@@ -380,7 +380,7 @@ class AdminCarriersControllerCore extends AdminController
'id' => 'id',
'name' => 'name'
),
'desc' => $this->l('Out-of-range behavior when none is defined (e.g. when a customer\'s cart weight is greater than the highest range limit)')
'desc' => $this->l('Out-of-range behavior occurs when none is defined (e.g. when a customer\'s cart weight is greater than the highest range limit)')
),
array(
'type' => 'text',
@@ -388,7 +388,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_height',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum height managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum height managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'text',
@@ -396,7 +396,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_width',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum width managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum width managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'text',
@@ -404,7 +404,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_depth',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum depth managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum depth managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'text',
@@ -412,7 +412,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_weight',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum weight managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum weight managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'hidden',
@@ -443,7 +443,7 @@ class AdminCarriersControllerCore extends AdminController
}
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
@@ -555,7 +555,7 @@ class AdminCarriersControllerCore extends AdminController
{
if ((Tools::isSubmit('submitDel'.$this->table) && in_array(Configuration::get('PS_CARRIER_DEFAULT'), Tools::getValue('carrierBox')))
|| (isset($_GET['delete'.$this->table]) && Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT')))
$this->errors[] = $this->l('Please set another carrier as default before deleting this one');
$this->errors[] = $this->l('Please set another carrier as default before deleting this one.');
else
{
// if deletion : removes the carrier from the warehouse/carrier association

2
controllers/admin/AdminCartRulesController.php
View File

@@ -541,7 +541,7 @@ class AdminCartRulesControllerCore extends AdminController
'show_toolbar' => true,
'toolbar_btn' => $this->toolbar_btn,
'toolbar_scroll' => $this->toolbar_scroll,
'title' => array($this->l('Payment'), $this->l('Cart Rules')),
'title' => array($this->l('Payment: '), $this->l('Cart Rules')),
'defaultDateFrom' => date('Y-m-d H:00:00'),
'defaultDateTo' => date('Y-m-d H:00:00', strtotime('+1 month')),
'customerFilter' => $customer_filter,

24
controllers/admin/AdminCategoriesController.php
View File

@@ -232,7 +232,7 @@ class AdminCategoriesControllerCore extends AdminController
);
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;token='.$this->token,
'desc' => $this->l('Add new')
'desc' => $this->l('Add New')
);
$this->toolbar_btn['import'] = array(
'href' => $this->context->link->getAdminLink('AdminImport', true).'&import_type='.$this->table,
@@ -257,7 +257,7 @@ class AdminCategoriesControllerCore extends AdminController
if ($this->display == 'view')
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;id_parent='.(int)Tools::getValue('id_category').'&amp;token='.$this->token,
'desc' => $this->l('Add new')
'desc' => $this->l('Add New')
);
parent::initToolbar();
if ($this->_category->id == Category::getTopCategory()->id && isset($this->toolbar_btn['new']))
@@ -268,7 +268,7 @@ class AdminCategoriesControllerCore extends AdminController
$id_category = (Tools::isSubmit('id_category')) ? '&amp;id_parent='.(int)Tools::getValue('id_category') : '';
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&amp;add'.$this->table.'&amp;token='.$this->token.$id_category,
'desc' => $this->l('Add new')
'desc' => $this->l('Add New')
);
if (Tools::isSubmit('id_category'))
@@ -318,8 +318,8 @@ class AdminCategoriesControllerCore extends AdminController
$guest = new Group(Configuration::get('PS_GUEST_GROUP'));
$default = new Group(Configuration::get('PS_CUSTOMER_GROUP'));
$unidentified_group_information = sprintf($this->l('%s - All people without a validated customer account.'), '<b>'.$unidentified->name[$this->context->language->id].'</b>');
$guest_group_information = sprintf($this->l('%s - Customer who placed an order with the Guest Checkout.'), '<b>'.$guest->name[$this->context->language->id].'</b>');
$unidentified_group_information = sprintf($this->l('%s - All people without a valid customer account.'), '<b>'.$unidentified->name[$this->context->language->id].'</b>');
$guest_group_information = sprintf($this->l('%s - Customer who placed an order with the guest checkout.'), '<b>'.$guest->name[$this->context->language->id].'</b>');
$default_group_information = sprintf($this->l('%s - All people who have created an account on this site.'), '<b>'.$default->name[$this->context->language->id].'</b>');
$root_category = Category::getRootCategory();
$root_category = array('id_category' => $root_category->id, 'name' => $root_category->name);
@@ -367,7 +367,7 @@ class AdminCategoriesControllerCore extends AdminController
'values' => array(
'trads' => array(
'Root' => $root_category,
'selected' => $this->l('selected'),
'selected' => $this->l('Selected'),
'Collapse All' => $this->l('Collapse All'),
'Expand All' => $this->l('Expand All')
),
@@ -414,7 +414,7 @@ class AdminCategoriesControllerCore extends AdminController
'label' => $this->l('Image:'),
'name' => 'image',
'display_image' => true,
'desc' => $this->l('Upload category logo from your computer')
'desc' => $this->l('Upload a category logo from your computer.')
),
array(
'type' => 'text',
@@ -436,7 +436,7 @@ class AdminCategoriesControllerCore extends AdminController
'name' => 'meta_keywords',
'lang' => true,
'hint' => $this->l('Forbidden characters:').' <>;=#{}',
'desc' => $this->l('To add "tags" click in the field, write something, then press "Enter"')
'desc' => $this->l('To add "tags," click in the field, write something, and then press "Enter."')
),
array(
'type' => 'text',
@@ -444,7 +444,7 @@ class AdminCategoriesControllerCore extends AdminController
'name' => 'link_rewrite',
'lang' => true,
'required' => true,
'hint' => $this->l('Only letters and the minus (-) character are allowed')
'hint' => $this->l('Only letters and the minus (-) character are allowed.')
),
array(
'type' => 'group',
@@ -455,7 +455,7 @@ class AdminCategoriesControllerCore extends AdminController
'unidentified' => $unidentified_group_information,
'guest' => $guest_group_information,
'customer' => $default_group_information,
'desc' => $this->l('Mark all customer groups you want to give access to this category')
'desc' => $this->l('Mark all of the customer groups you;d like to have access to this category.')
)
),
'submit' => array(
@@ -540,10 +540,10 @@ class AdminCategoriesControllerCore extends AdminController
if ($id_category != $id_parent)
{
if (!Category::checkBeforeMove($id_category, $id_parent))
$this->errors[] = Tools::displayError($this->l('Category cannot be moved here'));
$this->errors[] = Tools::displayError($this->l('The category cannot be moved here.'));
}
else
$this->errors[] = Tools::displayError($this->l('Category cannot be parent of itself.'));
$this->errors[] = Tools::displayError($this->l('The category cannot be a parent of itself.'));
}
$object = parent::processAdd();

2
controllers/admin/AdminCmsCategoriesController.php
View File

@@ -294,7 +294,7 @@ class AdminCmsCategoriesControllerCore extends AdminController
'name' => 'link_rewrite',
'required' => true,
'lang' => true,
'hint' => $this->l('Only letters and the minus (-) character are allowed')
'hint' => $this->l('Only letters and the minus (-) character are allowed.')
),
),
'submit' => array(

Some files were not shown because too many files have changed in this diff Show More