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

// revert to revision 14160

Browse Source
This commit is contained in:
lLefevre
2012-03-14 15:05:13 +00:00
parent e9c3b1f7d4
commit 9f4e2698ee
37 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
+1 -1
View File
@@ -76,7 +76,7 @@
<form enctype="multipart/form-data" method="post" id="generator" action="{$url_generator}">
<fieldset style="margin-bottom: 35px;">
<legend><img src="../img/admin/asterisk.gif" />{l s='Attributes generator'}</legend>
<div style="display: block; margin-bottom: 20px;" class="hint">{l s='To generate the attributes, hold down the "Ctrl" key, select your attributes and click "Add".'}</div>
<div style="display: block; margin-bottom: 20px;" class="hint">{l s='To generate the attributes, hold down the \\"Ctrl\\" key, select your attributes and click \\"Add\\".'}</div>
<div style="float: left; margin-right:50px;">
<div>
<select multiple name="attributes[]" id="attribute_group" style="width: 200px; height: 350px; margin-bottom: 10px;">
admin-dev/themes/default/template/controllers/backup/download/view.tpl
+10 -10
View File
@@ -33,7 +33,7 @@
<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>
{l s='Tip: You can also download this file over your FTP. Backup files are located in \\"admin/backups\\" directory.'}</p>
</fieldset><br /><br />
<div class="error width1" style="float: left; margin-right: 10px;">
@@ -43,7 +43,7 @@
<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='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='Always check your data.'}</li>
@@ -54,16 +54,16 @@
<div class="warn width2" style="float: left;">
<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 Preferences > Maintenance tab.'}</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='Set \\"Enable Shop\\" to \\"No\\" in the Preferences > Maintenance tab.'}</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='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='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='Click on the \\"Go\\" button and wait during the import, the process can take several minutes'}</li>
</ol>
</div>
admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
+9 -9
View File
@@ -35,7 +35,7 @@
<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='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='Always check your data.'}</li>
@@ -52,16 +52,16 @@
<div class="warn width2" style="float: left;">
<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 Preferences > Maintenance tab.'}</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='Set \\"Enable Shop\\" to \\"No\\" in the Preferences > Maintenance tab.'}</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='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='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='Click on the \\"Go\\" button and wait during the import, the process can take several minutes'}</li>
</ol>
</div>
admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
+1 -1
View File
@@ -40,7 +40,7 @@
<label>{l s='Priority'}</label>
<div class="margin-form">
<input type="text" name="priority" value="{$currentTab->getFieldValue($currentObject, 'priority')|intval}" />
<p class="preference_description">{l s='Cart rules are applied to the cart by priority. A cart rule with priority of "1" will be processed before a cart rule with a priority of "2".'}</p>
<p class="preference_description">{l s='Cart rules are applied to the cart by priority. A cart rule with priority of \\"1\\" will be processed before a cart rule with a priority of \\"2\\".'}</p>
</div>
<label>{l s='Status'}</label>
<div class="margin-form">
admin-dev/themes/default/template/controllers/images/content.tpl
+3 -3
View File
@@ -83,19 +83,19 @@
<br />
{if $safe_mode}
<div class="warn">
{l s='PrestaShop has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should continue to use the existing system.'}
{l s='PrestaShop has detected that your server configuration is not compatible with the new storage system (directive \\"safe_mode\\" is activated). You should continue to use the existing system.'}
</div>
{else}
<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 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 of your product images, for best performance go to the '}
<a style="text-decoration:underline" href="{$link_ppreferences}">{l s='product preferences tab'}</a>
{l s='and set "Use the legacy image filesystem" option to "No".'}
{l s='and set \\"Use the legacy image filesystem\\" option to \\"No\\".'}
</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>
admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
+1 -1
View File
@@ -39,7 +39,7 @@
{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 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 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'}";
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
+1 -1
View File
@@ -72,7 +72,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>
admin-dev/themes/default/template/controllers/products/combinations.tpl
+2 -2
View File
@@ -181,7 +181,7 @@
{if $currency->format % 2 != 0}{$currency->sign}{/if}
<input type="text" size="6" name="attribute_wholesale_price" id="attribute_wholesale_price" value="" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
{if $currency->format % 2 == 0} {$currency->sign} {/if}<span id="attribute_wholesale_price_blank">({l s='leave blank if the price does not change'})</span>
<span style="display:none" id="attribute_wholesale_price_full">({l s='Overrides wholesale price on "Information" tab'})</span>
<span style="display:none" id="attribute_wholesale_price_full">({l s='Overrides wholesale price on \\"Information\\" tab'})</span>
</td>
</tr>
<tr>
@@ -244,7 +244,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 on \\"Information\\" tab'})
</td>
</tr>
{/if}
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+1 -1
View File
@@ -284,7 +284,7 @@
ThickboxI18nImage = "{l s='Image'}";
ThickboxI18nOf = "{l s='of'}";
ThickboxI18nClose = "{l s='Close'}";
ThickboxI18nOrEscKey = "{l s='(or "Esc")'}";
ThickboxI18nOrEscKey = "{l s='(or \\"Esc\\")'}";
ThickboxI18nNext = "{l s='Next >'}";
ThickboxI18nPrev = "{l s='< Previous'}";
tb_pathToImage = "../img/loadingAnimation.gif";
admin-dev/themes/default/template/controllers/products/prices.tpl
+2 -2
View File
@@ -200,7 +200,7 @@ jQuery(document).ready(Customer.init);
<tr>
<td class="col-left"><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 \\"on sale\\" icon on product page and text on product listing'}</label>
</td>
</tr>
<tr>
@@ -360,7 +360,7 @@ jQuery(document).ready(Customer.init);
<option value="amount">{l s='Amount'}</option>
<option value="percentage">{l s='Percentage'}</option>
</select>
{l s='(if set to "amount", tax is included)'}
{l s='(if set to \\"amount\\", tax is included)'}
</div>
</div>
admin-dev/themes/default/template/controllers/products/suppliers.tpl
+1 -1
View File
@@ -73,7 +73,7 @@
{else}
<p>{l s='You can specify product reference(s) for each supplier associated.'}</p>
{/if}
<p>{l s='Click "Save and Stay" after changing selected suppliers to display the associated product references.'}</p>
<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;">
{foreach from=$associated_suppliers item=supplier}
<h3 style="margin-bottom:0;"><a href="#">{$supplier->name}</a></h3>
admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
+6 -6
View File
@@ -37,15 +37,15 @@
<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='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='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 />
</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 interesting because you can add some tags or tokens in the links pointing to your website. For example, you can post a link'} "{$uri}index.php?prestashop" {l s='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 is interesting because you can add some tags or tokens in the links pointing to your website. For example, you can post a link'} "{$uri}index.php?prestashop" {l s='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.'}
</li>
<br />
@@ -60,13 +60,13 @@
<li>
{l s='When using the simple mode, you can use some generic characters which can replace any 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>
<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>
</ul>
</li>
<br />
<li>
{l s='The simple mode uses the MySQL "LIKE", but for a higher potency you can use MySQL regular expressions.'}
{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>
</li>
</ul>