From 612bd1adaed2acfc631c0f49ec10bd2df021a7ec Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 27 Nov 2013 20:11:54 +0100 Subject: [PATCH 1/9] Translation : Fix bug preventing to see error message --- .../Thelia/Core/Template/TemplateHelper.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/lib/Thelia/Core/Template/TemplateHelper.php b/core/lib/Thelia/Core/Template/TemplateHelper.php index 3310b5f04..d3ffa22ce 100644 --- a/core/lib/Thelia/Core/Template/TemplateHelper.php +++ b/core/lib/Thelia/Core/Template/TemplateHelper.php @@ -121,19 +121,19 @@ class TemplateHelper } /** - * Récursively examine files in a directory tree, and extract translatable strings. + * Recursively examine files in a directory tree, and extract translatable strings. * * Returns an array of translatable strings, each item having with the following structure: - * 'files' an arfray of file names in which the string appears, + * 'files' an array of file names in which the string appears, * 'text' the translatable text * 'translation' => the text translation, or an empty string if none available. * 'dollar' => true if the translatable text contains a $ * * @param string $directory the path to the directory to examine * @param string $walkMode type of file scanning: WALK_MODE_PHP or WALK_MODE_TEMPLATE - * @param Thelia\Core\Translation\Translator $translator the current translator + * @param \Thelia\Core\Translation\Translator $translator the current translator * @param string $currentLocale the current locale - * @param array $strings the liste of strings + * @param array $strings the list of strings * @throws \InvalidArgumentException if $walkMode contains an invalid value * @return number the total number of translatable texts */ @@ -248,15 +248,15 @@ class TemplateHelper fwrite($fp, ");\n"); - @fclose($fh); + @fclose($fp); } else { throw new \RuntimeException( - $this->getTranslator()->trans( - "Failed to open translation file %file. Please be sure that this file is writable by your Web server", - array('%file' => $file) - ) + Translator::getInstance()->trans( + 'Failed to open translation file %file. Please be sure that this file is writable by your Web server', + array('%file' => $file) + ) ); } } From dc648fef62cd632172bb86635ca7ec91d0b00e56 Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 27 Nov 2013 20:24:37 +0100 Subject: [PATCH 2/9] Merge master --- templates/backOffice/default/admin-layout.tpl | 0 templates/backOffice/default/administrators.html | 0 .../default/ajax/language-update-modal.html | 0 templates/backOffice/default/ajax/logger.html | 0 .../default/ajax/product-attributes-tab.html | 0 .../default/ajax/product-related-tab.html | 0 .../default/ajax/template-attribute-list.html | 0 .../default/ajax/template-feature-list.html | 0 .../backOffice/default/assets/img/ajax-loader.gif | Bin templates/backOffice/default/assets/img/bg.jpg | Bin .../backOffice/default/assets/img/deconnexion.png | Bin templates/backOffice/default/assets/img/header.jpg | Bin .../backOffice/default/assets/img/logo-light.png | Bin templates/backOffice/default/assets/img/logo.png | Bin .../default/assets/img/top-bar-logo-save.png | Bin .../backOffice/default/assets/img/top-bar-logo.png | Bin templates/backOffice/default/assets/img/top.jpg | Bin .../js/bootstrap-editable/bootstrap-editable.js | 0 .../assets/js/bootstrap-select/bootstrap-select.js | 0 .../assets/js/bootstrap-switch/bootstrap-switch.js | 0 .../default/assets/js/bootstrap/bootstrap.js | 0 templates/backOffice/default/assets/js/coupon.js | 0 .../backOffice/default/assets/js/document-upload.js | 0 templates/backOffice/default/assets/js/dropzone.js | 0 .../backOffice/default/assets/js/image-upload.js | 0 .../default/assets/js/jqplot/jquery.jqplot.min.js | 0 .../plugins/jqplot.BezierCurveRenderer.min.js | 0 .../js/jqplot/plugins/jqplot.barRenderer.min.js | 0 .../js/jqplot/plugins/jqplot.blockRenderer.min.js | 0 .../js/jqplot/plugins/jqplot.bubbleRenderer.min.js | 0 .../plugins/jqplot.canvasAxisLabelRenderer.min.js | 0 .../plugins/jqplot.canvasAxisTickRenderer.min.js | 0 .../js/jqplot/plugins/jqplot.canvasOverlay.min.js | 0 .../jqplot/plugins/jqplot.canvasTextRenderer.min.js | 0 .../plugins/jqplot.categoryAxisRenderer.min.js | 0 .../assets/js/jqplot/plugins/jqplot.ciParser.min.js | 0 .../assets/js/jqplot/plugins/jqplot.cursor.min.js | 0 .../jqplot/plugins/jqplot.dateAxisRenderer.min.js | 0 .../js/jqplot/plugins/jqplot.donutRenderer.min.js | 0 .../assets/js/jqplot/plugins/jqplot.dragable.min.js | 0 .../plugins/jqplot.enhancedLegendRenderer.min.js | 0 .../js/jqplot/plugins/jqplot.funnelRenderer.min.js | 0 .../js/jqplot/plugins/jqplot.highlighter.min.js | 0 .../assets/js/jqplot/plugins/jqplot.json2.min.js | 0 .../js/jqplot/plugins/jqplot.logAxisRenderer.min.js | 0 .../jqplot/plugins/jqplot.mekkoAxisRenderer.min.js | 0 .../js/jqplot/plugins/jqplot.mekkoRenderer.min.js | 0 .../jqplot/plugins/jqplot.meterGaugeRenderer.min.js | 0 .../assets/js/jqplot/plugins/jqplot.mobile.min.js | 0 .../js/jqplot/plugins/jqplot.ohlcRenderer.min.js | 0 .../js/jqplot/plugins/jqplot.pieRenderer.min.js | 0 .../js/jqplot/plugins/jqplot.pointLabels.min.js | 0 .../plugins/jqplot.pyramidAxisRenderer.min.js | 0 .../plugins/jqplot.pyramidGridRenderer.min.js | 0 .../js/jqplot/plugins/jqplot.pyramidRenderer.min.js | 0 .../js/jqplot/plugins/jqplot.trendline.min.js | 0 .../default/assets/js/jquery.typewatch.js | 0 .../i18n/jquery.ui.datepicker-es_ES.js | 0 .../i18n/jquery.ui.datepicker-fr_FR.js | 0 .../i18n/jquery.ui.datepicker-it_IT.js.js | 0 .../jquery.ui/jquery.ui.datepicker/i18n/readme.txt | 0 .../jquery.ui.datepicker/jquery.ui.datepicker.css | 0 .../jquery.ui.datepicker/jquery.ui.datepicker.js | 0 .../default/assets/js/jquery.ui/jquery.ui.theme.css | 0 templates/backOffice/default/assets/js/json2.js | 0 .../backOffice/default/assets/js/libs/jquery.js | 0 templates/backOffice/default/assets/js/main.js | 0 .../assets/js/tablesorter/jquery.metadata.js | 0 .../assets/js/tablesorter/jquery.tablesorter.min.js | 0 .../jquery.tablesorter.widgets-filter-formatter.js | 0 .../js/tablesorter/jquery.tablesorter.widgets.js | 0 templates/backOffice/default/assets/less/main.less | 0 .../assets/less/thelia/bootstrap-editable.less | 0 .../assets/less/thelia/bootstrap-select.less | 0 .../assets/less/thelia/bootstrap-switch.less | 0 .../default/assets/less/thelia/dropzone.less | 0 .../backOffice/default/assets/less/thelia/grid.less | 0 .../default/assets/less/thelia/jqplot.less | 0 .../default/assets/less/thelia/logger.less | 0 .../default/assets/less/thelia/thelia.less | 0 .../default/assets/less/thelia/wizard.less | 0 templates/backOffice/default/attribute-edit.html | 0 templates/backOffice/default/attributes.html | 0 templates/backOffice/default/config-store.html | 0 templates/backOffice/default/configs/variables.conf | 0 templates/backOffice/default/configuration.html | 0 templates/backOffice/default/content-edit.html | 0 templates/backOffice/default/countries.html | 0 templates/backOffice/default/country-edit.html | 0 .../default/coupon/condition-input-ajax.html | 0 templates/backOffice/default/coupon/conditions.html | 0 templates/backOffice/default/coupon/form.html | 0 templates/backOffice/default/currencies.html | 0 templates/backOffice/default/currency-edit.html | 0 templates/backOffice/default/customer-edit.html | 0 templates/backOffice/default/customers.html | 0 templates/backOffice/default/document-edit.html | 0 templates/backOffice/default/feature-edit.html | 0 templates/backOffice/default/features.html | 0 templates/backOffice/default/folder-edit.html | 0 templates/backOffice/default/folders.html | 0 templates/backOffice/default/image-edit.html | 0 .../includes/admin-utilities-position-block.html | 0 .../admin-utilities-sortable-column-header.html | 0 .../default/includes/catalog-breadcrumb.html | 0 .../default/includes/confirmation-modal.html | 0 .../default/includes/content-folder-management.html | 0 .../includes/customer_address_form_fields.html | 0 .../default/includes/document-upload-form.html | 0 .../default/includes/document-upload-list-ajax.html | 0 .../default/includes/folder-breadcrumb.html | 0 .../default/includes/generic-confirm-dialog.html | 0 .../default/includes/generic-js-dialog.html | 0 .../default/includes/image-upload-form.html | 0 .../default/includes/image-upload-list-ajax.html | 0 .../backOffice/default/includes/module-block.html | 0 .../backOffice/default/includes/notifications.html | 0 .../default/includes/product-details-tab.html | 0 .../default/includes/product-general-tab.html | 0 .../includes/standard-description-form-fields.html | 0 templates/backOffice/default/languages.html | 0 templates/backOffice/default/mailing-system.html | 0 templates/backOffice/default/message-edit.html | 0 templates/backOffice/default/messages.html | 0 templates/backOffice/default/module-configure.html | 0 templates/backOffice/default/module-edit.html | 0 templates/backOffice/default/modules.html | 0 templates/backOffice/default/order-edit.html | 0 templates/backOffice/default/orders.html | 0 templates/backOffice/default/product-edit.html | 0 templates/backOffice/default/profile-edit.html | 0 templates/backOffice/default/profiles.html | 0 templates/backOffice/default/search.html | 0 .../default/shipping-configuration-edit.html | 0 .../backOffice/default/shipping-configuration.html | 0 .../backOffice/default/shipping-zones-edit.html | 0 templates/backOffice/default/shipping-zones.html | 0 templates/backOffice/default/system-logs.html | 0 templates/backOffice/default/tax-edit.html | 0 templates/backOffice/default/tax-rule-edit.html | 0 templates/backOffice/default/taxes-rules.html | 0 templates/backOffice/default/template-edit.html | 0 templates/backOffice/default/templates.html | 0 templates/backOffice/default/translations.html | 0 templates/backOffice/default/variable-edit.html | 0 templates/backOffice/default/variables.html | 0 templates/frontOffice/default/404.html | 0 templates/frontOffice/default/account-password.html | 0 templates/frontOffice/default/account-update.html | 0 templates/frontOffice/default/account.html | 0 templates/frontOffice/default/address-update.html | 0 templates/frontOffice/default/address.html | 0 .../frontOffice/default/assets/img/218x146.png | Bin .../frontOffice/default/assets/img/280x196.png | Bin .../frontOffice/default/assets/img/700x320.png | Bin .../frontOffice/default/assets/img/ajax-loader.gif | Bin .../default/assets/img/carousel/1200x390.png | Bin .../default/assets/img/carousel/slider1.jpg | Bin .../default/assets/img/carousel/slider2.jpg | Bin .../default/assets/img/carousel/slider3.jpg | Bin .../frontOffice/default/assets/img/favicon.ico | Bin .../frontOffice/default/assets/img/favicon.png | Bin templates/frontOffice/default/assets/img/logo.gif | Bin .../default/assets/img/payment/american-express.png | Bin .../default/assets/img/payment/cheque.png | Bin .../default/assets/img/payment/kwixo.png | Bin .../default/assets/img/payment/mastercard.png | Bin .../frontOffice/default/assets/img/payment/visa.png | Bin .../default/assets/img/product/1/118x85.png | Bin .../default/assets/img/product/1/560x445.png | Bin .../frontOffice/default/assets/js/libs/jquery.js | 0 .../default/assets/js/plugins/bootbox/bootbox.js | 0 .../assets/js/plugins/bootbox/bootbox.min.js | 0 templates/frontOffice/default/assets/js/script.js | 0 .../default/assets/less/fontawesome/bootstrap.less | 0 .../default/assets/less/fontawesome/core.less | 0 .../default/assets/less/fontawesome/extras.less | 0 .../assets/less/fontawesome/font-awesome-ie7.less | 0 .../assets/less/fontawesome/font-awesome.less | 0 .../default/assets/less/fontawesome/icons.less | 0 .../default/assets/less/fontawesome/mixins.less | 0 .../default/assets/less/fontawesome/path.less | 0 .../default/assets/less/fontawesome/variables.less | 0 .../default/assets/less/thelia/account.less | 0 .../default/assets/less/thelia/buttons.less | 0 .../default/assets/less/thelia/cart.less | 0 .../default/assets/less/thelia/category.less | 0 .../default/assets/less/thelia/checkout.less | 0 templates/frontOffice/default/cart.html | 0 templates/frontOffice/default/category.html | 0 templates/frontOffice/default/contact-success.html | 0 templates/frontOffice/default/contact.html | 0 templates/frontOffice/default/content.html | 0 templates/frontOffice/default/currency.html | 0 .../frontOffice/default/includes/addedToCart.html | 0 .../default/includes/asides/articles.html | 0 .../default/includes/categories-filters.html | 0 templates/frontOffice/default/includes/menu.html | 0 .../frontOffice/default/includes/mini-cart.html | 0 .../frontOffice/default/includes/product-empty.html | 0 .../default/includes/single-product.html | 0 templates/frontOffice/default/includes/toolbar.html | 0 templates/frontOffice/default/index.html | 0 templates/frontOffice/default/language.html | 0 templates/frontOffice/default/layout.tpl | 0 templates/frontOffice/default/login.html | 0 templates/frontOffice/default/misc/breadcrumb.tpl | 0 .../frontOffice/default/misc/checkout-progress.tpl | 0 templates/frontOffice/default/modal-address.html | 0 templates/frontOffice/default/newsletter.html | 0 templates/frontOffice/default/order-delivery.html | 0 templates/frontOffice/default/order-invoice.html | 0 templates/frontOffice/default/order-placed.html | 0 templates/frontOffice/default/password.html | 0 templates/frontOffice/default/product.html | 0 templates/frontOffice/default/register.html | 0 templates/frontOffice/default/search.html | 0 templates/frontOffice/default/view_all.html | 0 templates/pdf/default/I18n/en_US.php | 0 templates/pdf/default/I18n/es_ES.php | 0 templates/pdf/default/I18n/fr_FR.php | 0 templates/pdf/default/I18n/it_IT.php | 0 templates/pdf/default/delivery.html | 0 templates/pdf/default/invoice.html | 0 web/robots.txt | 0 225 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 templates/backOffice/default/admin-layout.tpl mode change 100644 => 100755 templates/backOffice/default/administrators.html mode change 100644 => 100755 templates/backOffice/default/ajax/language-update-modal.html mode change 100644 => 100755 templates/backOffice/default/ajax/logger.html mode change 100644 => 100755 templates/backOffice/default/ajax/product-attributes-tab.html mode change 100644 => 100755 templates/backOffice/default/ajax/product-related-tab.html mode change 100644 => 100755 templates/backOffice/default/ajax/template-attribute-list.html mode change 100644 => 100755 templates/backOffice/default/ajax/template-feature-list.html mode change 100644 => 100755 templates/backOffice/default/assets/img/ajax-loader.gif mode change 100644 => 100755 templates/backOffice/default/assets/img/bg.jpg mode change 100644 => 100755 templates/backOffice/default/assets/img/deconnexion.png mode change 100644 => 100755 templates/backOffice/default/assets/img/header.jpg mode change 100644 => 100755 templates/backOffice/default/assets/img/logo-light.png mode change 100644 => 100755 templates/backOffice/default/assets/img/logo.png mode change 100644 => 100755 templates/backOffice/default/assets/img/top-bar-logo-save.png mode change 100644 => 100755 templates/backOffice/default/assets/img/top-bar-logo.png mode change 100644 => 100755 templates/backOffice/default/assets/img/top.jpg mode change 100644 => 100755 templates/backOffice/default/assets/js/bootstrap-editable/bootstrap-editable.js mode change 100644 => 100755 templates/backOffice/default/assets/js/bootstrap-select/bootstrap-select.js mode change 100644 => 100755 templates/backOffice/default/assets/js/bootstrap-switch/bootstrap-switch.js mode change 100644 => 100755 templates/backOffice/default/assets/js/bootstrap/bootstrap.js mode change 100644 => 100755 templates/backOffice/default/assets/js/coupon.js mode change 100644 => 100755 templates/backOffice/default/assets/js/document-upload.js mode change 100644 => 100755 templates/backOffice/default/assets/js/dropzone.js mode change 100644 => 100755 templates/backOffice/default/assets/js/image-upload.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/jquery.jqplot.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.BezierCurveRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.barRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.blockRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.bubbleRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasOverlay.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasTextRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.categoryAxisRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.ciParser.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.cursor.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.dateAxisRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.donutRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.dragable.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.enhancedLegendRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.funnelRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.highlighter.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.json2.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.logAxisRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mekkoRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.meterGaugeRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mobile.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.ohlcRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pieRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pointLabels.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidAxisRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidGridRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidRenderer.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jqplot/plugins/jqplot.trendline.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jquery.typewatch.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-es_ES.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-fr_FR.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-it_IT.js.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/readme.txt mode change 100644 => 100755 templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/jquery.ui.datepicker.css mode change 100644 => 100755 templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/jquery.ui.datepicker.js mode change 100644 => 100755 templates/backOffice/default/assets/js/jquery.ui/jquery.ui.theme.css mode change 100644 => 100755 templates/backOffice/default/assets/js/json2.js mode change 100644 => 100755 templates/backOffice/default/assets/js/libs/jquery.js mode change 100644 => 100755 templates/backOffice/default/assets/js/main.js mode change 100644 => 100755 templates/backOffice/default/assets/js/tablesorter/jquery.metadata.js mode change 100644 => 100755 templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.min.js mode change 100644 => 100755 templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js mode change 100644 => 100755 templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.widgets.js mode change 100644 => 100755 templates/backOffice/default/assets/less/main.less mode change 100644 => 100755 templates/backOffice/default/assets/less/thelia/bootstrap-editable.less mode change 100644 => 100755 templates/backOffice/default/assets/less/thelia/bootstrap-select.less mode change 100644 => 100755 templates/backOffice/default/assets/less/thelia/bootstrap-switch.less mode change 100644 => 100755 templates/backOffice/default/assets/less/thelia/dropzone.less mode change 100644 => 100755 templates/backOffice/default/assets/less/thelia/grid.less mode change 100644 => 100755 templates/backOffice/default/assets/less/thelia/jqplot.less mode change 100644 => 100755 templates/backOffice/default/assets/less/thelia/logger.less mode change 100644 => 100755 templates/backOffice/default/assets/less/thelia/thelia.less mode change 100644 => 100755 templates/backOffice/default/assets/less/thelia/wizard.less mode change 100644 => 100755 templates/backOffice/default/attribute-edit.html mode change 100644 => 100755 templates/backOffice/default/attributes.html mode change 100644 => 100755 templates/backOffice/default/config-store.html mode change 100644 => 100755 templates/backOffice/default/configs/variables.conf mode change 100644 => 100755 templates/backOffice/default/configuration.html mode change 100644 => 100755 templates/backOffice/default/content-edit.html mode change 100644 => 100755 templates/backOffice/default/countries.html mode change 100644 => 100755 templates/backOffice/default/country-edit.html mode change 100644 => 100755 templates/backOffice/default/coupon/condition-input-ajax.html mode change 100644 => 100755 templates/backOffice/default/coupon/conditions.html mode change 100644 => 100755 templates/backOffice/default/coupon/form.html mode change 100644 => 100755 templates/backOffice/default/currencies.html mode change 100644 => 100755 templates/backOffice/default/currency-edit.html mode change 100644 => 100755 templates/backOffice/default/customer-edit.html mode change 100644 => 100755 templates/backOffice/default/customers.html mode change 100644 => 100755 templates/backOffice/default/document-edit.html mode change 100644 => 100755 templates/backOffice/default/feature-edit.html mode change 100644 => 100755 templates/backOffice/default/features.html mode change 100644 => 100755 templates/backOffice/default/folder-edit.html mode change 100644 => 100755 templates/backOffice/default/folders.html mode change 100644 => 100755 templates/backOffice/default/image-edit.html mode change 100644 => 100755 templates/backOffice/default/includes/admin-utilities-position-block.html mode change 100644 => 100755 templates/backOffice/default/includes/admin-utilities-sortable-column-header.html mode change 100644 => 100755 templates/backOffice/default/includes/catalog-breadcrumb.html mode change 100644 => 100755 templates/backOffice/default/includes/confirmation-modal.html mode change 100644 => 100755 templates/backOffice/default/includes/content-folder-management.html mode change 100644 => 100755 templates/backOffice/default/includes/customer_address_form_fields.html mode change 100644 => 100755 templates/backOffice/default/includes/document-upload-form.html mode change 100644 => 100755 templates/backOffice/default/includes/document-upload-list-ajax.html mode change 100644 => 100755 templates/backOffice/default/includes/folder-breadcrumb.html mode change 100644 => 100755 templates/backOffice/default/includes/generic-confirm-dialog.html mode change 100644 => 100755 templates/backOffice/default/includes/generic-js-dialog.html mode change 100644 => 100755 templates/backOffice/default/includes/image-upload-form.html mode change 100644 => 100755 templates/backOffice/default/includes/image-upload-list-ajax.html mode change 100644 => 100755 templates/backOffice/default/includes/module-block.html mode change 100644 => 100755 templates/backOffice/default/includes/notifications.html mode change 100644 => 100755 templates/backOffice/default/includes/product-details-tab.html mode change 100644 => 100755 templates/backOffice/default/includes/product-general-tab.html mode change 100644 => 100755 templates/backOffice/default/includes/standard-description-form-fields.html mode change 100644 => 100755 templates/backOffice/default/languages.html mode change 100644 => 100755 templates/backOffice/default/mailing-system.html mode change 100644 => 100755 templates/backOffice/default/message-edit.html mode change 100644 => 100755 templates/backOffice/default/messages.html mode change 100644 => 100755 templates/backOffice/default/module-configure.html mode change 100644 => 100755 templates/backOffice/default/module-edit.html mode change 100644 => 100755 templates/backOffice/default/modules.html mode change 100644 => 100755 templates/backOffice/default/order-edit.html mode change 100644 => 100755 templates/backOffice/default/orders.html mode change 100644 => 100755 templates/backOffice/default/product-edit.html mode change 100644 => 100755 templates/backOffice/default/profile-edit.html mode change 100644 => 100755 templates/backOffice/default/profiles.html mode change 100644 => 100755 templates/backOffice/default/search.html mode change 100644 => 100755 templates/backOffice/default/shipping-configuration-edit.html mode change 100644 => 100755 templates/backOffice/default/shipping-configuration.html mode change 100644 => 100755 templates/backOffice/default/shipping-zones-edit.html mode change 100644 => 100755 templates/backOffice/default/shipping-zones.html mode change 100644 => 100755 templates/backOffice/default/system-logs.html mode change 100644 => 100755 templates/backOffice/default/tax-edit.html mode change 100644 => 100755 templates/backOffice/default/tax-rule-edit.html mode change 100644 => 100755 templates/backOffice/default/taxes-rules.html mode change 100644 => 100755 templates/backOffice/default/template-edit.html mode change 100644 => 100755 templates/backOffice/default/templates.html mode change 100644 => 100755 templates/backOffice/default/translations.html mode change 100644 => 100755 templates/backOffice/default/variable-edit.html mode change 100644 => 100755 templates/backOffice/default/variables.html mode change 100644 => 100755 templates/frontOffice/default/404.html mode change 100644 => 100755 templates/frontOffice/default/account-password.html mode change 100644 => 100755 templates/frontOffice/default/account-update.html mode change 100644 => 100755 templates/frontOffice/default/account.html mode change 100644 => 100755 templates/frontOffice/default/address-update.html mode change 100644 => 100755 templates/frontOffice/default/address.html mode change 100644 => 100755 templates/frontOffice/default/assets/img/218x146.png mode change 100644 => 100755 templates/frontOffice/default/assets/img/280x196.png mode change 100644 => 100755 templates/frontOffice/default/assets/img/700x320.png mode change 100644 => 100755 templates/frontOffice/default/assets/img/ajax-loader.gif mode change 100644 => 100755 templates/frontOffice/default/assets/img/carousel/1200x390.png mode change 100644 => 100755 templates/frontOffice/default/assets/img/carousel/slider1.jpg mode change 100644 => 100755 templates/frontOffice/default/assets/img/carousel/slider2.jpg mode change 100644 => 100755 templates/frontOffice/default/assets/img/carousel/slider3.jpg mode change 100644 => 100755 templates/frontOffice/default/assets/img/favicon.ico mode change 100644 => 100755 templates/frontOffice/default/assets/img/favicon.png mode change 100644 => 100755 templates/frontOffice/default/assets/img/logo.gif mode change 100644 => 100755 templates/frontOffice/default/assets/img/payment/american-express.png mode change 100644 => 100755 templates/frontOffice/default/assets/img/payment/cheque.png mode change 100644 => 100755 templates/frontOffice/default/assets/img/payment/kwixo.png mode change 100644 => 100755 templates/frontOffice/default/assets/img/payment/mastercard.png mode change 100644 => 100755 templates/frontOffice/default/assets/img/payment/visa.png mode change 100644 => 100755 templates/frontOffice/default/assets/img/product/1/118x85.png mode change 100644 => 100755 templates/frontOffice/default/assets/img/product/1/560x445.png mode change 100644 => 100755 templates/frontOffice/default/assets/js/libs/jquery.js mode change 100644 => 100755 templates/frontOffice/default/assets/js/plugins/bootbox/bootbox.js mode change 100644 => 100755 templates/frontOffice/default/assets/js/plugins/bootbox/bootbox.min.js mode change 100644 => 100755 templates/frontOffice/default/assets/js/script.js mode change 100644 => 100755 templates/frontOffice/default/assets/less/fontawesome/bootstrap.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/fontawesome/core.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/fontawesome/extras.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/fontawesome/font-awesome-ie7.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/fontawesome/font-awesome.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/fontawesome/icons.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/fontawesome/mixins.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/fontawesome/path.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/fontawesome/variables.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/thelia/account.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/thelia/buttons.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/thelia/cart.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/thelia/category.less mode change 100644 => 100755 templates/frontOffice/default/assets/less/thelia/checkout.less mode change 100644 => 100755 templates/frontOffice/default/cart.html mode change 100644 => 100755 templates/frontOffice/default/category.html mode change 100644 => 100755 templates/frontOffice/default/contact-success.html mode change 100644 => 100755 templates/frontOffice/default/contact.html mode change 100644 => 100755 templates/frontOffice/default/content.html mode change 100644 => 100755 templates/frontOffice/default/currency.html mode change 100644 => 100755 templates/frontOffice/default/includes/addedToCart.html mode change 100644 => 100755 templates/frontOffice/default/includes/asides/articles.html mode change 100644 => 100755 templates/frontOffice/default/includes/categories-filters.html mode change 100644 => 100755 templates/frontOffice/default/includes/menu.html mode change 100644 => 100755 templates/frontOffice/default/includes/mini-cart.html mode change 100644 => 100755 templates/frontOffice/default/includes/product-empty.html mode change 100644 => 100755 templates/frontOffice/default/includes/single-product.html mode change 100644 => 100755 templates/frontOffice/default/includes/toolbar.html mode change 100644 => 100755 templates/frontOffice/default/index.html mode change 100644 => 100755 templates/frontOffice/default/language.html mode change 100644 => 100755 templates/frontOffice/default/layout.tpl mode change 100644 => 100755 templates/frontOffice/default/login.html mode change 100644 => 100755 templates/frontOffice/default/misc/breadcrumb.tpl mode change 100644 => 100755 templates/frontOffice/default/misc/checkout-progress.tpl mode change 100644 => 100755 templates/frontOffice/default/modal-address.html mode change 100644 => 100755 templates/frontOffice/default/newsletter.html mode change 100644 => 100755 templates/frontOffice/default/order-delivery.html mode change 100644 => 100755 templates/frontOffice/default/order-invoice.html mode change 100644 => 100755 templates/frontOffice/default/order-placed.html mode change 100644 => 100755 templates/frontOffice/default/password.html mode change 100644 => 100755 templates/frontOffice/default/product.html mode change 100644 => 100755 templates/frontOffice/default/register.html mode change 100644 => 100755 templates/frontOffice/default/search.html mode change 100644 => 100755 templates/frontOffice/default/view_all.html mode change 100644 => 100755 templates/pdf/default/I18n/en_US.php mode change 100644 => 100755 templates/pdf/default/I18n/es_ES.php mode change 100644 => 100755 templates/pdf/default/I18n/fr_FR.php mode change 100644 => 100755 templates/pdf/default/I18n/it_IT.php mode change 100644 => 100755 templates/pdf/default/delivery.html mode change 100644 => 100755 templates/pdf/default/invoice.html mode change 100644 => 100755 web/robots.txt diff --git a/templates/backOffice/default/admin-layout.tpl b/templates/backOffice/default/admin-layout.tpl old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/administrators.html b/templates/backOffice/default/administrators.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/ajax/language-update-modal.html b/templates/backOffice/default/ajax/language-update-modal.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/ajax/logger.html b/templates/backOffice/default/ajax/logger.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/ajax/product-attributes-tab.html b/templates/backOffice/default/ajax/product-attributes-tab.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/ajax/product-related-tab.html b/templates/backOffice/default/ajax/product-related-tab.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/ajax/template-attribute-list.html b/templates/backOffice/default/ajax/template-attribute-list.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/ajax/template-feature-list.html b/templates/backOffice/default/ajax/template-feature-list.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/ajax-loader.gif b/templates/backOffice/default/assets/img/ajax-loader.gif old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/bg.jpg b/templates/backOffice/default/assets/img/bg.jpg old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/deconnexion.png b/templates/backOffice/default/assets/img/deconnexion.png old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/header.jpg b/templates/backOffice/default/assets/img/header.jpg old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/logo-light.png b/templates/backOffice/default/assets/img/logo-light.png old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/logo.png b/templates/backOffice/default/assets/img/logo.png old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/top-bar-logo-save.png b/templates/backOffice/default/assets/img/top-bar-logo-save.png old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/top-bar-logo.png b/templates/backOffice/default/assets/img/top-bar-logo.png old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/img/top.jpg b/templates/backOffice/default/assets/img/top.jpg old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/bootstrap-editable/bootstrap-editable.js b/templates/backOffice/default/assets/js/bootstrap-editable/bootstrap-editable.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/bootstrap-select/bootstrap-select.js b/templates/backOffice/default/assets/js/bootstrap-select/bootstrap-select.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/bootstrap-switch/bootstrap-switch.js b/templates/backOffice/default/assets/js/bootstrap-switch/bootstrap-switch.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/bootstrap/bootstrap.js b/templates/backOffice/default/assets/js/bootstrap/bootstrap.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/coupon.js b/templates/backOffice/default/assets/js/coupon.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/document-upload.js b/templates/backOffice/default/assets/js/document-upload.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/dropzone.js b/templates/backOffice/default/assets/js/dropzone.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/image-upload.js b/templates/backOffice/default/assets/js/image-upload.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/jquery.jqplot.min.js b/templates/backOffice/default/assets/js/jqplot/jquery.jqplot.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.BezierCurveRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.BezierCurveRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.barRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.barRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.blockRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.blockRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.bubbleRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.bubbleRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasOverlay.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasOverlay.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasTextRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.canvasTextRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.categoryAxisRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.categoryAxisRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.ciParser.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.ciParser.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.cursor.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.cursor.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.dateAxisRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.dateAxisRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.donutRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.donutRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.dragable.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.dragable.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.enhancedLegendRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.enhancedLegendRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.funnelRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.funnelRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.highlighter.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.highlighter.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.json2.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.json2.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.logAxisRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.logAxisRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mekkoRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mekkoRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.meterGaugeRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.meterGaugeRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mobile.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.mobile.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.ohlcRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.ohlcRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pieRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pieRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pointLabels.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pointLabels.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidAxisRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidAxisRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidGridRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidGridRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidRenderer.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.pyramidRenderer.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.trendline.min.js b/templates/backOffice/default/assets/js/jqplot/plugins/jqplot.trendline.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.typewatch.js b/templates/backOffice/default/assets/js/jquery.typewatch.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-es_ES.js b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-es_ES.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-fr_FR.js b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-fr_FR.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-it_IT.js.js b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/jquery.ui.datepicker-it_IT.js.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/readme.txt b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/i18n/readme.txt old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/jquery.ui.datepicker.css b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/jquery.ui.datepicker.css old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/jquery.ui.datepicker.js b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.datepicker/jquery.ui.datepicker.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.theme.css b/templates/backOffice/default/assets/js/jquery.ui/jquery.ui.theme.css old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/json2.js b/templates/backOffice/default/assets/js/json2.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/libs/jquery.js b/templates/backOffice/default/assets/js/libs/jquery.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/main.js b/templates/backOffice/default/assets/js/main.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/tablesorter/jquery.metadata.js b/templates/backOffice/default/assets/js/tablesorter/jquery.metadata.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.min.js b/templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.min.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js b/templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.widgets.js b/templates/backOffice/default/assets/js/tablesorter/jquery.tablesorter.widgets.js old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/main.less b/templates/backOffice/default/assets/less/main.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/bootstrap-editable.less b/templates/backOffice/default/assets/less/thelia/bootstrap-editable.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/bootstrap-select.less b/templates/backOffice/default/assets/less/thelia/bootstrap-select.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/bootstrap-switch.less b/templates/backOffice/default/assets/less/thelia/bootstrap-switch.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/dropzone.less b/templates/backOffice/default/assets/less/thelia/dropzone.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/grid.less b/templates/backOffice/default/assets/less/thelia/grid.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/jqplot.less b/templates/backOffice/default/assets/less/thelia/jqplot.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/logger.less b/templates/backOffice/default/assets/less/thelia/logger.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/thelia.less b/templates/backOffice/default/assets/less/thelia/thelia.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/assets/less/thelia/wizard.less b/templates/backOffice/default/assets/less/thelia/wizard.less old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/attribute-edit.html b/templates/backOffice/default/attribute-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/attributes.html b/templates/backOffice/default/attributes.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/config-store.html b/templates/backOffice/default/config-store.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/configs/variables.conf b/templates/backOffice/default/configs/variables.conf old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/configuration.html b/templates/backOffice/default/configuration.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/content-edit.html b/templates/backOffice/default/content-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/countries.html b/templates/backOffice/default/countries.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/country-edit.html b/templates/backOffice/default/country-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/coupon/condition-input-ajax.html b/templates/backOffice/default/coupon/condition-input-ajax.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/coupon/conditions.html b/templates/backOffice/default/coupon/conditions.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/coupon/form.html b/templates/backOffice/default/coupon/form.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/currencies.html b/templates/backOffice/default/currencies.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/currency-edit.html b/templates/backOffice/default/currency-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/customer-edit.html b/templates/backOffice/default/customer-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/customers.html b/templates/backOffice/default/customers.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/document-edit.html b/templates/backOffice/default/document-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/feature-edit.html b/templates/backOffice/default/feature-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/features.html b/templates/backOffice/default/features.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/folder-edit.html b/templates/backOffice/default/folder-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/folders.html b/templates/backOffice/default/folders.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/image-edit.html b/templates/backOffice/default/image-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/admin-utilities-position-block.html b/templates/backOffice/default/includes/admin-utilities-position-block.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/admin-utilities-sortable-column-header.html b/templates/backOffice/default/includes/admin-utilities-sortable-column-header.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/catalog-breadcrumb.html b/templates/backOffice/default/includes/catalog-breadcrumb.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/confirmation-modal.html b/templates/backOffice/default/includes/confirmation-modal.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/content-folder-management.html b/templates/backOffice/default/includes/content-folder-management.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/customer_address_form_fields.html b/templates/backOffice/default/includes/customer_address_form_fields.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/document-upload-form.html b/templates/backOffice/default/includes/document-upload-form.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/document-upload-list-ajax.html b/templates/backOffice/default/includes/document-upload-list-ajax.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/folder-breadcrumb.html b/templates/backOffice/default/includes/folder-breadcrumb.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/generic-confirm-dialog.html b/templates/backOffice/default/includes/generic-confirm-dialog.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/generic-js-dialog.html b/templates/backOffice/default/includes/generic-js-dialog.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/image-upload-form.html b/templates/backOffice/default/includes/image-upload-form.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/image-upload-list-ajax.html b/templates/backOffice/default/includes/image-upload-list-ajax.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/module-block.html b/templates/backOffice/default/includes/module-block.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/notifications.html b/templates/backOffice/default/includes/notifications.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/product-details-tab.html b/templates/backOffice/default/includes/product-details-tab.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/product-general-tab.html b/templates/backOffice/default/includes/product-general-tab.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/includes/standard-description-form-fields.html b/templates/backOffice/default/includes/standard-description-form-fields.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/languages.html b/templates/backOffice/default/languages.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/mailing-system.html b/templates/backOffice/default/mailing-system.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/message-edit.html b/templates/backOffice/default/message-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/messages.html b/templates/backOffice/default/messages.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/module-configure.html b/templates/backOffice/default/module-configure.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/module-edit.html b/templates/backOffice/default/module-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/modules.html b/templates/backOffice/default/modules.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/order-edit.html b/templates/backOffice/default/order-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/orders.html b/templates/backOffice/default/orders.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/product-edit.html b/templates/backOffice/default/product-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/profile-edit.html b/templates/backOffice/default/profile-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/profiles.html b/templates/backOffice/default/profiles.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/search.html b/templates/backOffice/default/search.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/shipping-configuration-edit.html b/templates/backOffice/default/shipping-configuration-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/shipping-configuration.html b/templates/backOffice/default/shipping-configuration.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/shipping-zones-edit.html b/templates/backOffice/default/shipping-zones-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/shipping-zones.html b/templates/backOffice/default/shipping-zones.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/system-logs.html b/templates/backOffice/default/system-logs.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/tax-edit.html b/templates/backOffice/default/tax-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/tax-rule-edit.html b/templates/backOffice/default/tax-rule-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/taxes-rules.html b/templates/backOffice/default/taxes-rules.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/template-edit.html b/templates/backOffice/default/template-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/templates.html b/templates/backOffice/default/templates.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/translations.html b/templates/backOffice/default/translations.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/variable-edit.html b/templates/backOffice/default/variable-edit.html old mode 100644 new mode 100755 diff --git a/templates/backOffice/default/variables.html b/templates/backOffice/default/variables.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/404.html b/templates/frontOffice/default/404.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/account-password.html b/templates/frontOffice/default/account-password.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/account-update.html b/templates/frontOffice/default/account-update.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/account.html b/templates/frontOffice/default/account.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/address-update.html b/templates/frontOffice/default/address-update.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/address.html b/templates/frontOffice/default/address.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/218x146.png b/templates/frontOffice/default/assets/img/218x146.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/280x196.png b/templates/frontOffice/default/assets/img/280x196.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/700x320.png b/templates/frontOffice/default/assets/img/700x320.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/ajax-loader.gif b/templates/frontOffice/default/assets/img/ajax-loader.gif old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/carousel/1200x390.png b/templates/frontOffice/default/assets/img/carousel/1200x390.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/carousel/slider1.jpg b/templates/frontOffice/default/assets/img/carousel/slider1.jpg old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/carousel/slider2.jpg b/templates/frontOffice/default/assets/img/carousel/slider2.jpg old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/carousel/slider3.jpg b/templates/frontOffice/default/assets/img/carousel/slider3.jpg old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/favicon.ico b/templates/frontOffice/default/assets/img/favicon.ico old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/favicon.png b/templates/frontOffice/default/assets/img/favicon.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/logo.gif b/templates/frontOffice/default/assets/img/logo.gif old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/payment/american-express.png b/templates/frontOffice/default/assets/img/payment/american-express.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/payment/cheque.png b/templates/frontOffice/default/assets/img/payment/cheque.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/payment/kwixo.png b/templates/frontOffice/default/assets/img/payment/kwixo.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/payment/mastercard.png b/templates/frontOffice/default/assets/img/payment/mastercard.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/payment/visa.png b/templates/frontOffice/default/assets/img/payment/visa.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/product/1/118x85.png b/templates/frontOffice/default/assets/img/product/1/118x85.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/product/1/560x445.png b/templates/frontOffice/default/assets/img/product/1/560x445.png old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/js/libs/jquery.js b/templates/frontOffice/default/assets/js/libs/jquery.js old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/js/plugins/bootbox/bootbox.js b/templates/frontOffice/default/assets/js/plugins/bootbox/bootbox.js old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/js/plugins/bootbox/bootbox.min.js b/templates/frontOffice/default/assets/js/plugins/bootbox/bootbox.min.js old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/js/script.js b/templates/frontOffice/default/assets/js/script.js old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/bootstrap.less b/templates/frontOffice/default/assets/less/fontawesome/bootstrap.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/core.less b/templates/frontOffice/default/assets/less/fontawesome/core.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/extras.less b/templates/frontOffice/default/assets/less/fontawesome/extras.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/font-awesome-ie7.less b/templates/frontOffice/default/assets/less/fontawesome/font-awesome-ie7.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/font-awesome.less b/templates/frontOffice/default/assets/less/fontawesome/font-awesome.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/icons.less b/templates/frontOffice/default/assets/less/fontawesome/icons.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/mixins.less b/templates/frontOffice/default/assets/less/fontawesome/mixins.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/path.less b/templates/frontOffice/default/assets/less/fontawesome/path.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/fontawesome/variables.less b/templates/frontOffice/default/assets/less/fontawesome/variables.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/thelia/account.less b/templates/frontOffice/default/assets/less/thelia/account.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/thelia/buttons.less b/templates/frontOffice/default/assets/less/thelia/buttons.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/thelia/cart.less b/templates/frontOffice/default/assets/less/thelia/cart.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/thelia/category.less b/templates/frontOffice/default/assets/less/thelia/category.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/less/thelia/checkout.less b/templates/frontOffice/default/assets/less/thelia/checkout.less old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/cart.html b/templates/frontOffice/default/cart.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/category.html b/templates/frontOffice/default/category.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/contact-success.html b/templates/frontOffice/default/contact-success.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/contact.html b/templates/frontOffice/default/contact.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/content.html b/templates/frontOffice/default/content.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/currency.html b/templates/frontOffice/default/currency.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/addedToCart.html b/templates/frontOffice/default/includes/addedToCart.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/asides/articles.html b/templates/frontOffice/default/includes/asides/articles.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/categories-filters.html b/templates/frontOffice/default/includes/categories-filters.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/menu.html b/templates/frontOffice/default/includes/menu.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/mini-cart.html b/templates/frontOffice/default/includes/mini-cart.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/product-empty.html b/templates/frontOffice/default/includes/product-empty.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/single-product.html b/templates/frontOffice/default/includes/single-product.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/includes/toolbar.html b/templates/frontOffice/default/includes/toolbar.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/index.html b/templates/frontOffice/default/index.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/language.html b/templates/frontOffice/default/language.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/layout.tpl b/templates/frontOffice/default/layout.tpl old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/login.html b/templates/frontOffice/default/login.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/misc/breadcrumb.tpl b/templates/frontOffice/default/misc/breadcrumb.tpl old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/misc/checkout-progress.tpl b/templates/frontOffice/default/misc/checkout-progress.tpl old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/modal-address.html b/templates/frontOffice/default/modal-address.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/newsletter.html b/templates/frontOffice/default/newsletter.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/order-delivery.html b/templates/frontOffice/default/order-delivery.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/order-invoice.html b/templates/frontOffice/default/order-invoice.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/order-placed.html b/templates/frontOffice/default/order-placed.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/password.html b/templates/frontOffice/default/password.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/product.html b/templates/frontOffice/default/product.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/register.html b/templates/frontOffice/default/register.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/search.html b/templates/frontOffice/default/search.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/view_all.html b/templates/frontOffice/default/view_all.html old mode 100644 new mode 100755 diff --git a/templates/pdf/default/I18n/en_US.php b/templates/pdf/default/I18n/en_US.php old mode 100644 new mode 100755 diff --git a/templates/pdf/default/I18n/es_ES.php b/templates/pdf/default/I18n/es_ES.php old mode 100644 new mode 100755 diff --git a/templates/pdf/default/I18n/fr_FR.php b/templates/pdf/default/I18n/fr_FR.php old mode 100644 new mode 100755 diff --git a/templates/pdf/default/I18n/it_IT.php b/templates/pdf/default/I18n/it_IT.php old mode 100644 new mode 100755 diff --git a/templates/pdf/default/delivery.html b/templates/pdf/default/delivery.html old mode 100644 new mode 100755 diff --git a/templates/pdf/default/invoice.html b/templates/pdf/default/invoice.html old mode 100644 new mode 100755 diff --git a/web/robots.txt b/web/robots.txt old mode 100644 new mode 100755 From e7038c9369716843d11c87b2471ac0cde2bf8654 Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 27 Nov 2013 20:37:40 +0100 Subject: [PATCH 3/9] Spelling rewritten with 2 t --- core/lib/Thelia/Action/Product.php | 2 +- core/lib/Thelia/Core/Event/TheliaEvents.php | 2 +- .../Thelia/Form/CategoryModificationForm.php | 2 +- .../Thelia/Form/ContentModificationForm.php | 2 +- .../Thelia/Form/FolderModificationForm.php | 2 +- .../Thelia/Form/ProductModificationForm.php | 2 +- .../Thelia/Model/Tools/UrlRewritingTrait.php | 12 +- core/lib/Thelia/Tools/URL.php | 2 +- templates/backOffice/default/I18n/en_US.php | 1 - templates/backOffice/default/I18n/es_ES.php | 2 - templates/backOffice/default/I18n/fr_FR.php | 507 +++++++++--------- templates/backOffice/default/I18n/it_IT.php | 2 - .../backOffice/default/category-edit.html | 2 +- .../backOffice/default/content-edit.html | 2 +- templates/backOffice/default/folder-edit.html | 2 +- .../default/includes/product-general-tab.html | 2 +- 16 files changed, 275 insertions(+), 271 deletions(-) diff --git a/core/lib/Thelia/Action/Product.php b/core/lib/Thelia/Action/Product.php index 3917827d1..f51d95f28 100644 --- a/core/lib/Thelia/Action/Product.php +++ b/core/lib/Thelia/Action/Product.php @@ -113,7 +113,7 @@ class Product extends BaseAction implements EventSubscriberInterface ->save() ; - // Update the rewriten URL, if required + // Update the rewritten URL, if required $product->setRewrittenUrl($event->getLocale(), $event->getUrl()); // Update default category (ifd required) diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php index 1dfcb673c..4b929409c 100755 --- a/core/lib/Thelia/Core/Event/TheliaEvents.php +++ b/core/lib/Thelia/Core/Event/TheliaEvents.php @@ -681,7 +681,7 @@ final class TheliaEvents const MAILTRANSPORTER_CONFIG = 'action.mailertransporter.config'; /** - * sent when Thelia try to generate a rewriten url + * sent when Thelia try to generate a rewritten url */ const GENERATE_REWRITTENURL = 'action.generate_rewritenurl'; diff --git a/core/lib/Thelia/Form/CategoryModificationForm.php b/core/lib/Thelia/Form/CategoryModificationForm.php index 943c0d941..567f9e41f 100644 --- a/core/lib/Thelia/Form/CategoryModificationForm.php +++ b/core/lib/Thelia/Form/CategoryModificationForm.php @@ -38,7 +38,7 @@ class CategoryModificationForm extends CategoryCreationForm ->add("id", "hidden", array("constraints" => array(new GreaterThan(array('value' => 0))))) ->add("url", "text", array( - "label" => Translator::getInstance()->trans("Rewriten URL *"), + "label" => Translator::getInstance()->trans("Rewritten URL *"), "constraints" => array(new NotBlank()), "label_attr" => array("for" => "rewriten_url") )) diff --git a/core/lib/Thelia/Form/ContentModificationForm.php b/core/lib/Thelia/Form/ContentModificationForm.php index 14789ab84..c3887b88e 100644 --- a/core/lib/Thelia/Form/ContentModificationForm.php +++ b/core/lib/Thelia/Form/ContentModificationForm.php @@ -45,7 +45,7 @@ class ContentModificationForm extends ContentCreationForm ->add("id", "hidden", array("constraints" => array(new GreaterThan(array('value' => 0))))) ->add("url", "text", array( - "label" => Translator::getInstance()->trans("Rewriten URL *"), + "label" => Translator::getInstance()->trans("Rewritten URL *"), "constraints" => array(new NotBlank()), "label_attr" => array("for" => "rewritten_url") )) diff --git a/core/lib/Thelia/Form/FolderModificationForm.php b/core/lib/Thelia/Form/FolderModificationForm.php index 0ff90868c..9c4e4c601 100644 --- a/core/lib/Thelia/Form/FolderModificationForm.php +++ b/core/lib/Thelia/Form/FolderModificationForm.php @@ -38,7 +38,7 @@ class FolderModificationForm extends FolderCreationForm ->add("id", "hidden", array("constraints" => array(new GreaterThan(array('value' => 0))))) ->add("url", "text", array( - "label" => Translator::getInstance()->trans("Rewriten URL *"), + "label" => Translator::getInstance()->trans("Rewritten URL *"), "constraints" => array(new NotBlank()), "label_attr" => array("for" => "rewriten_url") )) diff --git a/core/lib/Thelia/Form/ProductModificationForm.php b/core/lib/Thelia/Form/ProductModificationForm.php index 34785cf45..15a629302 100644 --- a/core/lib/Thelia/Form/ProductModificationForm.php +++ b/core/lib/Thelia/Form/ProductModificationForm.php @@ -47,7 +47,7 @@ class ProductModificationForm extends ProductCreationForm )) ->add("url", "text", array( - "label" => Translator::getInstance()->trans("Rewriten URL *"), + "label" => Translator::getInstance()->trans("Rewritten URL *"), "constraints" => array(new NotBlank()), "label_attr" => array("for" => "rewriten_url_field") )) diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php index 0a8af40c8..d16ceaf5f 100644 --- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php +++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php @@ -30,17 +30,17 @@ use Thelia\Model\RewritingUrlQuery; use Thelia\Model\RewritingUrl; use Thelia\Tools\URL; /** - * A trait for managing Rewriten URLs from model classes + * A trait for managing Rewritten URLs from model classes */ trait UrlRewritingTrait { /** - * @returns string the view name of the rewriten object (e.g., 'category', 'product') + * @returns string the view name of the rewritten object (e.g., 'category', 'product') */ protected abstract function getRewrittenUrlViewName(); /** - * Get the object URL for the given locale, rewriten if rewriting is enabled. + * Get the object URL for the given locale, rewritten if rewriting is enabled. * * @param string $locale a valid locale (e.g. en_US) */ @@ -53,7 +53,7 @@ trait UrlRewritingTrait { } /** - * Generate a rewriten URL from the object title, and store it in the rewriting table + * Generate a rewritten URL from the object title, and store it in the rewriting table * * @param string $locale a valid locale (e.g. en_US) */ @@ -112,7 +112,7 @@ trait UrlRewritingTrait { } /** - * return the rewriten URL for the given locale + * return the rewritten URL for the given locale * * @param string $locale a valid locale (e.g. en_US) * @return null @@ -137,7 +137,7 @@ trait UrlRewritingTrait { } /** - * Set the rewriten URL for the given locale + * Set the rewritten URL for the given locale * * @param string $locale a valid locale (e.g. en_US) * @param $url the wanted url diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php index d00c5c4ab..85f5289cd 100755 --- a/core/lib/Thelia/Tools/URL.php +++ b/core/lib/Thelia/Tools/URL.php @@ -286,7 +286,7 @@ class URL } /** - * Genenerate the file part of a rewriten URL from a given baseString, using a view, a view id and a locale + * Genenerate the file part of a rewritten URL from a given baseString, using a view, a view id and a locale * * @param $view * @param $viewId diff --git a/templates/backOffice/default/I18n/en_US.php b/templates/backOffice/default/I18n/en_US.php index 839cbdeb2..fa5eaf663 100755 --- a/templates/backOffice/default/I18n/en_US.php +++ b/templates/backOffice/default/I18n/en_US.php @@ -183,7 +183,6 @@ return array( 'Images' => 'Images', 'Documents' => 'Documents', 'Rewritten URL' => 'Rewritten URL', - 'Rewriten URL' => 'Rewriten URL', 'Top level' => 'Top level', 'Visibility' => 'Visibility', 'Category created on %date_create. Last modification: %date_change' => 'Category created on %date_create. Last modification: %date_change', diff --git a/templates/backOffice/default/I18n/es_ES.php b/templates/backOffice/default/I18n/es_ES.php index 6884502b9..58f83ebb2 100755 --- a/templates/backOffice/default/I18n/es_ES.php +++ b/templates/backOffice/default/I18n/es_ES.php @@ -308,9 +308,7 @@ return array ( 'Conclusion' => '', 'A short post-description information' => '', 'Short conclusion' => '', - 'Rewriten URL *' => '', 'Rewritten URL' => '', - 'Rewriten URL' => '', 'Parent category *' => '', 'Top level' => '', 'Visibility' => '', diff --git a/templates/backOffice/default/I18n/fr_FR.php b/templates/backOffice/default/I18n/fr_FR.php index 4d482cb30..e633a3caf 100755 --- a/templates/backOffice/default/I18n/fr_FR.php +++ b/templates/backOffice/default/I18n/fr_FR.php @@ -1,39 +1,52 @@ 'Page non trouvée', - 'The server returned a "404 Not Found"' => 'Le serveur à retourné l\'erreur "404 non trouvé"', - 'The page you\'ve requested was not found. Please check the page address, and try again.' => 'La page que vous avez demandé n\'est pas disponible.', - 'Thelia Back Office' => 'Thelia Back Office', - 'Version %ver' => 'Version %ver', - 'View site' => 'Voir le site', - 'View shop' => 'Voir la boutique', - 'Profil' => 'Profile', - 'Close administation session' => 'Quitter l\'interface d\'administration', - 'Logout' => 'Se déconnecter', + 'No' => 'Non', + 'Yes' => 'Oui', + 'Send files' => 'Envoyer les fichiers', + 'Drop files to upload' => 'Déposez les fichiers à envoyer sur le serveur', + 'Browse files' => 'Sélectionner les fichiers', + 'Can\'t load documents, please refresh this page.' => 'Échec lors du chargement du document, veuillez réessayer', + 'OK' => 'OK', + 'Edit information in %lng' => 'Modifier les information en %Ing', + 'Edit prices in %curr' => 'Modifier les prix en %curr', + 'Save' => ' Enregistrer', + 'Save and close' => 'Enregistrer et fermer', + 'Close' => 'Fermer', + 'Product reference' => 'Référence produit', + 'Cancel' => 'Annuler', 'Home' => 'Accueil', - 'Customers' => 'Clients', - 'Orders' => 'Commandes', - 'All orders' => 'Toutes les commandes', - 'Catalog' => 'Catalogue', 'Folders' => 'Dossier', - 'Coupons' => 'Codes Promo', + 'Can\'t load images, please refresh this page.' => 'Échec lors du chargement de l\'image, veuillez réessayer', + 'Name' => 'Nom', + 'Description' => 'Description', + 'Actions' => 'Actions', + 'Title' => 'Civilité', + 'Please retry' => 'Merci de réessayer', + 'Select a folder...' => 'Choisissez un dossier de contenu...', + 'ID' => 'ID', + 'Select a tax tule' => 'Sélectionnez une règle de taxes', + 'Product weight' => 'Poids du produit', + 'Kg' => 'Kg', + 'Product price' => 'Prix du produit', + 'Reference' => 'Reference', + 'Quantity' => 'Quantité', + 'Company' => 'Entreprise', + 'Firstname' => 'Prénom', + 'Lastname' => 'Nom', + 'Address' => 'Adresse', + 'Additional address' => 'Adresse complémentaire', + 'Zip code' => 'Code postal', + 'City' => 'Ville', + 'Catalog' => 'Catalogue', + 'Editing %cat' => 'Edition de %cat', + 'Edit this category' => 'Editer cette catégorie', 'Configuration' => 'Configuration', - 'Modules' => 'Modules', - 'Search' => 'Recherche', - 'Thelia, the open source e-commerce solution' => 'Thelia, solution e-commerce libre', - '© Thelia 2013' => '© Thelia 2013', - 'Published by OpenStudio' => 'Edité par OpenStudio', - 'Thelia support forum' => 'Communauté Thelia', - 'Thelia contributions' => 'Contributions Thelia', - 'Thelia Mailing System' => 'Configuration des envois de mails', - 'Administration logs' => 'Gestion des logs', - 'Show logs' => 'Voir les loge', - 'Period' => 'Période', - 'From' => 'De', - 'To' => 'A', - 'Administrators' => 'Administrateurs', - 'Resources' => 'Ressources', + 'Shipping configuration' => 'Configuration du transport', + 'Coupon' => 'Code promo', + 'Create' => 'Créer', + 'Coupons : ' => 'Codes promo', + 'Create a new coupon' => 'Créer un nouveau code promo', 'Back-office users' => 'Utilisateurs du back-office', 'Taxes' => 'Taxes', 'Create a new administrator' => 'Créer un nouvel administrateur', @@ -41,15 +54,12 @@ return array( 'First Name' => 'Prénom', 'Last Name' => 'Nom', 'Profile' => 'Profile', - 'Actions' => 'Actions', 'Superadministrator' => 'Super-administrateur', 'Change this administrator' => 'Modifier cet administrateur', 'Delete this administrator' => 'Supprimer cet administrateur', 'FirstName' => 'Prénom', 'LastName' => 'Nom', 'Password' => 'Mot de passe', - 'Create' => 'Créer', - 'Cancel' => 'Annuler', 'Leave empty to keep current password' => 'Laisser ce champ vide pour ne pas modifier le mot de passe', 'Update a new administrator' => 'Modifier cet administrateur', 'Update' => 'Mettre à jour', @@ -57,182 +67,38 @@ return array( 'Do you really want to delete this administrator ?' => 'Confirmez-vous la suppression de cet adminisrateur ?', 'You can\'t delete this administrator' => 'Vous ne pouvez pas supprimer cet administrateur', 'They are some administrator which are linked to this administrator. Please edit/remove them before deleting this administrator.' => 'Cet administrateur est lié avec un ou plusieurs autres administrateurs. Supprimez ou modifiez ces administrateur d\'abord.', - 'Label' => 'Libellé', - 'Company' => 'Entreprise', - 'Edit a language' => 'Modifier une langue', - 'Edit this language' => 'Modifier cette langue', - 'Current product template' => 'Gabarit de produit actuel', - 'Do not use a product template' => 'Ne pas utiliser de gabarit', - 'Apply' => 'Appliquer', - 'Product Attributes' => 'Déclinaisons du produit', - 'ID' => 'ID', - 'Attribute Name' => 'Nom de la déclinaison', - 'This product template does not contains any features' => 'Ce gabarit de produit ne comporte aucune caractéristique', - 'Product Features' => 'Caractéristiques du produit', - 'Feature Name' => 'Nom de la caractéristique', - 'Feature value for this product' => 'Valeur de la caractéristique', - 'Use Ctrl+click to select more than one value. You can also clear selected values.' => 'Utilisez Ctrl+clic pour choisir plus d\'une valeur. Vous pouvez aussi tout désélectionner.', - 'Enter here the feature value as free text' => 'Indiquez ici la valeur de la caractéristique', - 'Feature value' => 'Valeur de la caractéristique', - 'Related content' => 'Contenu associé', - 'You can attach here some content to this product' => 'Attachez ici un ou plusieurs contenus à ce produit', - 'Select a folder...' => 'Choisissez un dossier de contenu...', - 'Select a folder to get its content' => 'Choisissez un dossier de contenu pour lister ses contenus', - 'Select a folder content...' => 'Choisissez un dossier de contenu...', - 'Select a content and click (+) to add it to this product' => 'Chosiissez un contenu, et cliquez [+] pour l\'attacher au produit', - 'No available content in this folder' => 'Ce dossier est vide de contenus', - 'No folders found' => 'Aucun dossier n\'a été trouvé.', - 'Content title' => 'Titre du contenu', - 'Position' => 'Position', - 'Delete this content' => 'Supprimer ce contenu', - 'Category title' => 'Titre de la catégorie', - 'Enter new category position' => 'Classement de la catégorie ', - 'Lire la suite' => 'Lire la suite', - 'Value' => 'Valeur', - 'Title' => 'Civilité', - 'Product attributes' => 'Attributs produit', - 'Categories' => 'Catégories', - 'Top level categories' => 'Catégories de niveau 1 ', - 'Add a new category' => 'Ajouter une catégorie', - 'Online' => 'En ligne', - 'Browse this category' => 'Parcourir cette catégorie', - 'Edit this category' => 'Editer cette catégorie', - 'Delete this category and all its contents' => 'Supprimer cette catégorie et tout ce qu\'elle contient ? ', - 'This category has no sub-categories. To create a new one, click the + button above.' => 'Cette catégorie n\'a pas de sous-catégorie. Pour en créer une nouvelle, cliquez sur le bouton + ci-dessus.', - 'This category has no sub-categories.' => 'Cette catégorie n\'a pas de sous-catégorie.', - 'Top level Products' => 'Produits mis en avant', - 'Add a new product' => 'Ajouter un nouveau produit', - 'Reference' => 'Reference', - 'Product title' => 'Titre du produit', - 'This category doesn\'t contains any products. To add a new product, click the + button above.' => 'Cette catégorie n\'a aucun produit. Pour créer un nouveau product, cliques sur le bouton + ci-dessus. ', - 'Name' => 'Nom', - 'Enter here the category name in the default language (%title)' => 'Entrer ici le nom de la catégorie dans la langue par défaut (%title)', - 'Create a new category' => 'Créer une catégorie', - 'Create this category' => 'Créer cette catégorie', - 'Enter here the product reference' => 'Entrez ici la nouvelle référence produit', - 'Enter here the product name in the default language (%title)' => 'Entrez ici le nom du produit dans la langue par défaut (%title)', - 'Product price' => 'Prix du produit', - 'Enter here the product price in the default currency (%title)' => 'ntrez ici le prix du produit dans la langue par défaut (%title)', - 'Select a tax tule' => 'Sélectionnez une règle de taxes', - 'Select here the tax applicable to this product' => 'Sélectionnez ici la taxe applicable sur ce produit', - 'Product weight' => 'Poids du produit', - 'Kg' => 'Kg', - 'Enter here the product weight, in Kilogrammes' => 'Entrez ici le poids du produit, en Kilogrammes', - 'Create a new product' => 'Créer un nouveau produit', - 'Create this product' => 'Créer ce produit', - 'Delete category' => 'Supprimer cette catégorie', - 'Do you really want to delete this category and all its content ?' => 'Voulez-vous vraiment supprimer cette catégorie et tout ce qu\'elle contient ?', - 'Delete product' => 'Supprimer ce produit', - 'Do you really want to delete this product ?' => 'Voulez-vous vraiment supprimer ce produit ?', - 'Enter new product position' => 'Classement du produit', - 'Edit category' => 'Editer la catégorie', - 'Edit category %title' => 'Editer le titre de la catégorie : %title', - 'Thelia configuration' => 'Configuration thelia', - 'Product catalog configuration' => 'Configuration du catalogue produit', - 'Product templates' => 'Template produit', - 'Product features' => 'Caractéristiques produit', - 'Mailing templates' => 'Template e-mail', - 'Currencies' => 'Monnaie', - 'Taxes rules' => 'Règles de taxes', - 'Shipping configuration' => 'Configuration du transport', - 'Countries' => 'Pays', - 'Shipping zones' => 'Zones de livraison', - 'System parameters' => 'Paramètres système ', - 'System variables' => 'Gestion des variables', - 'Administration profiles' => 'Gestion des administrateurs', - 'Languages & URLs' => 'Langues et URLs', - 'Mailing system' => 'Envoi des e-mails', - 'System logs' => 'Journal des logs', - 'And' => 'Et', - 'Edit' => 'Editer', - 'Delete' => 'Supprimer', - 'Code :' => 'Code', - 'code' => 'code', - 'Title :' => 'Titre', - 'title' => 'titre', - 'Is enabled' => 'Est valide', - 'Is available on special offers' => 'Est valide sur les offres promotionnelles', - 'Is cumulative' => 'Est cumulable', - 'Is removing postage' => 'Offre les frais de port', - 'Expiration date :' => 'Date de fin de validité', - 'yyyy-mm-dd' => 'jjjj--mm--aa', - 'Is unlimited' => 'Est illimité', - 'Max usage :' => 'Utilisations max', - 'max usage' => 'utilisations max', - 'Type :' => 'Type', - 'Please select a coupon type' => 'Merci d\'entrer le type de code', - 'Amount :' => 'Montant', - '14.50' => '14.50', - 'Short description :' => 'Description courte', - 'short description' => 'description court', - 'Long description :' => 'Description longue', - 'long description' => 'description longue', - 'Save your modifications' => 'Enregistrer les modifications', - 'Conditions' => 'Conditions', - 'Save this condition' => 'Enregistrer cette condition', - 'Condition\'s category :' => 'Type de condition', - 'Please select a condition category' => 'Merci d\'entrer le type de condition', - 'Coupon' => 'Code promo', - 'Coupons : ' => 'Codes promo', - 'Create a new coupon' => 'Créer un nouveau code promo', - 'Browse' => 'Parcourir', - 'List' => 'Liste', - 'Enabled coupons' => 'Codes promo disponibles', - 'Code' => 'Code', - 'Days before expiration' => 'Jours de validité', - 'Usage left' => 'Utilisation restante', - 'Unlimited' => 'Illimité', - 'Disabled coupons' => 'Codes désactivés', - 'Expiration date' => 'Date de fin', - 'Amount' => 'Montant', - 'Update coupon' => 'Mettre à jour le code', - 'Please retry' => 'Merci de réessayer', - 'Please select another condition' => 'Merci de sélectionner une autre condition', - 'Edit a customer' => 'Editer un client', - 'Editing customer "%name"' => 'Edition du client "%name"', - 'Customer informations' => 'Informations client', - 'Firstname' => 'Prénom', - 'Lastname' => 'Nom', - 'Default address' => 'Adresse par défaut', - 'Address' => 'Adresse', - 'Additional address' => 'Adresse complémentaire', - 'Zip code' => 'Code postal', - 'City' => 'Ville', - 'Other addresses' => 'Autres adresses', - 'Add a new address' => 'Ajouter une nouvelle adresse', - 'Phone' => 'Téléphone', - 'Edit this address' => 'Editer cette adresse', - 'Use this address by default' => 'Utiliser comme adresse par défaut', - 'Delete this customer and all his orders' => 'Supprimer ce client et toutes ses commandes', - 'orders for this customer' => 'commandes pour ce client', - 'Order n°' => 'Commande n° ', - 'Date & Hour' => 'Date et heure', - 'Status' => 'Etat', - 'Create this address' => 'Créer cette adresse', - 'Use address by default' => 'Utiliser comme adresse par défaut', - 'Do you really want to use this address by default ?' => 'Voulez-vous vraiment utiliser cette adresse comme adresse par défaut ?', - 'Delete address' => 'Supprimer cette adresse', - 'Do you really want to delete this address ?' => 'Voulez-vous vraiment supprimer cette adresse ?', - 'Customer' => 'Client', - 'Customers list' => 'Liste des clients', - 'Add a new Customer' => 'Ajouter un client', - 'Edit this customer' => 'Modifier ce client', - 'Send a mail to this customer' => 'Contacter ce client par mail', - 'Email address' => 'Adresse e-mail', - 'Create a new customer' => 'Ajouter un client', - 'Create this customer' => 'Ajouter ce client', - 'Delete customer' => 'Supprimer ce client', - 'Do you really want to delete this customer ?' => 'Voulez-vous supprimer ce client ? ', 'Back' => 'Retour', - 'Save' => ' Enregistrer', - 'Description' => 'Description', + 'Thelia System Variables' => 'Variables Thelia', + 'System variables' => 'Gestion des variables', + 'Thelia system variables' => 'Variables Thelia', + 'Add a new variable' => 'Ajouter une variable', + 'Save chages' => 'Enregistrer les modifications', + 'Save changes' => 'Enregistrer les modifications', + 'Purpose' => 'Objet', + 'Value' => 'Valeur', + 'Action' => 'Action', + 'Change this variable' => 'Modifier cette variable', + 'Cancel changes and revert to original value' => 'Annuler les modifications et revenir à la version antérieure', + 'Delete this variable' => 'Supprimer cette variable', + 'This variable could not be changed.' => 'Cette variable ne peut pas être modifiée', + 'Variable name' => 'Nom de la variable', + 'Variable value' => 'Valeur de la variable', + 'Variable purpose' => 'Objet de la variable', + 'Enter here the category name in the default language (%title)' => 'Entrer ici le nom de la catégorie dans la langue par défaut (%title)', + 'Create a new variable' => 'Créer une nouvelle variable', + 'Create this variable' => 'Ajouter cette variable', + 'Delete a variable' => 'Supprimer une variable', + 'Do you really want to delete this variable ?' => 'Voulez-vous vraiment supprimer cette variable ?', 'Back-office home' => 'Accueil administration', 'Dashboard' => 'Tableau de bord', 'Sales' => 'Ventes', 'New customers' => 'Nouveaux clients', + 'Orders' => 'Commandes', 'First orders' => 'Premières commandes', 'Aborted orders' => 'Paniers abandonnés', 'Shop Informations' => 'Informations sur le magasin', + 'Customers' => 'Clients', + 'Categories' => 'Catégories', 'Products' => 'Produits', 'Online products' => 'Produits en ligne', 'Offline products' => 'Produits hors ligne', @@ -251,31 +117,78 @@ return array( 'Latest version available' => 'Dernière version disponible', 'News' => 'Actualités', 'Click here' => 'Cliquez ici', - 'Editing %cat' => 'Edition de %cat', - 'No' => 'Non', - 'Yes' => 'Oui', - 'OK' => 'OK', - 'Save and close' => 'Enregistrer et fermer', - 'Quantity' => 'Quantité', - 'deactivate' => 'désactiver', - 'en_US' => 'en_US', - 'd-m-Y' => 'j-m-A', + 'Edit a customer' => 'Editer un client', + 'Editing customer "%name"' => 'Edition du client "%name"', + 'Customer informations' => 'Informations client', + 'Default address' => 'Adresse par défaut', + 'Other addresses' => 'Autres adresses', + 'Add a new address' => 'Ajouter une nouvelle adresse', + 'Phone' => 'Téléphone', + 'Edit this address' => 'Editer cette adresse', + 'Use this address by default' => 'Utiliser comme adresse par défaut', + 'Delete this customer and all his orders' => 'Supprimer ce client et toutes ses commandes', + 'orders for this customer' => 'commandes pour ce client', + 'Order n°' => 'Commande n° ', + 'Date & Hour' => 'Date et heure', + 'Amount' => 'Montant', + 'Status' => 'Etat', + 'Create this address' => 'Créer cette adresse', + 'Use address by default' => 'Utiliser comme adresse par défaut', + 'Do you really want to use this address by default ?' => 'Voulez-vous vraiment utiliser cette adresse comme adresse par défaut ?', + 'Delete address' => 'Supprimer cette adresse', + 'Do you really want to delete this address ?' => 'Voulez-vous vraiment supprimer cette adresse ?', + 'Modules' => 'Modules', + 'Taxes rules' => 'Règles de taxes', + 'Apply' => 'Appliquer', + 'Thelia Back Office' => 'Thelia Back Office', 'Username' => 'Nom d\'utilisateur', - 'Host :' => 'Host', - 'Host' => 'Host', - 'Port :' => 'Port', - 'Port' => 'Port', - 'Username :' => 'Nom d\'utilisateur', - 'Password :' => 'Mot de passe', - 'Source IP :' => 'IP source', - 'Source IP' => 'IP source', - 'Variable name' => 'Nom de la variable', - 'Purpose' => 'Objet', + 'Related content' => 'Contenu associé', + 'You can attach here some content to this product' => 'Attachez ici un ou plusieurs contenus à ce produit', + 'Select a folder to get its content' => 'Choisissez un dossier de contenu pour lister ses contenus', + 'Select a folder content...' => 'Choisissez un dossier de contenu...', + 'Select a content and click (+) to add it to this product' => 'Chosiissez un contenu, et cliquez [+] pour l\'attacher au produit', + 'No available content in this folder' => 'Ce dossier est vide de contenus', + 'No folders found' => 'Aucun dossier n\'a été trouvé.', + 'Content title' => 'Titre du contenu', + 'Position' => 'Position', + 'Delete this content' => 'Supprimer ce contenu', + 'Category title' => 'Titre de la catégorie', + 'Enter new category position' => 'Classement de la catégorie ', + 'Lire la suite' => 'Lire la suite', + 'Label' => 'Libellé', + 'Edit a language' => 'Modifier une langue', + 'Edit this language' => 'Modifier cette langue', + 'Current product template' => 'Gabarit de produit actuel', + 'Do not use a product template' => 'Ne pas utiliser de gabarit', + 'Product Attributes' => 'Déclinaisons du produit', + 'Attribute Name' => 'Nom de la déclinaison', + 'This product template does not contains any features' => 'Ce gabarit de produit ne comporte aucune caractéristique', + 'Product Features' => 'Caractéristiques du produit', + 'Feature Name' => 'Nom de la caractéristique', + 'Feature value for this product' => 'Valeur de la caractéristique', + 'Use Ctrl+click to select more than one value. You can also clear selected values.' => 'Utilisez Ctrl+clic pour choisir plus d\'une valeur. Vous pouvez aussi tout désélectionner.', + 'Enter here the feature value as free text' => 'Indiquez ici la valeur de la caractéristique', + 'Feature value' => 'Valeur de la caractéristique', + 'Currencies' => 'Monnaie', + 'Code' => 'Code', + 'Edit category' => 'Editer la catégorie', + 'Edit category %title' => 'Editer le titre de la catégorie : %title', + 'Search' => 'Recherche', + 'Customer' => 'Client', + 'customer ref' => 'ref client', + 'company' => 'entreprise', + 'firstname & lastname' => 'Prénom & nom', + 'last order' => 'Dernière commande', + 'order amount' => 'Montant de la commande', + 'Edit this customer' => 'Modifier ce client', + 'Send a mail to this customer' => 'Contacter ce client par mail', + 'Edit this order' => 'Editer cette commande ', + 'Product' => 'Produit', + 'Product title' => 'Titre du produit', 'Edit an order' => 'Editer une commande', 'Ordered products' => 'Produits commandés', 'Invoice and Delivery' => 'Livraison et facturation', 'Cart' => 'Panier', - 'Product' => 'Produit', 'Unit. price' => 'Prix unitaire', 'Tax' => 'Taxes', 'Unit taxed price' => 'Prix unitaire TTC', @@ -305,37 +218,133 @@ return array( 'Edit delivery address' => 'Editer l\'adresse de livraison', 'Edit order address' => 'Editer l\'adresse de commande ', 'Confirm changes' => 'Valider les modifications', - 'Edit this order' => 'Editer cette commande ', - 'Cancel this order' => 'Annuler cette commande', - 'Delete an order' => 'Supprimer une commande', - 'Do you really want to cancel this order ?' => 'Voulez-vous vraiment sup primer cette commande ? ', - 'View' => 'Voir', - 'customer ref' => 'ref client', - 'company' => 'entreprise', - 'firstname & lastname' => 'Prénom & nom', - 'last order' => 'Dernière commande', - 'order amount' => 'Montant de la commande', - 'Add' => 'Ajouter', - 'Warning' => 'Attention', + 'Update coupon' => 'Mettre à jour le code', + 'Please select another condition' => 'Merci de sélectionner une autre condition', + 'Online' => 'En ligne', 'Edit a system variable' => 'Modifier une variable système', 'Editing variable "%name"' => 'Modification de la variable "%name" ', 'Edit variable %name' => 'Modifier de la variable "%name" ', - 'Variable value' => 'Valeur de la variable', 'Variable created on %date_create. Last modification: %date_change' => 'Variable créée le %date_create. Dernière modification: %date_change', 'Sorry, variable ID=%id was not found.' => 'Désolé, la variable ID=%id n\'a pas été trouvée.', - 'Thelia System Variables' => 'Variables Thelia', - 'Thelia system variables' => 'Variables Thelia', - 'Add a new variable' => 'Ajouter une variable', - 'Save chages' => 'Enregistrer les modifications', - 'Save changes' => 'Enregistrer les modifications', - 'Action' => 'Action', - 'Change this variable' => 'Modifier cette variable', - 'Cancel changes and revert to original value' => 'Annuler les modifications et revenir à la version antérieure', - 'Delete this variable' => 'Supprimer cette variable', - 'This variable could not be changed.' => 'Cette variable ne peut pas être modifiée', - 'Variable purpose' => 'Objet de la variable', - 'Create a new variable' => 'Créer une nouvelle variable', - 'Create this variable' => 'Ajouter cette variable', - 'Delete a variable' => 'Supprimer une variable', - 'Do you really want to delete this variable ?' => 'Voulez-vous vraiment supprimer cette variable ?', + 'Is enabled' => 'Est valide', + 'Expiration date' => 'Date de fin', + 'Usage left' => 'Utilisation restante', + 'Unlimited' => 'Illimité', + 'And' => 'Et', + 'Edit' => 'Editer', + 'Mailing templates' => 'Template e-mail', + 'Code :' => 'Code', + 'code' => 'code', + 'Title :' => 'Titre', + 'title' => 'titre', + 'Is available on special offers' => 'Est valide sur les offres promotionnelles', + 'Is cumulative' => 'Est cumulable', + 'Is removing postage' => 'Offre les frais de port', + 'Expiration date :' => 'Date de fin de validité', + 'yyyy-mm-dd' => 'jjjj--mm--aa', + 'Is unlimited' => 'Est illimité', + 'Max usage :' => 'Utilisations max', + 'max usage' => 'utilisations max', + 'Type :' => 'Type', + 'Please select a coupon type' => 'Merci d\'entrer le type de code', + 'Amount :' => 'Montant', + '14.50' => '14.50', + 'Short description :' => 'Description courte', + 'short description' => 'description court', + 'Long description :' => 'Description longue', + 'long description' => 'description longue', + 'Save your modifications' => 'Enregistrer les modifications', + 'Conditions' => 'Conditions', + 'Save this condition' => 'Enregistrer cette condition', + 'Condition\'s category :' => 'Type de condition', + 'Please select a condition category' => 'Merci d\'entrer le type de condition', + 'Delete' => 'Supprimer', + 'Thelia Mailing System' => 'Configuration des envois de mails', + 'Mailing system' => 'Envoi des e-mails', + 'Host :' => 'Host', + 'Host' => 'Host', + 'Port :' => 'Port', + 'Port' => 'Port', + 'Username :' => 'Nom d\'utilisateur', + 'Password :' => 'Mot de passe', + 'Source IP :' => 'IP source', + 'Source IP' => 'IP source', + 'Product attributes' => 'Attributs produit', + 'Product features' => 'Caractéristiques produit', + 'Administration logs' => 'Gestion des logs', + 'Show logs' => 'Voir les loge', + 'Period' => 'Période', + 'From' => 'De', + 'To' => 'A', + 'Administrators' => 'Administrateurs', + 'Resources' => 'Ressources', + 'Shipping zones' => 'Zones de livraison', + 'Add' => 'Ajouter', + 'Cancel this order' => 'Annuler cette commande', + 'Delete an order' => 'Supprimer une commande', + 'Do you really want to cancel this order ?' => 'Voulez-vous vraiment sup primer cette commande ? ', + 'System logs' => 'Journal des logs', + 'View' => 'Voir', + 'deactivate' => 'désactiver', + 'en_US' => 'en_US', + 'd-m-Y' => 'j-m-A', + 'Page not found' => 'Page non trouvée', + 'The server returned a "404 Not Found"' => 'Le serveur à retourné l\'erreur "404 non trouvé"', + 'The page you\'ve requested was not found. Please check the page address, and try again.' => 'La page que vous avez demandé n\'est pas disponible.', + 'Customers list' => 'Liste des clients', + 'Add a new Customer' => 'Ajouter un client', + 'Email address' => 'Adresse e-mail', + 'Create a new customer' => 'Ajouter un client', + 'Create this customer' => 'Ajouter ce client', + 'Delete customer' => 'Supprimer ce client', + 'Do you really want to delete this customer ?' => 'Voulez-vous supprimer ce client ? ', + 'Countries' => 'Pays', + 'Coupons' => 'Codes Promo', + 'Browse' => 'Parcourir', + 'List' => 'Liste', + 'Enabled coupons' => 'Codes promo disponibles', + 'Days before expiration' => 'Jours de validité', + 'Disabled coupons' => 'Codes désactivés', + 'Version %ver' => 'Version %ver', + 'View site' => 'Voir le site', + 'View shop' => 'Voir la boutique', + 'Profil' => 'Profile', + 'Close administation session' => 'Quitter l\'interface d\'administration', + 'Logout' => 'Se déconnecter', + 'All orders' => 'Toutes les commandes', + 'Thelia, the open source e-commerce solution' => 'Thelia, solution e-commerce libre', + '© Thelia 2013' => '© Thelia 2013', + 'Published by OpenStudio' => 'Edité par OpenStudio', + 'Thelia support forum' => 'Communauté Thelia', + 'Thelia contributions' => 'Contributions Thelia', + 'Thelia configuration' => 'Configuration thelia', + 'Product catalog configuration' => 'Configuration du catalogue produit', + 'Product templates' => 'Template produit', + 'System parameters' => 'Paramètres système ', + 'Administration profiles' => 'Gestion des administrateurs', + 'Languages & URLs' => 'Langues et URLs', + 'Warning' => 'Attention', + 'Top level categories' => 'Catégories de niveau 1 ', + 'Add a new category' => 'Ajouter une catégorie', + 'Browse this category' => 'Parcourir cette catégorie', + 'Delete this category and all its contents' => 'Supprimer cette catégorie et tout ce qu\'elle contient ? ', + 'This category has no sub-categories. To create a new one, click the + button above.' => 'Cette catégorie n\'a pas de sous-catégorie. Pour en créer une nouvelle, cliquez sur le bouton + ci-dessus.', + 'This category has no sub-categories.' => 'Cette catégorie n\'a pas de sous-catégorie.', + 'Top level Products' => 'Produits mis en avant', + 'Add a new product' => 'Ajouter un nouveau produit', + 'This category doesn\'t contains any products. To add a new product, click the + button above.' => 'Cette catégorie n\'a aucun produit. Pour créer un nouveau product, cliques sur le bouton + ci-dessus. ', + 'Create a new category' => 'Créer une catégorie', + 'Create this category' => 'Créer cette catégorie', + 'Enter here the product reference' => 'Entrez ici la nouvelle référence produit', + 'Enter here the product name in the default language (%title)' => 'Entrez ici le nom du produit dans la langue par défaut (%title)', + 'Enter here the product price in the default currency (%title)' => 'ntrez ici le prix du produit dans la langue par défaut (%title)', + 'Select here the tax applicable to this product' => 'Sélectionnez ici la taxe applicable sur ce produit', + 'Enter here the product weight, in Kilogrammes' => 'Entrez ici le poids du produit, en Kilogrammes', + 'Create a new product' => 'Créer un nouveau produit', + 'Create this product' => 'Créer ce produit', + 'Delete category' => 'Supprimer cette catégorie', + 'Do you really want to delete this category and all its content ?' => 'Voulez-vous vraiment supprimer cette catégorie et tout ce qu\'elle contient ?', + 'Delete product' => 'Supprimer ce produit', + 'Do you really want to delete this product ?' => 'Voulez-vous vraiment supprimer ce produit ?', + 'Enter new product position' => 'Classement du produit', ); diff --git a/templates/backOffice/default/I18n/it_IT.php b/templates/backOffice/default/I18n/it_IT.php index 6884502b9..58f83ebb2 100755 --- a/templates/backOffice/default/I18n/it_IT.php +++ b/templates/backOffice/default/I18n/it_IT.php @@ -308,9 +308,7 @@ return array ( 'Conclusion' => '', 'A short post-description information' => '', 'Short conclusion' => '', - 'Rewriten URL *' => '', 'Rewritten URL' => '', - 'Rewriten URL' => '', 'Parent category *' => '', 'Top level' => '', 'Visibility' => '', diff --git a/templates/backOffice/default/category-edit.html b/templates/backOffice/default/category-edit.html index 62f9290f1..7225ddf6e 100755 --- a/templates/backOffice/default/category-edit.html +++ b/templates/backOffice/default/category-edit.html @@ -84,7 +84,7 @@ {$label} : - + {/form_field} diff --git a/templates/backOffice/default/content-edit.html b/templates/backOffice/default/content-edit.html index 8bccc01d4..ae92061b9 100755 --- a/templates/backOffice/default/content-edit.html +++ b/templates/backOffice/default/content-edit.html @@ -85,7 +85,7 @@ {$label} : - + {/form_field} diff --git a/templates/backOffice/default/folder-edit.html b/templates/backOffice/default/folder-edit.html index 2b8b6bfe4..82f57af68 100755 --- a/templates/backOffice/default/folder-edit.html +++ b/templates/backOffice/default/folder-edit.html @@ -85,7 +85,7 @@ {$label} : - + {/form_field} diff --git a/templates/backOffice/default/includes/product-general-tab.html b/templates/backOffice/default/includes/product-general-tab.html index 84b9a836d..f91aeff9e 100755 --- a/templates/backOffice/default/includes/product-general-tab.html +++ b/templates/backOffice/default/includes/product-general-tab.html @@ -53,7 +53,7 @@ {$label} : - + {/form_field} From 7284c485feaf0c2683e5027fbc8dad5c082971ef Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 27 Nov 2013 21:15:33 +0100 Subject: [PATCH 4/9] Translation : some fre_FR added --- templates/backOffice/default/I18n/fr_FR.php | 31 +++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/templates/backOffice/default/I18n/fr_FR.php b/templates/backOffice/default/I18n/fr_FR.php index e633a3caf..178bf29a2 100755 --- a/templates/backOffice/default/I18n/fr_FR.php +++ b/templates/backOffice/default/I18n/fr_FR.php @@ -14,15 +14,46 @@ return array( 'Save and close' => 'Enregistrer et fermer', 'Close' => 'Fermer', 'Product reference' => 'Référence produit', + 'Rewritten URL' => 'URL réécrite', + 'Top level' => 'Niveau racine', + 'You can attach this product to more categories in the details tab.' => 'Vous pouvez lier ce produit à plus de catégories dans l\'onglet détail.', + 'Visibility' => 'Visibilité', + 'Product created on %date_create. Last modification: %date_change' => 'Produit créé le %date_create. Dernière modification : %date_change ', 'Cancel' => 'Annuler', 'Home' => 'Accueil', 'Folders' => 'Dossier', + 'Editing %fold' => 'Modification de %fold', + 'Edit this folder' => 'Modifier ce dossier', + '(edit)' => '(modifier)', + 'Editing %title' => 'Modifier %title', 'Can\'t load images, please refresh this page.' => 'Échec lors du chargement de l\'image, veuillez réessayer', + 'classic modules' => 'module classique', 'Name' => 'Nom', 'Description' => 'Description', + 'Enable/Disable' => 'Activer/Désactiver', 'Actions' => 'Actions', + 'Deactivate %title module' => 'Désactiver le module %title', + 'deactivation' => 'désactivation', + 'activate %title module' => 'activer le module %title', + 'activation' => 'activation', + 'Configure this module' => 'Configurer ce module', + 'Configure' => 'Configurer', + 'Read the documentation of this module' => 'Lire la documentation de ce module', + 'Edit this module' => 'Modifier ce module', + 'Delete this module' => 'Supprimer ce module', 'Title' => 'Civilité', + 'A short description, used when a summary or an introduction is required' => 'Une courte description, utilisé si un résumé ou une introduction est nécessaire', + 'Short description' => 'Courte description', + 'The detailed description.' => 'Description détaillée', + 'A short post-description information' => 'Une courte post-description', + 'Short conclusion' => 'Courte conclusion', + 'Confirmation' => 'Confirmation', + 'Do you really want to delete this element ?' => 'Voulez-vous vraiment supprimer cet élément ?', + 'Confirm' => 'Je confirme', 'Please retry' => 'Merci de réessayer', + 'There is no documents attached to this %type.' => 'Il n\'y a aucune document lié à ce %type', + 'Update this image' => 'Mettre à jour cette image', + 'There is no images attached to this %type.' => 'Il n\'y a pas d\'image liée à ce %type', 'Select a folder...' => 'Choisissez un dossier de contenu...', 'ID' => 'ID', 'Select a tax tule' => 'Sélectionnez une règle de taxes', From 24e91e9ad6ee7bd572943a37da5fdadad59cd7d7 Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 27 Nov 2013 21:27:50 +0100 Subject: [PATCH 5/9] Translation : some fre_FR added --- templates/backOffice/default/I18n/fr_FR.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/templates/backOffice/default/I18n/fr_FR.php b/templates/backOffice/default/I18n/fr_FR.php index 178bf29a2..ce7e7860a 100755 --- a/templates/backOffice/default/I18n/fr_FR.php +++ b/templates/backOffice/default/I18n/fr_FR.php @@ -301,6 +301,7 @@ return array( 'Source IP :' => 'IP source', 'Source IP' => 'IP source', 'Product attributes' => 'Attributs produit', + 'Remove from all product templates' => 'Supprimer de tous les templates produits', 'Product features' => 'Caractéristiques produit', 'Administration logs' => 'Gestion des logs', 'Show logs' => 'Voir les loge', @@ -315,10 +316,17 @@ return array( 'Delete an order' => 'Supprimer une commande', 'Do you really want to cancel this order ?' => 'Voulez-vous vraiment sup primer cette commande ? ', 'System logs' => 'Journal des logs', + 'Edit a profile' => 'Modifier un profile', + 'Profiles' => 'Profiles', + 'Postscriptum' => 'Post-scriptum', 'View' => 'Voir', 'deactivate' => 'désactiver', + 'ISO Code' => 'Code ISO', 'en_US' => 'en_US', 'd-m-Y' => 'j-m-A', + 'Error' => 'Erreur', + 'Impossible to change default languages. Please contact your administrator or try later' => 'Impossible de changer la langue par défaut. Veuillez contacter votre administrateur ou réessayer plus tard', + 'An error occured' => 'Une erreur est apparue', 'Page not found' => 'Page non trouvée', 'The server returned a "404 Not Found"' => 'Le serveur à retourné l\'erreur "404 non trouvé"', 'The page you\'ve requested was not found. Please check the page address, and try again.' => 'La page que vous avez demandé n\'est pas disponible.', @@ -330,6 +338,11 @@ return array( 'Delete customer' => 'Supprimer ce client', 'Do you really want to delete this customer ?' => 'Voulez-vous supprimer ce client ? ', 'Countries' => 'Pays', + 'Delete this country' => 'Supprimer ce pays', + 'No country has been created yet. Click the + button to create one.' => 'Aucun pays n\'a encore été créé. Cliquez sur le bouton + pour en créer un.', + 'Country title' => 'Titre du pays', + 'Alpha code 2' => 'Code alpha 2', + 'Alpha code 3' => 'Code alpha 3', 'Coupons' => 'Codes Promo', 'Browse' => 'Parcourir', 'List' => 'Liste', @@ -354,15 +367,19 @@ return array( 'System parameters' => 'Paramètres système ', 'Administration profiles' => 'Gestion des administrateurs', 'Languages & URLs' => 'Langues et URLs', + 'Translations' => 'Traductions', 'Warning' => 'Attention', + 'Categories in %cat' => 'Catégories en $cat', 'Top level categories' => 'Catégories de niveau 1 ', 'Add a new category' => 'Ajouter une catégorie', 'Browse this category' => 'Parcourir cette catégorie', 'Delete this category and all its contents' => 'Supprimer cette catégorie et tout ce qu\'elle contient ? ', 'This category has no sub-categories. To create a new one, click the + button above.' => 'Cette catégorie n\'a pas de sous-catégorie. Pour en créer une nouvelle, cliquez sur le bouton + ci-dessus.', 'This category has no sub-categories.' => 'Cette catégorie n\'a pas de sous-catégorie.', + 'Products in %cat' => 'Produits en %cat', 'Top level Products' => 'Produits mis en avant', 'Add a new product' => 'Ajouter un nouveau produit', + 'Delete this product' => 'Supprimer ce produit', 'This category doesn\'t contains any products. To add a new product, click the + button above.' => 'Cette catégorie n\'a aucun produit. Pour créer un nouveau product, cliques sur le bouton + ci-dessus. ', 'Create a new category' => 'Créer une catégorie', 'Create this category' => 'Créer cette catégorie', @@ -378,4 +395,6 @@ return array( 'Delete product' => 'Supprimer ce produit', 'Do you really want to delete this product ?' => 'Voulez-vous vraiment supprimer ce produit ?', 'Enter new product position' => 'Classement du produit', + 'Thelia Shipping zones' => 'Zones de livraison Thelia', + 'Change this shipping zone' => 'Changer cette zone de livraison', ); From 3140a8d9c8d714fa75bd8366d95c308c185a47ac Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 27 Nov 2013 22:06:12 +0100 Subject: [PATCH 6/9] Translation : some fre_FR added --- templates/backOffice/default/I18n/fr_FR.php | 93 +++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/templates/backOffice/default/I18n/fr_FR.php b/templates/backOffice/default/I18n/fr_FR.php index ce7e7860a..f6438e8f3 100755 --- a/templates/backOffice/default/I18n/fr_FR.php +++ b/templates/backOffice/default/I18n/fr_FR.php @@ -55,13 +55,24 @@ return array( 'Update this image' => 'Mettre à jour cette image', 'There is no images attached to this %type.' => 'Il n\'y a pas d\'image liée à ce %type', 'Select a folder...' => 'Choisissez un dossier de contenu...', + ' (default)' => '(défaut)', + 'Select a folder and click (+) to add it to the additional folder list' => 'Sélectionnez un dossier et cliquez (+) pour l\'ajouter à la liste des dossiers additionnel', + 'No Folders found' => 'Aucun dossier trouvé', 'ID' => 'ID', + 'Folder title' => 'Titre du dossier', + 'Remove the product from this category' => 'Supprimer le produit de cette catégorie', + 'This product doesn\'t belong to any additional folder.' => 'Ce produit n\'appartient à aucun dossier additionnel', 'Select a tax tule' => 'Sélectionnez une règle de taxes', + 'Details' => 'Détails', 'Product weight' => 'Poids du produit', 'Kg' => 'Kg', 'Product price' => 'Prix du produit', 'Reference' => 'Reference', 'Quantity' => 'Quantité', + 'Default' => 'Défaut', + 'Select an attribute...' => 'Sélectionnez un attribut', + 'Select an attribute and click (+) to view available values' => 'Sélectionnez un attribut et cliquez (+) afin de voir les valeurs disponibles', + 'Attribute values' => 'Valeur des attributs', 'Company' => 'Entreprise', 'Firstname' => 'Prénom', 'Lastname' => 'Nom', @@ -69,15 +80,19 @@ return array( 'Additional address' => 'Adresse complémentaire', 'Zip code' => 'Code postal', 'City' => 'Ville', + 'Phone number' => 'Numéro de téléphone', + 'Cellular phone number' => 'Numéro de téléphone portable', 'Catalog' => 'Catalogue', 'Editing %cat' => 'Edition de %cat', 'Edit this category' => 'Editer cette catégorie', 'Configuration' => 'Configuration', 'Shipping configuration' => 'Configuration du transport', + 'Create coupon' => 'Créer un code promo', 'Coupon' => 'Code promo', 'Create' => 'Créer', 'Coupons : ' => 'Codes promo', 'Create a new coupon' => 'Créer un nouveau code promo', + 'Files manager' => 'Gestionnaire de fichier', 'Back-office users' => 'Utilisateurs du back-office', 'Taxes' => 'Taxes', 'Create a new administrator' => 'Créer un nouvel administrateur', @@ -98,7 +113,12 @@ return array( 'Do you really want to delete this administrator ?' => 'Confirmez-vous la suppression de cet adminisrateur ?', 'You can\'t delete this administrator' => 'Vous ne pouvez pas supprimer cet administrateur', 'They are some administrator which are linked to this administrator. Please edit/remove them before deleting this administrator.' => 'Cet administrateur est lié avec un ou plusieurs autres administrateurs. Supprimez ou modifiez ces administrateur d\'abord.', + 'Edit a document' => 'Modifier un document', + 'Document' => 'Document', + 'Editing document "%name"' => 'En cours de modification du document "%name"', + 'Edit document "%name"' => 'Modifier le document "%name"', 'Back' => 'Retour', + 'Document informations' => 'Informations sur le document', 'Thelia System Variables' => 'Variables Thelia', 'System variables' => 'Gestion des variables', 'Thelia system variables' => 'Variables Thelia', @@ -303,6 +323,17 @@ return array( 'Product attributes' => 'Attributs produit', 'Remove from all product templates' => 'Supprimer de tous les templates produits', 'Product features' => 'Caractéristiques produit', + 'taxes' => 'taxes', + 'and' => 'et', + 'tax rules' => 'règles de taxe', + 'Example :' => 'Exemple:', + 'Create a new tax' => 'Créer une nouvelle taxe', + 'Change this tax' => 'Modifier cette taxe', + 'Delete this tax' => 'Supprimer cette taxe', + 'Delete tax' => 'Supprimer une taxe', + 'Do you really want to delete this tax ?' => 'Voulez-vous vraiment supprimer cette taxe ?', + 'Delete tax rule' => 'Supprimer une règle de taxe', + 'Do you really want to delete this tax rule ?' => 'Voulez-vous vraiment supprimer cette règle de taxe ?', 'Administration logs' => 'Gestion des logs', 'Show logs' => 'Voir les loge', 'Period' => 'Période', @@ -312,43 +343,95 @@ return array( 'Resources' => 'Ressources', 'Shipping zones' => 'Zones de livraison', 'Add' => 'Ajouter', + 'Zones' => 'Zones', + 'Delete this zone' => 'Supprimer cette zone', + 'Remove zone' => 'Supprimer zone', 'Cancel this order' => 'Annuler cette commande', 'Delete an order' => 'Supprimer une commande', 'Do you really want to cancel this order ?' => 'Voulez-vous vraiment sup primer cette commande ? ', + 'System Logs' => 'Logs système', 'System logs' => 'Journal des logs', + 'System Logs configuration' => 'Configuration logs système', + 'General configuration' => 'Configuration générale', + 'Log lines format' => 'Format des lignes des logs', + 'File names' => 'Noms du fichier', + 'IP Addresses' => 'Adresse IP', + 'Destinations' => 'Destinations', 'Edit a profile' => 'Modifier un profile', 'Profiles' => 'Profiles', 'Postscriptum' => 'Post-scriptum', + 'Resource' => 'Ressource', + 'Rights' => 'Droits', 'View' => 'Voir', + 'Manage module rights' => 'Gérer les droits des modules', + 'Module' => 'Module', + 'Subject' => 'Sujet', + 'Thelia Languages' => 'Langages Thelia', + 'Languages' => 'Langages', + 'Locale' => 'Locale', + 'Parameters' => 'Paramètres', + 'activate' => 'activer', 'deactivate' => 'désactiver', 'ISO Code' => 'Code ISO', 'en_US' => 'en_US', 'd-m-Y' => 'j-m-A', + 'Delete language' => 'Supprimer langage', 'Error' => 'Erreur', 'Impossible to change default languages. Please contact your administrator or try later' => 'Impossible de changer la langue par défaut. Veuillez contacter votre administrateur ou réessayer plus tard', 'An error occured' => 'Une erreur est apparue', + 'Templates' => 'Template', + 'Template name' => 'Nom du template', 'Page not found' => 'Page non trouvée', 'The server returned a "404 Not Found"' => 'Le serveur à retourné l\'erreur "404 non trouvé"', 'The page you\'ve requested was not found. Please check the page address, and try again.' => 'La page que vous avez demandé n\'est pas disponible.', + 'Install a new module' => 'Installer un nouveau module', + 'Classic modules' => 'Module classique', + 'Delivery modules' => 'Module de livraison', + 'Payment modules' => 'Module de paiement', + 'Delete a module' => 'Supprimer un module', + 'Do you really want to delete this module ?' => 'Voulez-vous vraiment supprimer ce module ?', 'Customers list' => 'Liste des clients', 'Add a new Customer' => 'Ajouter un client', + 'Last name' => 'Nom', + 'First name' => 'Prénom', + 'Registration date' => 'Date d\'inscription', + 'Date of last order' => 'Date du dernier achat', + 'Last order amount' => 'Montant du dernier achat', 'Email address' => 'Adresse e-mail', 'Create a new customer' => 'Ajouter un client', 'Create this customer' => 'Ajouter ce client', 'Delete customer' => 'Supprimer ce client', 'Do you really want to delete this customer ?' => 'Voulez-vous supprimer ce client ? ', 'Countries' => 'Pays', + 'Add a new country' => 'Ajouter un pays', + 'Shop' => 'Magasin', + 'N° ISO' => 'N° ISO', + 'Change this country' => 'Modifier ce pays', 'Delete this country' => 'Supprimer ce pays', 'No country has been created yet. Click the + button to create one.' => 'Aucun pays n\'a encore été créé. Cliquez sur le bouton + pour en créer un.', 'Country title' => 'Titre du pays', 'Alpha code 2' => 'Code alpha 2', 'Alpha code 3' => 'Code alpha 3', + 'Create a new country' => 'Créer un nouveau pays', + 'Create this country' => 'Créer ce pays', + 'Delete country' => 'Supprimer le pays', + 'Do you really want to delete this country ?' => 'Voulez-vous vraiment supprimer ce pays ?', 'Coupons' => 'Codes Promo', 'Browse' => 'Parcourir', 'List' => 'Liste', 'Enabled coupons' => 'Codes promo disponibles', 'Days before expiration' => 'Jours de validité', 'Disabled coupons' => 'Codes désactivés', + 'Edit an image' => 'Modifier une image', + 'Image' => 'Image', + 'Editing image "%name"' => 'En cours de modification de l\'image "%name"', + 'Edit image "%name"' => 'Modification de l\'image "%name"', + 'Preview' => 'Aperçu', + 'Add this country' => 'Ajouter ce pays', + 'Remove country' => 'Supprimer le pays', + 'Do you really want to remove this country ?' => 'Voulez-vous vraiment supprimer ce pays ?', + 'Edit a country' => 'Modifier un pays', + 'Country description' => 'Description du pays', 'Version %ver' => 'Version %ver', 'View site' => 'Voir le site', 'View shop' => 'Voir la boutique', @@ -368,7 +451,17 @@ return array( 'Administration profiles' => 'Gestion des administrateurs', 'Languages & URLs' => 'Langues et URLs', 'Translations' => 'Traductions', + 'Template title' => 'Titre du template', + 'Delete template' => 'Supprimer le template', + 'Do you really want to delete this template ? It will be removed from all products.' => 'Voulez-vous vraiment supprimer ce template ? Il sera supprimer de tous les produits', + 'Translation' => 'Traduction', + 'PDF templates' => 'Template du PDF', + 'Thelia core' => 'Cœur de Thelia', 'Warning' => 'Attention', + 'Profile code' => 'Code du profile', + 'Delete profile' => 'Supprimer le profile', + 'Do you really want to delete this profile ?' => 'Voulez-vous vraiment supprimer ce profile ?', + 'You can\'t delete this profile' => 'Vous ne pouvez supprimer ce produit', 'Categories in %cat' => 'Catégories en $cat', 'Top level categories' => 'Catégories de niveau 1 ', 'Add a new category' => 'Ajouter une catégorie', From ff18babbf91251273946b945644ec1ba514ded8a Mon Sep 17 00:00:00 2001 From: gmorel Date: Wed, 27 Nov 2013 22:20:31 +0100 Subject: [PATCH 7/9] Translation : some fre_FR added --- templates/backOffice/default/I18n/fr_FR.php | 63 +++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/templates/backOffice/default/I18n/fr_FR.php b/templates/backOffice/default/I18n/fr_FR.php index f6438e8f3..8b22e9a21 100755 --- a/templates/backOffice/default/I18n/fr_FR.php +++ b/templates/backOffice/default/I18n/fr_FR.php @@ -66,13 +66,27 @@ return array( 'Details' => 'Détails', 'Product weight' => 'Poids du produit', 'Kg' => 'Kg', + 'Current quantity' => 'Quantité actuelle', + 'Promotion' => 'Promotion', 'Product price' => 'Prix du produit', + 'Combination builder' => 'Constructeur de combinaison', + 'Add a new combination' => 'Ajouter une nouvelle combinaison', 'Reference' => 'Reference', + 'EAN Code' => 'Code EAN', 'Quantity' => 'Quantité', + 'Weight
(Kg)' => 'Poids
(Kg) ', 'Default' => 'Défaut', + 'Sale' => 'Vente', + 'New' => 'Nouveau', + 'Attribute' => 'Attribut', 'Select an attribute...' => 'Sélectionnez un attribut', 'Select an attribute and click (+) to view available values' => 'Sélectionnez un attribut et cliquez (+) afin de voir les valeurs disponibles', 'Attribute values' => 'Valeur des attributs', + 'Remove selected values' => 'Supprimer la valeur sélectionnée', + 'Create a new combination' => 'Créer une nouvelle combinaison', + 'Create this combination' => 'Créer cette combinaison', + 'Combination reference' => 'Référence de la combinaison', + 'Create combinations' => 'Créer des combinaisons', 'Company' => 'Entreprise', 'Firstname' => 'Prénom', 'Lastname' => 'Nom', @@ -85,8 +99,12 @@ return array( 'Catalog' => 'Catalogue', 'Editing %cat' => 'Edition de %cat', 'Edit this category' => 'Editer cette catégorie', + 'Thelia Shipping configuration' => 'Configuration des livraison Thelia', 'Configuration' => 'Configuration', 'Shipping configuration' => 'Configuration du transport', + 'Add a new shipping configuration' => 'Ajouter une nouvelle configuration de livraison', + 'Change this shipping configuration' => 'Modifier cette configuration de livraison', + 'Delete this shipping configuration' => 'Supprimer cette configuration de livraison', 'Create coupon' => 'Créer un code promo', 'Coupon' => 'Code promo', 'Create' => 'Créer', @@ -119,6 +137,7 @@ return array( 'Edit document "%name"' => 'Modifier le document "%name"', 'Back' => 'Retour', 'Document informations' => 'Informations sur le document', + 'File' => 'Fichier', 'Thelia System Variables' => 'Variables Thelia', 'System variables' => 'Gestion des variables', 'Thelia system variables' => 'Variables Thelia', @@ -175,6 +194,7 @@ return array( 'Other addresses' => 'Autres adresses', 'Add a new address' => 'Ajouter une nouvelle adresse', 'Phone' => 'Téléphone', + 'Cellular phone' => 'Téléphone portable', 'Edit this address' => 'Editer cette adresse', 'Use this address by default' => 'Utiliser comme adresse par défaut', 'Delete this customer and all his orders' => 'Supprimer ce client et toutes ses commandes', @@ -183,16 +203,40 @@ return array( 'Date & Hour' => 'Date et heure', 'Amount' => 'Montant', 'Status' => 'Etat', + 'Create a customer address' => 'Créer une adresse client', 'Create this address' => 'Créer cette adresse', + 'Edit a customer address' => 'Modifier une adresse client', + 'Save this address' => 'Sauvegarder cette adresse', 'Use address by default' => 'Utiliser comme adresse par défaut', 'Do you really want to use this address by default ?' => 'Voulez-vous vraiment utiliser cette adresse comme adresse par défaut ?', 'Delete address' => 'Supprimer cette adresse', 'Do you really want to delete this address ?' => 'Voulez-vous vraiment supprimer cette adresse ?', + 'Edit content' => 'Modifier le contenu', + 'Edit content %title' => 'Modifier le contenu %title', + 'Edit previous content' => 'Modifier le contenu précèdent', + 'Preview folder page' => 'Aperçu de la page dossier', + 'Edit next content' => 'Modifier le prochain contenu', + 'General description' => 'Description générale', + 'Associations' => 'Associations', + 'Images' => 'Images', + 'Documents' => 'Documents', 'Modules' => 'Modules', + 'Remove associated folder' => 'Supprimer le dossier associé', + 'Edit a tax rule' => 'Modifier une règle de taxe', 'Taxes rules' => 'Règles de taxes', + 'Editing tax rule' => 'En cours de modification d\'une règle de taxe', + 'Manage taxes' => 'Gérer les taxes', + 'Choose a country' => 'Choisissez un pays', + 'Countries that have the same tax rule' => 'Pays ayant les mêmes règles de taxe', + 'NONE' => 'AUCUN', + 'Add tax to this group' => 'Ajouter une taxe à ce groupe', 'Apply' => 'Appliquer', + 'uncheck all' => 'Tous décocher', + 'Edit tax rule taxes' => 'Modifier une règle de taxe', + 'Welcome' => 'Bienvenue', 'Thelia Back Office' => 'Thelia Back Office', 'Username' => 'Nom d\'utilisateur', + 'Loading Thelia lastest news...' => 'Chargement des dernières nouvelles sur Thelia', 'Related content' => 'Contenu associé', 'You can attach here some content to this product' => 'Attachez ici un ou plusieurs contenus à ce produit', 'Select a folder to get its content' => 'Choisissez un dossier de contenu pour lister ses contenus', @@ -203,9 +247,28 @@ return array( 'Content title' => 'Titre du contenu', 'Position' => 'Position', 'Delete this content' => 'Supprimer ce contenu', + 'This product contains no contents' => 'Ce produit ne contient aucun contenu', + 'Product accessories' => 'Accessoires produit', + 'Select a category...' => 'Sélectionnez une catégorie...', + 'Select a product...' => 'Sélectionnez un produit', + 'No categories found' => 'Aucune catégorie trouvée', + 'Accessory title' => 'Titre de l\'accessoire', + 'Delete this accessory' => 'Supprimer cet accessoire', + 'Additional categories' => 'Catégorie additionnelle', 'Category title' => 'Titre de la catégorie', + 'Remove related content' => 'Supprimer le contenu lié', + 'Do you really want to remove this related content from the product ?' => 'Voulez-vous vraiment enlever ce contenu lié de ce produit ?', + 'Remove an accessory' => 'Enlever un accessoire', + 'Do you really want to remove this accessory from the product ?' => 'Voulez-vous vraiment enlever cet accessoire de ce produit ?', + 'Remove from category' => 'Enlever de la catégorie', + 'Do you really want to remove the product from this category ?' => 'Voulez-vous vraiment enlever ce produit de cette catégorie ?', 'Enter new category position' => 'Classement de la catégorie ', 'Lire la suite' => 'Lire la suite', + 'Attribute title' => 'Titre de l\'attribut', + 'Delete this attribute' => 'Supprimer cet attribut', + 'This template contains no attributes' => 'Ce template ne contient aucun attribut', + 'Remove attribute' => 'Enlever l\'attribut', + 'Do you really want to remove this attribute from the template ?' => 'Voulez-vous vraiment enlever cet attribut de ce template ?', 'Label' => 'Libellé', 'Edit a language' => 'Modifier une langue', 'Edit this language' => 'Modifier cette langue', From 4909ecd78e97b602c4ebf5b7d4f7bfebbd705e88 Mon Sep 17 00:00:00 2001 From: gmorel Date: Thu, 28 Nov 2013 22:27:48 +0100 Subject: [PATCH 8/9] Translation : more fre_FR added --- templates/backOffice/default/I18n/fr_FR.php | 54 +++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/templates/backOffice/default/I18n/fr_FR.php b/templates/backOffice/default/I18n/fr_FR.php index 8b22e9a21..02f3803c2 100755 --- a/templates/backOffice/default/I18n/fr_FR.php +++ b/templates/backOffice/default/I18n/fr_FR.php @@ -54,6 +54,7 @@ return array( 'There is no documents attached to this %type.' => 'Il n\'y a aucune document lié à ce %type', 'Update this image' => 'Mettre à jour cette image', 'There is no images attached to this %type.' => 'Il n\'y a pas d\'image liée à ce %type', + 'Additional Folders' => 'Dossier additionnels', 'Select a folder...' => 'Choisissez un dossier de contenu...', ' (default)' => '(défaut)', 'Select a folder and click (+) to add it to the additional folder list' => 'Sélectionnez un dossier et cliquez (+) pour l\'ajouter à la liste des dossiers additionnel', @@ -64,6 +65,7 @@ return array( 'This product doesn\'t belong to any additional folder.' => 'Ce produit n\'appartient à aucun dossier additionnel', 'Select a tax tule' => 'Sélectionnez une règle de taxes', 'Details' => 'Détails', + 'Product EAN Code' => 'Code EAN du produit', 'Product weight' => 'Poids du produit', 'Kg' => 'Kg', 'Current quantity' => 'Quantité actuelle', @@ -78,6 +80,7 @@ return array( 'Default' => 'Défaut', 'Sale' => 'Vente', 'New' => 'Nouveau', + 'Delete this combination' => 'Supprimer cette combinaison', 'Attribute' => 'Attribut', 'Select an attribute...' => 'Sélectionnez un attribut', 'Select an attribute and click (+) to view available values' => 'Sélectionnez un attribut et cliquez (+) afin de voir les valeurs disponibles', @@ -85,6 +88,8 @@ return array( 'Remove selected values' => 'Supprimer la valeur sélectionnée', 'Create a new combination' => 'Créer une nouvelle combinaison', 'Create this combination' => 'Créer cette combinaison', + 'Delete a combination' => 'Supprimer une combinaison', + 'Do you really want to delete this combination ?' => 'Voulez-vous vraiment supprimer cette combinaison ?', 'Combination reference' => 'Référence de la combinaison', 'Create combinations' => 'Créer des combinaisons', 'Company' => 'Entreprise', @@ -138,6 +143,7 @@ return array( 'Back' => 'Retour', 'Document informations' => 'Informations sur le document', 'File' => 'Fichier', + 'Post Scriptum' => 'Post-scriptum', 'Thelia System Variables' => 'Variables Thelia', 'System variables' => 'Gestion des variables', 'Thelia system variables' => 'Variables Thelia', @@ -284,9 +290,30 @@ return array( 'Enter here the feature value as free text' => 'Indiquez ici la valeur de la caractéristique', 'Feature value' => 'Valeur de la caractéristique', 'Currencies' => 'Monnaie', + 'Update rates' => 'Mettre à jour les taux', + 'Add a new currency' => 'Ajouter une devise', + 'ISO 4217 Code' => 'Code ISO 4217', + 'Symbol' => 'Symbole', + 'Rate in €' => 'Taux en € ', + 'Change this currency' => 'Modifier cette devise', + 'Delete this currency' => 'Supprimer cette devise', + 'Currency name' => 'Nom de la devise', + 'ISO 4217 code' => 'Code ISO 4217', 'Code' => 'Code', + 'Currency symbol' => 'Symbole de la devise', + 'Currency rate' => 'Taux de la devise', + 'Create a new currency' => 'Créer une nouvelle devise', + 'Create this currency' => 'Créer cette devise', + 'Delete currency' => 'Supprimer la devise', + 'Edit an attribute' => 'Modifier un attribut', + 'Attributes' => 'Attributs', + 'Delete this value' => 'Supprimer cette valeur', + 'Create this value' => 'Créer cette valeur', 'Edit category' => 'Editer la catégorie', 'Edit category %title' => 'Editer le titre de la catégorie : %title', + 'Edit previous category' => 'Modifier la catégorie précédente', + 'Preview category page' => 'Aperçu de la page catégorie', + 'Edit next category' => 'Modifier la catégorie suivante', 'Search' => 'Recherche', 'Customer' => 'Client', 'customer ref' => 'ref client', @@ -299,6 +326,9 @@ return array( 'Edit this order' => 'Editer cette commande ', 'Product' => 'Produit', 'Product title' => 'Titre du produit', + 'Edit folder' => 'Modifier le dossier', + 'Edit previous folder' => 'Modifier le dossier précèdent', + 'Edit next folder' => 'Modifier le dossier suivant', 'Edit an order' => 'Editer une commande', 'Ordered products' => 'Produits commandés', 'Invoice and Delivery' => 'Livraison et facturation', @@ -334,18 +364,42 @@ return array( 'Confirm changes' => 'Valider les modifications', 'Update coupon' => 'Mettre à jour le code', 'Please select another condition' => 'Merci de sélectionner une autre condition', + 'Add a new folder' => 'Ajouter une nouveau dossier', 'Online' => 'En ligne', + 'Add a new content' => 'Ajouter un nouveau contenu', + 'Edit this content' => 'Modifier ce contenu', + 'Create a new folder' => 'Ajouter un nouveau dossier', + 'Create this folder' => 'Créer ce dossier', + 'Delete folder' => 'Supprimer le dossier', + 'Delete content' => 'Supprimer le contenu', 'Edit a system variable' => 'Modifier une variable système', 'Editing variable "%name"' => 'Modification de la variable "%name" ', 'Edit variable %name' => 'Modifier de la variable "%name" ', 'Variable created on %date_create. Last modification: %date_change' => 'Variable créée le %date_create. Dernière modification: %date_change', 'Sorry, variable ID=%id was not found.' => 'Désolé, la variable ID=%id n\'a pas été trouvée.', + 'Store' => 'Magasin', + 'Store configuration' => 'Configuration du magasin', + 'General' => 'Général', + 'Edit product' => 'Modifier le produit', + 'Edit previous product' => 'Modifier le produit précèdent', + 'Edit next product' => 'Modifier le produit suivant', + 'Edit a tax' => 'Modifier une taxe', + 'Coupon : ' => 'Code promo', 'Is enabled' => 'Est valide', 'Expiration date' => 'Date de fin', + 'days left' => 'jours restant', 'Usage left' => 'Utilisation restante', 'Unlimited' => 'Illimité', + 'May be cumulative' => 'Pourra être cumulé', + 'Can\'t be cumulative' => 'Ne pourra pas être cumulé', + 'Will remove postage' => 'Enlèvera les frais de port', + 'Won\'t remove postage' => 'N\'enlèvera pas les frais de port', + 'Will be available on special offers' => 'Sera disponible sur les offres spéciales', + 'Won\'t be available on special offers' => 'Ne sera pas disponible sur les offres spéciales', + 'Application field' => 'Champs d\'application', 'And' => 'Et', 'Edit' => 'Editer', + 'Do you really want to enable this element ?' => 'Voulez-vous vraiment activer cet élément ?', 'Mailing templates' => 'Template e-mail', 'Code :' => 'Code', 'code' => 'code', From a801f9bfb814d57385ab673b8bf6d47812d92c28 Mon Sep 17 00:00:00 2001 From: gmorel Date: Thu, 28 Nov 2013 22:32:39 +0100 Subject: [PATCH 9/9] Merge --- templates/email/default/README | 0 templates/email/default/default-html-layout.tpl | 0 templates/email/default/default-text-layout.tpl | 0 templates/email/default/order_confirmation.html | 0 templates/email/default/order_confirmation.txt | 0 .../frontOffice/default/assets/img/email/header.jpg | Bin .../frontOffice/default/assets/img/email/logo.gif | Bin templates/frontOffice/default/email/order.html | 0 .../frontOffice/default/email/password-reset.html | 0 templates/frontOffice/default/email/password.html | 0 templates/frontOffice/default/email/register.html | 0 templates/frontOffice/default/email/template.tpl | 0 12 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 templates/email/default/README mode change 100644 => 100755 templates/email/default/default-html-layout.tpl mode change 100644 => 100755 templates/email/default/default-text-layout.tpl mode change 100644 => 100755 templates/email/default/order_confirmation.html mode change 100644 => 100755 templates/email/default/order_confirmation.txt mode change 100644 => 100755 templates/frontOffice/default/assets/img/email/header.jpg mode change 100644 => 100755 templates/frontOffice/default/assets/img/email/logo.gif mode change 100644 => 100755 templates/frontOffice/default/email/order.html mode change 100644 => 100755 templates/frontOffice/default/email/password-reset.html mode change 100644 => 100755 templates/frontOffice/default/email/password.html mode change 100644 => 100755 templates/frontOffice/default/email/register.html mode change 100644 => 100755 templates/frontOffice/default/email/template.tpl diff --git a/templates/email/default/README b/templates/email/default/README old mode 100644 new mode 100755 diff --git a/templates/email/default/default-html-layout.tpl b/templates/email/default/default-html-layout.tpl old mode 100644 new mode 100755 diff --git a/templates/email/default/default-text-layout.tpl b/templates/email/default/default-text-layout.tpl old mode 100644 new mode 100755 diff --git a/templates/email/default/order_confirmation.html b/templates/email/default/order_confirmation.html old mode 100644 new mode 100755 diff --git a/templates/email/default/order_confirmation.txt b/templates/email/default/order_confirmation.txt old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/email/header.jpg b/templates/frontOffice/default/assets/img/email/header.jpg old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/assets/img/email/logo.gif b/templates/frontOffice/default/assets/img/email/logo.gif old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/order.html b/templates/frontOffice/default/email/order.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/password-reset.html b/templates/frontOffice/default/email/password-reset.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/password.html b/templates/frontOffice/default/email/password.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/register.html b/templates/frontOffice/default/email/register.html old mode 100644 new mode 100755 diff --git a/templates/frontOffice/default/email/template.tpl b/templates/frontOffice/default/email/template.tpl old mode 100644 new mode 100755