diff --git a/templates/default/I18n/en_US.php b/templates/default/I18n/en_US.php
index 26be50f83..c83aff515 100755
--- a/templates/default/I18n/en_US.php
+++ b/templates/default/I18n/en_US.php
@@ -1,195 +1,205 @@
 <?php
 
 return array(
-	'404' => '404',
-	'The page cannot be found' => 'The page cannot be found',
-	'Account' => 'Account',
-	'Change Password' => 'Change Password',
-	'Login Information' => 'Login Information',
-	'Update Profile' => 'Update Profile',
-	'Personal Informations' => 'Personal Informations',
-	'Select Title' => 'Select Title',
-	'Placeholder firstname' => 'John',
-	'Placeholder lastname' => 'Doe',
-	'Placeholder email' => 'johndoe@domain.com',
-	'Update' => 'Update',
-	'My Account' => 'My Account',
-	'Personal Information' => 'Personal Information',
-	'Change my account information' => 'Change my account information',
-	'Change my password' => 'Change my password',
-	'My Address book' => 'My Address book',
-	'Add a new address' => 'Add a new address',
-	'My Address Books' => 'My Address Books',
-	'Address %nb' => 'Address %nb',
-	'Edit this address' => 'Edit this address',
-	'Edit' => 'Edit',
-	'Do you really want to delete this address ?' => 'Do you really want to delete this address ?',
-	'Remove this address' => 'Remove this address',
-	'Cancel' => 'Cancel',
-	'My Orders' => 'My Orders',
-	'List of orders' => 'List of orders',
-	'Order Number' => 'Order Number',
-	'Date' => 'Date',
-	'Amount' => 'Amount',
-	'Status' => 'Status',
-	'View' => 'View',
-	'View order %ref as pdf document' => 'View order %ref as pdf document',
-	'Order details' => 'Order details',
-	'Warning' => 'Warning',
-	'You don\'t have orders yet.' => 'You don\'t have orders yet.',
-	'Address Update' => 'Address update',
-	'missing or invalid data' => 'missing or invalid data',
-	'Address' => 'Address',
-	'Placeholder address label' => 'Home, Work office, other',
-	'Placeholder address1' => '76 Ninth Avenue',
-	'Placeholder address2' => 'Address',
-	'Placeholder zipcode' => 'NY 10011',
-	'Placeholder city' => 'New York',
-	'Select Country' => 'Select Country',
-	'Placeholder phone' => 'Phone number',
-	'Placeholder cellphone' => 'Cellular phone number',
-	'Add a New Address' => 'Add a new address',
-	'Create New Address' => 'Create New Address',
-	'Create' => 'Create',
-	'Cart' => 'Cart',
-	'Your Cart' => 'Your Cart',
-	'Product Name' => 'Product Name',
-	'Name' => 'Name',
-	'Unit Price' => 'Unit Price',
-	'Price' => 'Price',
-	'Quantity' => 'Quantity',
-	'Qty' => 'Qty',
-	'Total' => 'Total',
-	'Available' => 'Available',
-	'In Stock' => 'In Stock',
-	'Out of Stock' => 'Out of stock',
-	'No.' => 'No.',
-	'Remove' => 'Remove',
-	'instead of' => 'instead of',
-	'Continue Shopping' => 'Continue Shopping',
-	'Proceed checkout' => 'Proceed checkout',
-	'You have no items in your shopping cart.' => 'You have no items in your shopping cart.',
-	'Upsell Products' => 'Upsell Products',
-	'No products available in this category' => 'No products available in this category',
-	'Thanks !' => 'Thanks !',
-	'Thanks for your message, we will contact as soon as possible.' => 'Thanks for your message, we will contact as soon as possible.',
-	'Contact us' => 'Contact us',
-	'Send us a message' => 'Send us a message',
-	'Placeholder contact name' => 'What\'s your name?',
-	'Placeholder contact email' => 'So I can get back to you.',
-	'Placeholder contact subject' => 'The subject of your message.',
-	'Placeholder contact message' => 'And your message...',
-	'Send' => 'Send',
-	'View cart' => 'View cart',
-	'Related' => 'Related',
-	'Categories' => 'Categories',
-	'View Cart' => 'View Cart',
-	'Checkout' => 'Checkout',
-	'Special Price:' => 'Special Price:',
-	'Regular Price:' => 'Regular Price:',
-	'Add to cart' => 'Add to cart',
-	'View product' => 'View product',
-	'Item(s)' => 'Item(s)',
-	'Show' => 'Show',
-	'per page' => 'per page',
-	'Sort By' => 'Sort By',
-	'Position' => 'Position',
-	'Name ascending' => 'Name ascending',
-	'Name descending' => 'Name descending',
-	'Price ascending' => 'Price ascending',
-	'Price descending' => 'Price descending',
-	'Rating' => 'Rating',
-	'View as' => 'View as',
-	'Grid' => 'Grid',
-	'List' => 'List',
-	'Pagination' => 'Pagination',
-	'Previous' => 'Previous',
-	'Next' => 'Next',
-	'Latest' => 'Latest',
-	'+ View All' => '+ View All',
-	'Offers' => 'Offers',
-	'Thelia V2' => 'Thelia V2',
-	'Skip to content' => 'Skip to content',
-	'Toggle navigation' => 'Toggle navigation',
-	'Main Navigation' => 'Main Navigation',
-	'Log out!' => 'Log out!',
-	'Register!' => 'Register!',
-	'Log In!' => 'Log In!',
-	'Sign In' => 'Sign In',
-	'Register' => 'Register',
-	'Home' => 'Home',
-	'Search a product' => 'Search a product',
-	'Search...' => 'Search...',
-	'Minimum 2 characters.' => 'Minimum 2 characters.',
-	'Search' => 'Search',
-	'Language:' => 'Language:',
-	'Currency:' => 'Currency:',
-	'Free shipping' => 'Free shipping',
-	'Orders over $50' => 'Orders over $50',
-	'Secure payment' => 'Secure payment',
-	'Multi-payment platform' => 'Multi-payment platform',
-	'Need help ?' => 'Need help ?',
-	'Questions ? See or F.A.Q.' => 'Questions ? See or F.A.Q.',
-	'Latest articles' => 'Latest articles',
-	'No articles currently' => 'No articles currently',
-	'Useful links' => 'Useful links',
-	'Login' => 'Login',
-	'Follow us' => 'Follow us',
-	'Newsletter' => 'Newsletter',
-	'Sign up to receive our latest news.' => 'Sign up to receive our latest news.',
-	'Email address' => 'Email address',
-	'Your email address' => 'Your email address',
-	'Subscribe' => 'Subscribe',
-	'Contact Us' => 'Contact Us',
-	'Copyright' => 'Copyright',
-	'Do you have an account?' => 'Do you have an account?',
-	'Forgot your Password?' => 'Forgot your Password?',
-	'You are here:' => 'You are here:',
-	'Billing and delivery' => 'Billing and delivery',
-	'Check my order' => 'Check my order',
-	'Newsletter Subscription' => 'Newsletter Subscription',
-	'You want to subscribe to the newsletter? Please enter your email address below.' => 'You want to subscribe to the newsletter? Please enter your email address below.',
-	'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => 'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.',
-	'Choose your delivery address' => 'Choose your delivery address',
-	'Choose your delivery method' => 'Choose your delivery method',
-	'Back' => 'Back',
-	'Next Step' => 'Next Step',
-	'My order' => 'My order',
-	'Shipping Tax' => 'Shipping Tax',
-	'You may have a coupon ?' => 'You may have a coupon ?',
-	'Code :' => 'Code :',
-	'Coupon code' => 'Coupon code',
-	'Ok' => 'Ok',
-	'Delivery address' => 'Delivery address',
-	'Billing address' => 'Billing address',
-	'Change address' => 'Change address',
-	'Choose your payment method' => 'Choose your payment method',
-	'Secure Payment' => 'Secure Payment',
-	'You choose to pay by' => 'You choose to pay by',
-	'Thank you for the trust you place in us.' => 'Thank you for the trust you place in us.',
-	'A summary of your order email has been sent to the following address' => 'A summary of your order email has been sent to the following address',
-	'Your order will be confirmed by us upon receipt of your payment.' => 'Your order will be confirmed by us upon receipt of your payment.',
-	'Order number' => 'Order number',
-	'Go home' => 'Go home',
-	'Password' => 'Password',
-	'Password Forgotten' => 'Password Forgotten',
-	'Please enter your email address below.' => 'Please enter your email address below.',
-	'You will receive a link to reset your password.' => 'You will receive a link to reset your password.',
-	'Ref.' => 'Ref.',
-	'Availability' => 'Availability',
-	'In stock' => 'In stock',
-	'Out of stock' => 'Out of stock',
-	'Description' => 'Description',
-	'Additional Info' => 'Additional Info',
-	'Previous product' => 'Previous product',
-	'Next product' => 'Next product',
-	'Create New Account' => 'Create New Account',
-	'Delivery Informations' => 'Delivery Informations',
-	'Placeholder company' => 'Google',
-	'Sign in' => 'Sign in',
-	'Search Result for' => 'Search Result for',
-	'No results found' => 'No results found',
-	'View all' => 'View all',
-	'products' => 'products',
-	'offers' => 'offers',
+    '%nb Item' => '%nb Item',
+    '%nb Items' => '%nb Items',
+    '+ View All' => '+ View All',
+    '404' => '404',
+    'A summary of your order email has been sent to the following address' => 'A summary of your order email has been sent to the following address',
+    'Account' => 'Account',
+    'Add a new address' => 'Add a new address',
+    'Add to cart' => 'Add to cart',
+    'Additional Info' => 'Additional Info',
+    'Address %nb' => 'Address %nb',
+    'Address Update' => 'Address update',
+    'Address' => 'Address',
+    'Amount' => 'Amount',
+    'Availability' => 'Availability',
+    'Available' => 'Available',
+    'Back' => 'Back',
+    'Billing address' => 'Billing address',
+    'Billing and delivery' => 'Billing and delivery',
+    'Cancel' => 'Cancel',
+    'Cart' => 'Cart',
+    'Categories' => 'Categories',
+    'Change address' => 'Change address',
+    'Change my account information' => 'Change my account information',
+    'Change my password' => 'Change my password',
+    'Change Password' => 'Change Password',
+    'Check my order' => 'Check my order',
+    'Checkout' => 'Checkout',
+    'Choose your delivery address' => 'Choose your delivery address',
+    'Choose your delivery method' => 'Choose your delivery method',
+    'Choose your payment method' => 'Choose your payment method',
+    'Code :' => 'Code :',
+    'Complementary address' => 'Complementary address',
+    'Contact Us' => 'Contact Us',
+    'Continue Shopping' => 'Continue Shopping',
+    'Copyright' => 'Copyright',
+    'Coupon code' => 'Coupon code',
+    'Create New Account' => 'Create New Account',
+    'Create New Address' => 'Create New Address',
+    'Create' => 'Create',
+    'Currency:' => 'Currency:',
+    'Date' => 'Date',
+    'Delete address' => 'Delete address',
+    'Delivery address' => 'Delivery address',
+    'Delivery Informations' => 'Delivery Informations',
+    'Demo product description' => 'Demo product description',
+    'Demo product title' => 'Demo product title',
+    'Description' => 'Description',
+    'Do you have an account?' => 'Do you have an account?',
+    'Do you really want to delete this address ?' => 'Do you really want to delete this address ?',
+    'Edit this address' => 'Edit this address',
+    'Edit' => 'Edit',
+    'Email address' => 'Email address',
+    'Follow us' => 'Follow us',
+    'Forgot your Password?' => 'Forgot your Password?',
+    'Free shipping' => 'Free shipping',
+    'Go home' => 'Go home',
+    'Grid' => 'Grid',
+    'Home address' => 'Home address',
+    'Home' => 'Home',
+    'In Stock' => 'In Stock',
+    'instead of' => 'instead of',
+    'Item(s)' => 'Item(s)',
+    'Language:' => 'Language:',
+    'Latest articles' => 'Latest articles',
+    'Latest products' => 'Latest products',
+    'Latest' => 'Latest',
+    'List of orders' => 'List of orders',
+    'List' => 'List',
+    'Log In!' => 'Log In!',
+    'Log out!' => 'Log out!',
+    'Login Information' => 'Login Information',
+    'Login' => 'Login',
+    'Main Navigation' => 'Main Navigation',
+    'Minimum 2 characters.' => 'Minimum 2 characters.',
+    'missing or invalid data' => 'missing or invalid data',
+    'Multi-payment platform' => 'Multi-payment platform',
+    'My Account' => 'My Account',
+    'My Address book' => 'My Address book',
+    'My Address Books' => 'My Address Books',
+    'My order' => 'My order',
+    'My Orders' => 'My Orders',
+    'Name ascending' => 'Name ascending',
+    'Name descending' => 'Name descending',
+    'Name' => 'Name',
+    'Need help ?' => 'Need help ?',
+    'Newsletter Subscription' => 'Newsletter Subscription',
+    'Newsletter' => 'Newsletter',
+    'Next product' => 'Next product',
+    'Next Step' => 'Next Step',
+    'Next' => 'Next',
+    'No articles currently' => 'No articles currently',
+    'No products available in this category' => 'No products available in this category',
+    'No results found' => 'No results found',
+    'No.' => 'No.',
+    'Offers' => 'Offers',
+    'Ok' => 'Ok',
+    'Order details' => 'Order details',
+    'Order number' => 'Order number',
+    'Orders over $50' => 'Orders over $50',
+    'Out of Stock' => 'Out of stock',
+    'Pagination' => 'Pagination',
+    'Password Forgotten' => 'Password Forgotten',
+    'Password' => 'Password',
+    'per page' => 'per page',
+    'Personal Informations' => 'Personal Informations',
+    'Placeholder address label' => 'Home, Work office, other',
+    'Placeholder address1' => '76 Ninth Avenue',
+    'Placeholder address2' => 'Address',
+    'Placeholder cellphone' => 'Cellular phone number',
+    'Placeholder city' => 'New York',
+    'Placeholder company' => 'Google',
+    'Placeholder contact email' => 'So I can get back to you.',
+    'Placeholder contact message' => 'And your message...',
+    'Placeholder contact name' => 'What\'s your name?',
+    'Placeholder contact subject' => 'The subject of your message.',
+    'Placeholder email' => 'johndoe@domain.com',
+    'Placeholder firstname' => 'John',
+    'Placeholder lastname' => 'Doe',
+    'Placeholder phone' => 'Phone number',
+    'Placeholder zipcode' => 'NY 10011',
+    'Please enter your email address below.' => 'Please enter your email address below.',
+    'Position' => 'Position',
+    'Previous product' => 'Previous product',
+    'Previous' => 'Previous',
+    'Price ascending' => 'Price ascending',
+    'Price descending' => 'Price descending',
+    'Price' => 'Price',
+    'Proceed checkout' => 'Proceed checkout',
+    'Product Empty Button' => 'Add my first product',
+    'Product Empty Message' => 'It\'s really quick to add a product.
+        <ol>
+            <li>Check <strong>NEW</strong> under the details tab if you want to see your product in the latest product section.</li>
+            <li>Check <strong>SALE</strong> under the details tab if you want to see your product in the offer product section.</li>
+        </ol>',
+    'Product Empty Title' => 'Welcome',
+    'Product Name' => 'Product Name',
+    'Product Offers' => 'Product Offers',
+    'products' => 'products',
+    'Qty' => 'Qty',
+    'Quantity' => 'Quantity',
+    'Questions ? See or F.A.Q.' => 'Questions ? See or F.A.Q.',
+    'Rating' => 'Rating',
+    'Ref.' => 'Ref.',
+    'Register!' => 'Register!',
+    'Register' => 'Register',
+    'Regular Price:' => 'Regular Price:',
+    'Related' => 'Related',
+    'Remove this address' => 'Remove this address',
+    'Remove' => 'Remove',
+    'Search a product' => 'Search a product',
+    'Search Result for' => 'Search Result for',
+    'Search' => 'Search',
+    'Search...' => 'Search...',
+    'Secure payment' => 'Secure payment',
+    'Secure Payment' => 'Secure Payment',
+    'Select Country' => 'Select Country',
+    'Select Title' => 'Select Title',
+    'Send us a message' => 'Send us a message',
+    'Send' => 'Send',
+    'Shipping Tax' => 'Shipping Tax',
+    'Show' => 'Show',
+    'Sign In' => 'Sign In',
+    'Sign up to receive our latest news.' => 'Sign up to receive our latest news.',
+    'Skip to content' => 'Skip to content',
+    'Sort By' => 'Sort By',
+    'Special Price:' => 'Special Price:',
+    'Status' => 'Status',
+    'Subscribe' => 'Subscribe',
+    'Tax Inclusive' => 'Tax Inclusive',
+    'Thank you for the trust you place in us.' => 'Thank you for the trust you place in us.',
+    'Thanks !' => 'Thanks !',
+    'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => 'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.',
+    'Thanks for your message, we will contact as soon as possible.' => 'Thanks for your message, we will contact as soon as possible.',
+    'The page cannot be found' => 'The page cannot be found',
+    'Thelia V2' => 'Thelia V2',
+    'Toggle navigation' => 'Toggle navigation',
+    'Total' => 'Total',
+    'TTC' => 'TTC',
+    'Unit Price' => 'Unit Price',
+    'Update Profile' => 'Update Profile',
+    'Update' => 'Update',
+    'Upsell Products' => 'Upsell Products',
+    'Useful links' => 'Useful links',
+    'View all' => 'View all',
+    'View as' => 'View as',
+    'View Cart' => 'View Cart',
+    'View order %ref as pdf document' => 'View order %ref as pdf document',
+    'View product' => 'View product',
+    'View' => 'View',
+    'Warning' => 'Warning',
+    'Yes' => 'Yes',
+    'You are here:' => 'You are here:',
+    'You choose to pay by' => 'You choose to pay by',
+    'You don\'t have orders yet.' => 'You don\'t have orders yet.',
+    'You have no items in your shopping cart.' => 'You have no items in your shopping cart.',
+    'You may have a coupon ?' => 'You may have a coupon ?',
+    'You want to subscribe to the newsletter? Please enter your email address below.' => 'You want to subscribe to the newsletter? Please enter your email address below.',
+    'You will receive a link to reset your password.' => 'You will receive a link to reset your password.',
+    'Your Cart' => 'Your Cart',
+    'Your email address' => 'Your email address',
+    'Your order will be confirmed by us upon receipt of your payment.' => 'Your order will be confirmed by us upon receipt of your payment.',
 );
diff --git a/templates/default/I18n/es_ES.php b/templates/default/I18n/es_ES.php
index e4004de1e..e96407fea 100755
--- a/templates/default/I18n/es_ES.php
+++ b/templates/default/I18n/es_ES.php
@@ -1,229 +1,201 @@
 <?php
 
-return array (
+return array(
+    '%nb Item' => '',
+    '%nb Items' => '',
     '+ View All' => '',
-    'Thelia V2' => '',
-    'Skip to content' => '',
-    'Toggle navigation' => '',
-    'Main Navigation' => '',
-    'Register!' => '',
-    'Log In!' => '',
-    'Sign In' => '',
-    'Register' => '',
-    'Cart' => '',
-    'View Cart' => '',
-    'Checkout' => '',
-    'You have no items in your shopping cart.' => '',
-    'Home' => '',
-    'Search a product' => '',
-    'Search...' => '',
-    'Minimum 2 characters.' => '',
-    'Search' => '',
-    'Language:' => '',
-    'Currency:' => '',
-    'Latest' => '',
-    'Offers' => '',
-    'Special Price:' => '',
-    'Regular Price:' => '',
-    'Free shipping' => '',
-    'Orders over $50' => '',
-    'Secure payment' => '',
-    'Multi-payment platform' => '',
-    'Need help ?' => '',
-    'Questions ? See or F.A.Q.' => '',
-    'Latest articles' => '',
-    'No articles currently' => '',
-    'Useful links' => '',
-    'Login' => '',
-    'Follow us' => '',
-    'Newsletter' => '',
-    'Sign up to receive our latest news.' => '',
-    'Email address' => '',
-    'Your email address' => '',
-    'Subscribe' => '',
-    'Contact Us' => '',
-    'Copyright' => '',
-    'You are here:' => '',
-    'Show' => '',
-    'per page' => '',
-    'Sort By' => '',
-    'Name ascending' => '',
-    'Name descending' => '',
-    'Price ascending' => '',
-    'Price descending' => '',
-    'View as' => '',
-    'View product' => '',
-    'Pagination' => '',
-    'No products available in this category' => '',
-    'Categories' => '',
-    'Ref.' => '',
-    'Availability' => '',
-    'In stock' => '',
-    'Out of stock' => '',
-    'Add to cart' => '',
-    'Description' => '',
-    'Additional Info' => '',
-    'View cart' => '',
-    'Continue Shopping' => '',
-    'Upsell Products' => '',
-    'Your Cart' => '',
-    'Billing and delivery' => '',
-    'Check my order' => '',
-    'Product Name' => '',
-    'Name' => '',
-    'Unit Price' => '',
-    'Price' => '',
-    'Quantity' => '',
-    'Qty' => '',
-    'Total' => '',
-    'Tax Inclusive' => '',
-    'TTC' => '',
-    'Available' => '',
-    'In Stock' => '',
-    'No.' => '',
-    'Remove' => '',
-    'Proceed checkout' => '',
-    'Warning' => '',
-    'missing or invalid data' => '',
-    'Do you have an account?' => '',
-    'Forgot your Password?' => '',
-    'Next' => '',
-    'Log out!' => '',
-    'My Account' => '',
-    'Previous product' => '',
-    'Next product' => '',
-    'instead of' => '',
-    'Add a new address' => '',
-    'Choose your delivery address' => '',
-    'Address %nb' => '',
-    'Edit this address' => '',
-    'Edit' => '',
-    'Remove this address' => '',
-    'Cancel' => '',
-    'Choose your delivery method' => '',
-    'Back' => '',
-    'Next Step' => '',
-    'Delete address' => '',
-    'Do you really want to delete this address ?' => '',
-    'No' => '',
-    'Yes' => '',
-    'Shipping Tax' => '',
-    'You may have a coupon ?' => '',
-    'Code :' => '',
-    'Coupon code' => '',
-    'Ok' => '',
-    'Delivery address' => '',
-    'Billing address' => '',
-    'Change address' => '',
-    'Choose your payment method' => '',
-    'Secure Payment' => '',
-    'You choose to pay by' => '',
-    'Thank you for the trust you place in us.' => '',
+    '404' => '',
     'A summary of your order email has been sent to the following address' => '',
-    'Your order will be confirmed by us upon receipt of your payment.' => '',
-    'Order number' => '',
-    'Date' => '',
-    'Go home' => '',
     'Account' => '',
-    'Personal Information' => '',
+    'Add a new address' => '',
+    'Add to cart' => '',
+    'Additional Info' => '',
+    'Address %nb' => '',
+    'Address Update' => '',
+    'Address' => '',
+    'Amount' => '',
+    'Availability' => '',
+    'Available' => '',
+    'Back' => '',
+    'Billing address' => '',
+    'Billing and delivery' => '',
+    'Cancel' => '',
+    'Cart' => '',
+    'Categories' => '',
+    'Change address' => '',
     'Change my account information' => '',
     'Change my password' => '',
+    'Change Password' => '',
+    'Check my order' => '',
+    'Checkout' => '',
+    'Choose your delivery address' => '',
+    'Choose your delivery method' => '',
+    'Choose your payment method' => '',
+    'Code :' => '',
+    'Complementary address' => '',
+    'Contact Us' => '',
+    'Continue Shopping' => '',
+    'Copyright' => '',
+    'Coupon code' => '',
+    'Create New Account' => '',
+    'Create New Address' => '',
+    'Create' => '',
+    'Currency:' => '',
+    'Date' => '',
+    'Delete address' => '',
+    'Delivery address' => '',
+    'Delivery Informations' => '',
+    'Demo product description' => '',
+    'Demo product title' => '',
+    'Description' => '',
+    'Do you have an account?' => '',
+    'Do you really want to delete this address ?' => '',
+    'Edit this address' => '',
+    'Edit' => '',
+    'Email address' => '',
+    'Follow us' => '',
+    'Forgot your Password?' => '',
+    'Free shipping' => '',
+    'Go home' => '',
+    'Grid' => '',
+    'Home address' => '',
+    'Home' => '',
+    'In Stock' => '',
+    'instead of' => '',
+    'Item(s)' => '',
+    'Language:' => '',
+    'Latest articles' => '',
+    'Latest products' => '',
+    'Latest' => '',
+    'List of orders' => '',
+    'List' => '',
+    'Log In!' => '',
+    'Log out!' => '',
+    'Login Information' => '',
+    'Login' => '',
+    'Main Navigation' => '',
+    'Minimum 2 characters.' => '',
+    'missing or invalid data' => '',
+    'Multi-payment platform' => '',
+    'My Account' => '',
     'My Address book' => '',
     'My Address Books' => '',
+    'My order' => '',
     'My Orders' => '',
-    'List of orders' => '',
-    'Order Number' => '',
-    'Amount' => '',
-    'Status' => '',
-    'View' => '',
-    'View order %ref as pdf document' => '',
-    'Order details' => '',
-    'You don\'t have orders yet.' => '',
-    'Update Profile' => '',
-    'Personal Informations' => '',
-    'Select Title' => '',
-    'Update' => '',
-    'Change Password' => '',
-    'Login Information' => '',
-    'Create New Address' => '',
-    'Address' => '',
-    'Home address' => '',
-    'Complementary address' => '',
-    'Select Country' => '',
-    'Create' => '',
-    'Related' => '',
-    'Grid' => '',
-    'List' => '',
+    'Name ascending' => '',
+    'Name descending' => '',
+    'Name' => '',
+    'Need help ?' => '',
+    'Newsletter Subscription' => '',
+    'Newsletter' => '',
+    'Next product' => '',
+    'Next Step' => '',
     'Next' => '',
-    'Previous' => '',
-    '%nb Items' => '',
-    '%nb Item' => '',
-    'Latest products' => '',
-    'Product Offers' => '',
-    /*
-    'The page cannot be found' => '',
-    'What\'s your name?' => '',
-    'So I can get back to you.' => '',
-    'The subject of your message.' => '',
-    'And your message...' => '',
-    'This email already exists.' => '',
-    'Address label' => '',
-    'Title' => '',
-    'First Name' => '',
-    'Last Name' => '',
-    'Company Name' => '',
-    'Street Address' => '',
-    'Address Line 2' => '',
-    'Address Line 3' => '',
-    'City' => '',
-    'Zip code' => '',
-    'Country' => '',
-    'Phone' => '',
-    'Cellphone' => '',
-    'Make this address as my primary address' => '',
-    'Full Name' => '',
-    'Your Email Address' => '',
-    'Subject' => '',
-    'Your Message' => '',
-    'Please enter your email address' => '',
-    'No, I am a new customer.' => '',
-    'Yes, I have a password :' => '',
-    'Please enter your password' => '',
-    'This value should not be blank.' => '',
-    'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
-    'This email does not exists' => '',
-    'Current Password' => '',
-    'New Password' => '',
-    'Password confirmation' => '',
-    'Your current password does not match.' => '',
-    'Password confirmation is not the same as password field.' => '',
-    'I would like to receive the newsletter or the latest news.' => '',
-    */
-    // Product Empty
-    'Product Empty Title' => 'Welcome',
-    'Product Empty Message' => 'It\'s really quick to add a product.
-      <ol>
-          <li>Check <strong>NEW</strong> under the details tab if you want to see your product in the latest product section.</li>
-          <li>Check <strong>SALE</strong> under the details tab if you want to see your product in the offer product section.</li>
-      </ol>',
-    'Product Empty Button' => 'Add my first product',
-    'Demo product title' => 'Demo product title',
-    'Demo product description' => 'Demo product description',
-    // Placeholder
-    'Placeholder firstname' => '',
-    'Placeholder lastname' => '',
-    'Placeholder email' => '',
-    'Placeholder phone' => '',
-    'Placeholder cellphone' => '',
-    'Placeholder company' => '',
+    'No articles currently' => '',
+    'No products available in this category' => '',
+    'No results found' => '',
+    'No.' => '',
+    'Offers' => '',
+    'Ok' => '',
+    'Order details' => '',
+    'Order number' => '',
+    'Orders over $50' => '',
+    'Out of Stock' => '',
+    'Pagination' => '',
+    'Password Forgotten' => '',
+    'Password' => '',
+    'per page' => '',
+    'Personal Informations' => '',
+    'Placeholder address label' => '',
     'Placeholder address1' => '',
     'Placeholder address2' => '',
+    'Placeholder cellphone' => '',
     'Placeholder city' => '',
-    'Placeholder zipcode' => '',
-    'Placeholder address label' => '',
-    'Placeholder contact name' => '',
+    'Placeholder company' => '',
     'Placeholder contact email' => '',
-    'Placeholder contact subject' => '',
     'Placeholder contact message' => '',
-)
-;
\ No newline at end of file
+    'Placeholder contact name' => '',
+    'Placeholder contact subject' => '',
+    'Placeholder email' => '',
+    'Placeholder firstname' => '',
+    'Placeholder lastname' => '',
+    'Placeholder phone' => '',
+    'Placeholder zipcode' => '',
+    'Please enter your email address below.' => '',
+    'Position' => '',
+    'Previous product' => '',
+    'Previous' => '',
+    'Price ascending' => '',
+    'Price descending' => '',
+    'Price' => '',
+    'Proceed checkout' => '',
+    'Product Empty Button' => '',
+    'Product Empty Message' => '',
+    'Product Empty Title' => '',
+    'Product Name' => '',
+    'Product Offers' => '',
+    'products' => '',
+    'Qty' => '',
+    'Quantity' => '',
+    'Questions ? See or F.A.Q.' => '',
+    'Rating' => '',
+    'Ref.' => '',
+    'Register!' => '',
+    'Register' => '',
+    'Regular Price:' => '',
+    'Related' => '',
+    'Remove this address' => '',
+    'Remove' => '',
+    'Search a product' => '',
+    'Search Result for' => '',
+    'Search' => '',
+    'Search...' => '',
+    'Secure payment' => '',
+    'Secure Payment' => '',
+    'Select Country' => '',
+    'Select Title' => '',
+    'Send us a message' => '',
+    'Send' => '',
+    'Shipping Tax' => '',
+    'Show' => '',
+    'Sign In' => '',
+    'Sign up to receive our latest news.' => '',
+    'Skip to content' => '',
+    'Sort By' => '',
+    'Special Price:' => '',
+    'Status' => '',
+    'Subscribe' => '',
+    'Tax Inclusive' => '',
+    'Thank you for the trust you place in us.' => '',
+    'Thanks !' => '',
+    'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => '',
+    'Thanks for your message, we will contact as soon as possible.' => '',
+    'The page cannot be found' => '',
+    'Thelia V2' => '',
+    'Toggle navigation' => '',
+    'Total' => '',
+    'TTC' => '',
+    'Unit Price' => '',
+    'Update Profile' => '',
+    'Update' => '',
+    'Upsell Products' => '',
+    'Useful links' => '',
+    'View all' => '',
+    'View as' => '',
+    'View Cart' => '',
+    'View order %ref as pdf document' => '',
+    'View product' => '',
+    'View' => '',
+    'Warning' => '',
+    'Yes' => '',
+    'You are here:' => '',
+    'You choose to pay by' => '',
+    'You don\'t have orders yet.' => '',
+    'You have no items in your shopping cart.' => '',
+    'You may have a coupon ?' => '',
+    'You want to subscribe to the newsletter? Please enter your email address below.' => '',
+    'You will receive a link to reset your password.' => '',
+    'Your Cart' => '',
+    'Your email address' => '',
+    'Your order will be confirmed by us upon receipt of your payment.' => '',
+);
\ No newline at end of file
diff --git a/templates/default/I18n/fr_FR.php b/templates/default/I18n/fr_FR.php
index 9e00957cb..2aaec2b6e 100755
--- a/templates/default/I18n/fr_FR.php
+++ b/templates/default/I18n/fr_FR.php
@@ -1,230 +1,208 @@
 <?php
 
-return array (
+return array(
+    '%nb Item' => '%nb produit',
+    '%nb Items' => '%nb produits',
     '+ View All' => '+ Voir tout',
-    'Thelia V2' => 'Thelia v2',
-    'Skip to content' => 'Aller au contenu',
-    'Toggle navigation' => 'Navigation alternative',
-    'Main Navigation' => 'Navigation principale',
-    'Register!' => 'S\'inscrire !',
-    'Log In!' => 'Se connecter',
-    'Sign In' => 'S\'inscrire',
-    'Register' => 'Se connecter',
-    'Cart' => 'Panier',
-    'View Cart' => 'Voir mon panier',
-    'Checkout' => 'Payer',
-    'You have no items in your shopping cart.' => 'Vous n\'avez pas de produit dans votre panier.',
-    'Home' => 'Accueil',
-    'Search a product' => 'Chercher un produit',
-    'Search...' => 'Recherche…',
-    'Minimum 2 characters.' => '2 caractères minimum.',
-    'Search' => 'Recherche',
-    'Language:' => 'Langue',
-    'Currency:' => 'Monnaie',
-    'Latest' => 'Nouveautés',
-    'Offers' => 'Promotions',
-    'Special Price:' => 'Prix en promotion :',
-    'Regular Price:' => 'Prix :',
-    'Free shipping' => 'Livraison gratuite',
-    'Orders over $50' => 'Commandes supérieures à 50€',//ne devrait-on pas mettre une variable ici?
-    'Secure payment' => 'Paiement sécurisé',
-    'Multi-payment plateform' => 'Plateforme multipaiement',// bizarre ?
-    'Need help ?' => 'Besoin d\'aide? ',
-    'Questions ? See or F.A.Q.' => 'Des questions ? Voir la F.A.Q.', // bizarre le 'see or '
-    'Latest articles' => 'Nouveaux articles',
-    'No articles currently' => 'Actuellement aucun article',
-    'Useful links' => 'Liens utiles',
-    'Login' => 'Connexion',
-    'Follow us' => 'Suivez-nous',
-    'Newsletter' => 'Newsletter',
-    'Sign up to receive our latest news.' => 'Inscrivez-vous pour recevoir nos actualités.',
-    'Email address' => 'Adresse e-mail',
-    'Your email address' => 'Votre adresse e-mail',
-    'Subscribe' => 'Inscription',
-    'Contact Us' => 'Contactez-nous',
-    'Copyright' => 'Copyright',
-    'You are here:' => 'Vous êtes ici :',
-    'Show' => 'Voir',
-    'per page' => 'par page',
-    'Sort By' => 'Trier par',
-    'Name ascending' => 'Nom croissant',
-    'Name descending' => 'Nom décroissant',
-    'Price ascending' => 'Prix croissant',
-    'Price descending' => 'Prix décroissant',
-    'View as' => 'Voir en tant que ',
-    'View product' => 'Voir le produit',
-    'Pagination' => 'Pagination',
-    'No products available in this category' => 'Aucun produit dans cette catégorie.',
-    'Categories' => 'Catégories',
-    'Ref.' => 'Ref.',
-    'Availability' => 'Disponibilité',
-    'In stock' => 'En stock',
-    'Out of stock' => 'Indisponible',
-    'Add to cart' => 'Ajouter au panier',
-    'Description' => 'Description',
-    'Additional Info' => 'Informations complémentaires',
-    'View cart' => 'Voir mon panier',
-    'Continue Shopping' => 'Continuer mes achats',
-    'Upsell Products' => 'Nous vous proposons également',
-    'Your Cart' => 'Votre panier',
-    'Billing and delivery' => 'Facturation et livraison',
-    'Check my order' => 'Vérifier ma commmande',
-    'Product Name' => 'Nom du produit',
-    'Name' => 'Nom',
-    'Unit Price' => 'Prix unitaire',
-    'Price' => 'Prix',
-    'Quantity' => 'Quantité',
-    'Qty' => 'Qté',
-    'Total' => 'Total',
-    'Tax Inclusive' => 'TVA incluse',
-    'Available' => 'Disponible',
-    'In Stock' => 'Disponible',
-    'No.' => 'N°',
-    'Remove' => 'Supprimer',
-    'Proceed checkout' => 'Payer',
-    'Warning' => 'Attention',
-    'missing or invalid data' => 'Information éronnée ou incomplète',
-    'Do you have an account?' => 'Avez-vous déjà un compte ?',
-    'Forgot your Password?' => 'Mot de passé oublié ?',
-    'Next' => 'Suivant',
-    'Log out!' => 'Se déconnecter',
-    'My Account' => 'Mon compte',
-    'Previous product' => 'Produits précédents',
-    'Next product' => 'Produits suivants',
-    'instead of' => 'au lieu de',
-    'Add a new address' => 'Ajouter une nouvelle adresse',
-    'Choose your delivery address' => 'Choisissez une adresse de livraison',
-    'Address %nb' => 'Adresse n°',
-    'Edit this address' => 'Editer cette adresse',
-    'Edit' => 'Editer',
-    'Remove this address' => 'Supprimer cette adresse',
-    'Cancel' => 'Annuler',
-    'Choose your delivery method' => 'Choisissez votre moyen de livraison',
-    'Back' => 'Retour',
-    'Next Step' => 'Etape suivante',
-    'Delete address' => 'Supprimer cette adresse',
-    'Do you really want to delete this address ?' => 'Voulez-vous vraiment supprimer cette adresse ?',
-    'No' => 'Non',
-    'Yes' => 'Oui',
-    'Shipping Tax' => 'Frais de livraison',
-    'You may have a coupon ?' => 'Avez-vous un code promo ?',
-    'Code :' => 'Code',
-    'Coupon code' => 'Code promo',
-    'Ok' => 'Ok',
-    'Delivery address' => 'Adresse de livraison',
-    'Billing address' => 'Adresse de facturation',
-    'Change address' => 'Changer d\'adresse',
-    'Choose your payment method' => 'Choisissez voter moyen de paiement',
-    'Secure Payment' => 'Paiement sécurisé',
-    // Tous les éléments relatifs au message de confirmation de commande devraient être administrables non?
-    'You choose to pay by' => 'Vous avez choisi de payer par',
-    'Thank you for the trust you place in us.' => 'Merci pour voter confiance. ',
+    '404' => '404',
     'A summary of your order email has been sent to the following address' => 'Un récapitulatif de commande vows a été envoyé par e-mail à l\'adresse suivante : ',
-    'Your order will be confirmed by us upon receipt of your payment.' => 'Votre commande sera confirmée à réception de votre pavement.',
-    'Order number' => 'Commande numéro',
-    'Date' => 'Date',
-    'Go home' => 'Retour à l\'accueil',
     'Account' => 'Mon compte',
-    'Personal Information' => 'Informations personnelles',
+    'Add a new address' => 'Ajouter une nouvelle adresse',
+    'Add to cart' => 'Ajouter au panier',
+    'Additional Info' => 'Informations complémentaires',
+    'Address %nb' => 'Adresse n°',
+    'Address Update' => 'Mise à jour de l\'adresse',
+    'Address' => 'Adresse',
+    'Amount' => 'Montant',
+    'Availability' => 'Disponibilité',
+    'Available' => 'Disponible',
+    'Back' => 'Retour',
+    'Billing address' => 'Adresse de facturation',
+    'Billing and delivery' => 'Facturation et livraison',
+    'Cancel' => 'Annuler',
+    'Cart' => 'Panier',
+    'Categories' => 'Catégories',
+    'Change address' => 'Changer d\'adresse',
     'Change my account information' => 'Modifier mes informations personnelles',
     'Change my password' => 'Changer mon mot de passe',
+    'Change Password' => 'Modifier mon mot de passe',
+    'Check my order' => 'Vérifier ma commmande',
+    'Checkout' => 'Payer',
+    'Choose your delivery address' => 'Choisissez une adresse de livraison',
+    'Choose your delivery method' => 'Choisissez votre moyen de livraison',
+    'Choose your payment method' => 'Choisissez voter moyen de paiement',
+    'Code :' => 'Code',
+    'Complementary address' => 'Résidence secondaire',
+    'Contact Us' => 'Contactez-nous',
+    'Continue Shopping' => 'Continuer mes achats',
+    'Copyright' => 'Copyright',
+    'Coupon code' => 'Code promo',
+    'Create New Account' => 'Créer un nouveau compte',
+    'Create New Address' => 'Créer une nouvelle adresse',
+    'Create' => 'Créer',
+    'Currency:' => 'Monnaie',
+    'Date' => 'Date',
+    'Delete address' => 'Supprimer cette adresse',
+    'Delivery address' => 'Adresse de livraison',
+    'Delivery Informations' => 'Informations de livraison',
+    'Demo product description' => 'Example de description de produit',
+    'Demo product title' => 'Example de titre',
+    'Description' => 'Description',
+    'Do you have an account?' => 'Avez-vous déjà un compte ?',
+    'Do you really want to delete this address ?' => 'Voulez-vous vraiment supprimer cette adresse ?',
+    'Edit this address' => 'Editer cette adresse',
+    'Edit' => 'Editer',
+    'Email address' => 'Adresse e-mail',
+    'Follow us' => 'Suivez-nous',
+    'Forgot your Password?' => 'Mot de passé oublié ?',
+    'Free shipping' => 'Livraison gratuite',
+    'Go home' => 'Retour à l\'accueil',
+    'Grid' => 'Grille',
+    'Home address' => 'Résidence principal',
+    'Home' => 'Accueil',
+    'In Stock' => 'Disponible',
+    'instead of' => 'au lieu de',
+    'Item(s)' => 'Produit(s)',
+    'Language:' => 'Langue',
+    'Latest articles' => 'Nouveaux articles',
+    'Latest products' => 'Derniers produits',
+    'Latest' => 'Nouveautés',
+    'List of orders' => 'Liste de mes commandes',
+    'List' => 'Liste',
+    'Log In!' => 'Se connecter',
+    'Log out!' => 'Se déconnecter',
+    'Login Information' => 'Informations de connexion',
+    'Login' => 'Connexion',
+    'Main Navigation' => 'Navigation principale',
+    'Minimum 2 characters.' => '2 caractères minimum.',
+    'missing or invalid data' => 'Information éronnée ou incomplète',
+    'Multi-payment plateform' => 'Plateforme multipaiement',// bizarre ?
+    'My Account' => 'Mon compte',
     'My Address book' => 'Mon carnet d\'adresses',
     'My Address Books' => 'Mes carnets d\'adresses',
+    'My order' => 'Ma commande',
     'My Orders' => 'Mes commandes',
-    'List of orders' => 'Liste de mes commandes',
-    'Order Number' => 'Commande numéro',
-    'Amount' => 'Montant',
-    'Status' => 'Etat',
-    'View' => 'Voir',
-    'View order %ref as pdf document' => 'Ouvrir la commande %ref dans un pdf',
-    'Order details' => 'Détail de commande',
-    'You don\'t have orders yet.' => 'Vous n\'avez pas encore de commande.',
-    'Update Profile' => 'Mettre à jour votre profil',
-    'Personal Informations' => 'Informations personnelles',
-    'Select Title' => 'Civilité',
-    'Update' => 'Mettre à jour',
-    'Change Password' => 'Modifier mon mot de passe',
-    'Login Information' => 'Informations de connexion',
-    'Create New Address' => 'Créer une nouvelle adresse',
-    'Address' => 'Adresse',
-    'Home address' => 'Résidence principal',
-    'Complementary address' => 'Résidence secondaire',
-    'Select Country' => 'Choisissez un pays',
-    'Create' => 'Créer',
-    'Related' => 'Liés', // voir le contexte pour l'accord
-    'Grid' => 'Grille',
-    'List' => 'Liste',
+    'Name ascending' => 'Nom croissant',
+    'Name descending' => 'Nom décroissant',
+    'Name' => 'Nom',
+    'Need help ?' => 'Besoin d\'aide? ',
+    'Newsletter Subscription' => 'Inscription à la newslatter',
+    'Newsletter' => 'Newsletter',
+    'Next product' => 'Produits suivants',
+    'Next Step' => 'Etape suivante',
     'Next' => 'Suivant',
+    'Next' => 'Suivant',
+    'No articles currently' => 'Actuellement aucun article',
+    'No products available in this category' => 'Aucun produit dans cette catégorie.',
+    'No results found' => 'Aucun résultat',
+    'No' => 'Non',
+    'No.' => 'N°',
+    'Offers' => 'Promotions',
+    'Ok' => 'Ok',
+    'Order details' => 'Détail de commande',
+    'Order number' => 'Commande numéro',
+    'Orders over $50' => 'Commandes supérieures à 50€',//ne devrait-on pas mettre une variable ici?
+    'Out of stock' => 'Indisponible',
+    'Pagination' => 'Pagination',
+    'Password Forgotten' => 'Mot de passe oublié',
+    'Password' => 'Mot de passe',
+    'per page' => 'par page',
+    'Personal Information' => 'Informations personnelles',
+    'Personal Informations' => 'Informations personnelles',
+    'Placeholder address label' => 'Maison, Domicile, Travail...',
+    'Placeholder address1' => 'Adresse',
+    'Placeholder address2' => '',
+    'Placeholder cellphone' => 'Portable',
+    'Placeholder city' => 'Ville',
+    'Placeholder company' => 'Compagnie',
+    'Placeholder contact email' => 'Pour me permettre de vous contacter',
+    'Placeholder contact message' => 'Votre commentaire',
+    'Placeholder contact name' => 'Quel est votre nom ?',
+    'Placeholder contact subject' => 'Le sujet de votre message',
+    'Placeholder email' => 'Adresse e-mail',
+    'Placeholder firstname' => 'Prénom',
+    'Placeholder lastname' => 'Nom de famille',
+    'Placeholder phone' => 'Téléphone',
+    'Placeholder zipcode' => 'Code postal',
+    'Please enter your email address below.' => 'Veuillez saisir votre adresse e-amil ci-dessous.',
+    'Position' => 'Position',
+    'Previous product' => 'Produits précédents',
     'Previous' => 'Précédent',
-    '%nb Items' => '%nb produits',
-    '%nb Item' => '%nb produit',
-    'Latest products' => 'Derniers produits',
-    'Product Offers' => 'Produits en promotion',
-
-    /*
-      'The page cannot be found' => '',
-      'What\'s your name?' => '',
-      'So I can get back to you.' => '',
-      'The subject of your message.' => '',
-      'And your message...' => '',
-      'This email already exists.' => '',
-      'Address label' => '',
-      'Title' => '',
-      'First Name' => '',
-      'Last Name' => '',
-      'Company Name' => '',
-      'Street Address' => '',
-      'Address Line 2' => '',
-      'Address Line 3' => '',
-      'City' => '',
-      'Zip code' => '',
-      'Country' => '',
-      'Phone' => '',
-      'Cellphone' => '',
-      'Make this address as my primary address' => '',
-      'Full Name' => '',
-      'Your Email Address' => '',
-      'Subject' => '',
-      'Your Message' => '',
-      'Please enter your email address' => '',
-      'No, I am a new customer.' => '',
-      'Yes, I have a password :' => '',
-      'Please enter your password' => '',
-      'This value should not be blank.' => '',
-      'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
-      'This email does not exists' => '',
-      'Current Password' => '',
-      'New Password' => '',
-      'Password confirmation' => '',
-      'Your current password does not match.' => '',
-      'Password confirmation is not the same as password field.' => '',
-      'I would like to receive the newsletter or the latest news.' => '',
-    */
-    // Product Empty
-    'Product Empty Title' => 'Bonjour',
+    'Price ascending' => 'Prix croissant',
+    'Price descending' => 'Prix décroissant',
+    'Price' => 'Prix',
+    'Proceed checkout' => 'Payer',
+    'Product Empty Button' => 'Ajouter mon premier produit',
     'Product Empty Message' => 'C\'est très simple d\'ajouter un produit dans l\'adminsitration.
         <ol>
             <li>N\'oubliez pas de sélectionner <strong>NEW</strong> dans l\'onglet Details afin de voir votre produit dans la section des nouveautés.</li>
             <li>N\'oubliez pas de sélectionner <strong>SALE</strong> dans l\'onglet Details afin de voir votre produit dans la section des promotions.</li>
         </ol>',
-    'Product Empty Button' => 'Ajouter mon premier produit',
-    'Demo product title' => 'Example de titre',
-    'Demo product description' => 'Example de description de produit',
-    // Placeholder
-    'Placeholder firstname' => 'Prénom',
-    'Placeholder lastname' => 'Nom de famille',
-    'Placeholder email' => 'Adresse e-mail',
-    'Placeholder phone' => 'Téléphone',
-    'Placeholder cellphone' => 'Portable',
-    'Placeholder company' => 'Compagnie',
-    'Placeholder address1' => 'Adresse',
-    'Placeholder address2' => '',
-    'Placeholder city' => 'Ville',
-    'Placeholder zipcode' => 'Code postal',
-    'Placeholder address label' => 'Maison, Domicile, Travail...',
-    'Placeholder contact name' => 'Quel est votre nom ?',
-    'Placeholder contact email' => 'Pour me permettre de vous contacter',
-    'Placeholder contact subject' => 'Le sujet de votre message',
-    'Placeholder contact message' => 'Votre commentaire',
-)
-;
\ No newline at end of file
+    'Product Empty Title' => 'Bonjour',
+    'Product Name' => 'Nom du produit',
+    'Product Offers' => 'Produits en promotion',
+    'products' => 'produits',
+    'Qty' => 'Qté',
+    'Quantity' => 'Quantité',
+    'Questions ? See or F.A.Q.' => 'Des questions ? Voir la F.A.Q.', // bizarre le 'see or '
+    'Rating' => 'Avis',
+    'Ref.' => '',
+    'Register!' => 'S\'inscrire !',
+    'Register' => 'Se connecter',
+    'Regular Price:' => 'Prix :',
+    'Related' => 'Liés', // voir le contexte pour l'accord
+    'Remove this address' => 'Supprimer cette adresse',
+    'Remove' => 'Supprimer',
+    'Search a product' => 'Chercher un produit',
+    'Search Result for' => 'Résultat de recherche pour',
+    'Search' => 'Recherche',
+    'Search...' => 'Recherche…',
+    'Secure payment' => 'Paiement sécurisé',
+    'Secure Payment' => 'Paiement sécurisé',
+    'Select Country' => 'Choisissez un pays',
+    'Select Title' => 'Civilité',
+    'Send us a message' => 'Envoyer nous un message',
+    'Send' => 'Envoyer',
+    'Shipping Tax' => 'Frais de livraison',
+    'Show' => 'Voir',
+    'Sign In' => 'S\'inscrire',
+    'Sign up to receive our latest news.' => 'Inscrivez-vous pour recevoir nos actualités.',
+    'Skip to content' => 'Aller au contenu',
+    'Sort By' => 'Trier par',
+    'Special Price:' => 'Prix en promotion :',
+    'Status' => 'Etat',
+    'Subscribe' => 'Inscription',
+    'Tax Inclusive' => 'TVA incluse',
+    'Thank you for the trust you place in us.' => 'Merci pour votre confiance. ',
+    'Thanks !' => 'Merci !',
+    'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => '',
+    'Thanks for your message, we will contact as soon as possible.' => '',
+    'The page cannot be found' => '',
+    'Thelia V2' => 'Thelia v2',
+    'Toggle navigation' => 'Navigation alternative',
+    'Total' => 'Total',
+    'TTC' => 'TTC',
+    'Unit Price' => 'Prix unitaire',
+    'Update Profile' => 'Mettre à jour votre profil',
+    'Update' => 'Mettre à jour',
+    'Upsell Products' => 'Nous vous proposons également',
+    'Useful links' => 'Liens utiles',
+    'View all' => ' Voir tout',
+    'View as' => 'Voir en tant que ',
+    'View Cart' => 'Voir mon panier',
+    'View order %ref as pdf document' => 'Ouvrir la commande %ref dans un pdf',
+    'View product' => 'Voir le produit',
+    'View' => 'Voir',
+    'Warning' => 'Attention',
+    'Yes' => 'Oui',
+    'You are here:' => 'Vous êtes ici :',
+    'You choose to pay by' => 'Vous avez choisi de payer par',
+    'You don\'t have orders yet.' => 'Vous n\'avez pas encore de commande.',
+    'You have no items in your shopping cart.' => 'Vous n\'avez pas de produit dans votre panier.',
+    'You may have a coupon ?' => 'Avez-vous un code promo ?',
+    'You want to subscribe to the newsletter? Please enter your email address below.' => 'Vous voulez vous inscrire à la newsletter ? Veuillez saisir votre adresse e-amil ci-dessous.',
+    'You will receive a link to reset your password.' => 'Vous recevrez un lien pour réinitialiser votre mot de passe.',
+    'Your Cart' => 'Votre panier',
+    'Your email address' => 'Votre adresse e-mail',
+    'Your order will be confirmed by us upon receipt of your payment.' => 'Votre commande sera confirmée à réception de votre pavement.',
+);
\ No newline at end of file
diff --git a/templates/default/I18n/it_IT.php b/templates/default/I18n/it_IT.php
index e4004de1e..e96407fea 100755
--- a/templates/default/I18n/it_IT.php
+++ b/templates/default/I18n/it_IT.php
@@ -1,229 +1,201 @@
 <?php
 
-return array (
+return array(
+    '%nb Item' => '',
+    '%nb Items' => '',
     '+ View All' => '',
-    'Thelia V2' => '',
-    'Skip to content' => '',
-    'Toggle navigation' => '',
-    'Main Navigation' => '',
-    'Register!' => '',
-    'Log In!' => '',
-    'Sign In' => '',
-    'Register' => '',
-    'Cart' => '',
-    'View Cart' => '',
-    'Checkout' => '',
-    'You have no items in your shopping cart.' => '',
-    'Home' => '',
-    'Search a product' => '',
-    'Search...' => '',
-    'Minimum 2 characters.' => '',
-    'Search' => '',
-    'Language:' => '',
-    'Currency:' => '',
-    'Latest' => '',
-    'Offers' => '',
-    'Special Price:' => '',
-    'Regular Price:' => '',
-    'Free shipping' => '',
-    'Orders over $50' => '',
-    'Secure payment' => '',
-    'Multi-payment platform' => '',
-    'Need help ?' => '',
-    'Questions ? See or F.A.Q.' => '',
-    'Latest articles' => '',
-    'No articles currently' => '',
-    'Useful links' => '',
-    'Login' => '',
-    'Follow us' => '',
-    'Newsletter' => '',
-    'Sign up to receive our latest news.' => '',
-    'Email address' => '',
-    'Your email address' => '',
-    'Subscribe' => '',
-    'Contact Us' => '',
-    'Copyright' => '',
-    'You are here:' => '',
-    'Show' => '',
-    'per page' => '',
-    'Sort By' => '',
-    'Name ascending' => '',
-    'Name descending' => '',
-    'Price ascending' => '',
-    'Price descending' => '',
-    'View as' => '',
-    'View product' => '',
-    'Pagination' => '',
-    'No products available in this category' => '',
-    'Categories' => '',
-    'Ref.' => '',
-    'Availability' => '',
-    'In stock' => '',
-    'Out of stock' => '',
-    'Add to cart' => '',
-    'Description' => '',
-    'Additional Info' => '',
-    'View cart' => '',
-    'Continue Shopping' => '',
-    'Upsell Products' => '',
-    'Your Cart' => '',
-    'Billing and delivery' => '',
-    'Check my order' => '',
-    'Product Name' => '',
-    'Name' => '',
-    'Unit Price' => '',
-    'Price' => '',
-    'Quantity' => '',
-    'Qty' => '',
-    'Total' => '',
-    'Tax Inclusive' => '',
-    'TTC' => '',
-    'Available' => '',
-    'In Stock' => '',
-    'No.' => '',
-    'Remove' => '',
-    'Proceed checkout' => '',
-    'Warning' => '',
-    'missing or invalid data' => '',
-    'Do you have an account?' => '',
-    'Forgot your Password?' => '',
-    'Next' => '',
-    'Log out!' => '',
-    'My Account' => '',
-    'Previous product' => '',
-    'Next product' => '',
-    'instead of' => '',
-    'Add a new address' => '',
-    'Choose your delivery address' => '',
-    'Address %nb' => '',
-    'Edit this address' => '',
-    'Edit' => '',
-    'Remove this address' => '',
-    'Cancel' => '',
-    'Choose your delivery method' => '',
-    'Back' => '',
-    'Next Step' => '',
-    'Delete address' => '',
-    'Do you really want to delete this address ?' => '',
-    'No' => '',
-    'Yes' => '',
-    'Shipping Tax' => '',
-    'You may have a coupon ?' => '',
-    'Code :' => '',
-    'Coupon code' => '',
-    'Ok' => '',
-    'Delivery address' => '',
-    'Billing address' => '',
-    'Change address' => '',
-    'Choose your payment method' => '',
-    'Secure Payment' => '',
-    'You choose to pay by' => '',
-    'Thank you for the trust you place in us.' => '',
+    '404' => '',
     'A summary of your order email has been sent to the following address' => '',
-    'Your order will be confirmed by us upon receipt of your payment.' => '',
-    'Order number' => '',
-    'Date' => '',
-    'Go home' => '',
     'Account' => '',
-    'Personal Information' => '',
+    'Add a new address' => '',
+    'Add to cart' => '',
+    'Additional Info' => '',
+    'Address %nb' => '',
+    'Address Update' => '',
+    'Address' => '',
+    'Amount' => '',
+    'Availability' => '',
+    'Available' => '',
+    'Back' => '',
+    'Billing address' => '',
+    'Billing and delivery' => '',
+    'Cancel' => '',
+    'Cart' => '',
+    'Categories' => '',
+    'Change address' => '',
     'Change my account information' => '',
     'Change my password' => '',
+    'Change Password' => '',
+    'Check my order' => '',
+    'Checkout' => '',
+    'Choose your delivery address' => '',
+    'Choose your delivery method' => '',
+    'Choose your payment method' => '',
+    'Code :' => '',
+    'Complementary address' => '',
+    'Contact Us' => '',
+    'Continue Shopping' => '',
+    'Copyright' => '',
+    'Coupon code' => '',
+    'Create New Account' => '',
+    'Create New Address' => '',
+    'Create' => '',
+    'Currency:' => '',
+    'Date' => '',
+    'Delete address' => '',
+    'Delivery address' => '',
+    'Delivery Informations' => '',
+    'Demo product description' => '',
+    'Demo product title' => '',
+    'Description' => '',
+    'Do you have an account?' => '',
+    'Do you really want to delete this address ?' => '',
+    'Edit this address' => '',
+    'Edit' => '',
+    'Email address' => '',
+    'Follow us' => '',
+    'Forgot your Password?' => '',
+    'Free shipping' => '',
+    'Go home' => '',
+    'Grid' => '',
+    'Home address' => '',
+    'Home' => '',
+    'In Stock' => '',
+    'instead of' => '',
+    'Item(s)' => '',
+    'Language:' => '',
+    'Latest articles' => '',
+    'Latest products' => '',
+    'Latest' => '',
+    'List of orders' => '',
+    'List' => '',
+    'Log In!' => '',
+    'Log out!' => '',
+    'Login Information' => '',
+    'Login' => '',
+    'Main Navigation' => '',
+    'Minimum 2 characters.' => '',
+    'missing or invalid data' => '',
+    'Multi-payment platform' => '',
+    'My Account' => '',
     'My Address book' => '',
     'My Address Books' => '',
+    'My order' => '',
     'My Orders' => '',
-    'List of orders' => '',
-    'Order Number' => '',
-    'Amount' => '',
-    'Status' => '',
-    'View' => '',
-    'View order %ref as pdf document' => '',
-    'Order details' => '',
-    'You don\'t have orders yet.' => '',
-    'Update Profile' => '',
-    'Personal Informations' => '',
-    'Select Title' => '',
-    'Update' => '',
-    'Change Password' => '',
-    'Login Information' => '',
-    'Create New Address' => '',
-    'Address' => '',
-    'Home address' => '',
-    'Complementary address' => '',
-    'Select Country' => '',
-    'Create' => '',
-    'Related' => '',
-    'Grid' => '',
-    'List' => '',
+    'Name ascending' => '',
+    'Name descending' => '',
+    'Name' => '',
+    'Need help ?' => '',
+    'Newsletter Subscription' => '',
+    'Newsletter' => '',
+    'Next product' => '',
+    'Next Step' => '',
     'Next' => '',
-    'Previous' => '',
-    '%nb Items' => '',
-    '%nb Item' => '',
-    'Latest products' => '',
-    'Product Offers' => '',
-    /*
-    'The page cannot be found' => '',
-    'What\'s your name?' => '',
-    'So I can get back to you.' => '',
-    'The subject of your message.' => '',
-    'And your message...' => '',
-    'This email already exists.' => '',
-    'Address label' => '',
-    'Title' => '',
-    'First Name' => '',
-    'Last Name' => '',
-    'Company Name' => '',
-    'Street Address' => '',
-    'Address Line 2' => '',
-    'Address Line 3' => '',
-    'City' => '',
-    'Zip code' => '',
-    'Country' => '',
-    'Phone' => '',
-    'Cellphone' => '',
-    'Make this address as my primary address' => '',
-    'Full Name' => '',
-    'Your Email Address' => '',
-    'Subject' => '',
-    'Your Message' => '',
-    'Please enter your email address' => '',
-    'No, I am a new customer.' => '',
-    'Yes, I have a password :' => '',
-    'Please enter your password' => '',
-    'This value should not be blank.' => '',
-    'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
-    'This email does not exists' => '',
-    'Current Password' => '',
-    'New Password' => '',
-    'Password confirmation' => '',
-    'Your current password does not match.' => '',
-    'Password confirmation is not the same as password field.' => '',
-    'I would like to receive the newsletter or the latest news.' => '',
-    */
-    // Product Empty
-    'Product Empty Title' => 'Welcome',
-    'Product Empty Message' => 'It\'s really quick to add a product.
-      <ol>
-          <li>Check <strong>NEW</strong> under the details tab if you want to see your product in the latest product section.</li>
-          <li>Check <strong>SALE</strong> under the details tab if you want to see your product in the offer product section.</li>
-      </ol>',
-    'Product Empty Button' => 'Add my first product',
-    'Demo product title' => 'Demo product title',
-    'Demo product description' => 'Demo product description',
-    // Placeholder
-    'Placeholder firstname' => '',
-    'Placeholder lastname' => '',
-    'Placeholder email' => '',
-    'Placeholder phone' => '',
-    'Placeholder cellphone' => '',
-    'Placeholder company' => '',
+    'No articles currently' => '',
+    'No products available in this category' => '',
+    'No results found' => '',
+    'No.' => '',
+    'Offers' => '',
+    'Ok' => '',
+    'Order details' => '',
+    'Order number' => '',
+    'Orders over $50' => '',
+    'Out of Stock' => '',
+    'Pagination' => '',
+    'Password Forgotten' => '',
+    'Password' => '',
+    'per page' => '',
+    'Personal Informations' => '',
+    'Placeholder address label' => '',
     'Placeholder address1' => '',
     'Placeholder address2' => '',
+    'Placeholder cellphone' => '',
     'Placeholder city' => '',
-    'Placeholder zipcode' => '',
-    'Placeholder address label' => '',
-    'Placeholder contact name' => '',
+    'Placeholder company' => '',
     'Placeholder contact email' => '',
-    'Placeholder contact subject' => '',
     'Placeholder contact message' => '',
-)
-;
\ No newline at end of file
+    'Placeholder contact name' => '',
+    'Placeholder contact subject' => '',
+    'Placeholder email' => '',
+    'Placeholder firstname' => '',
+    'Placeholder lastname' => '',
+    'Placeholder phone' => '',
+    'Placeholder zipcode' => '',
+    'Please enter your email address below.' => '',
+    'Position' => '',
+    'Previous product' => '',
+    'Previous' => '',
+    'Price ascending' => '',
+    'Price descending' => '',
+    'Price' => '',
+    'Proceed checkout' => '',
+    'Product Empty Button' => '',
+    'Product Empty Message' => '',
+    'Product Empty Title' => '',
+    'Product Name' => '',
+    'Product Offers' => '',
+    'products' => '',
+    'Qty' => '',
+    'Quantity' => '',
+    'Questions ? See or F.A.Q.' => '',
+    'Rating' => '',
+    'Ref.' => '',
+    'Register!' => '',
+    'Register' => '',
+    'Regular Price:' => '',
+    'Related' => '',
+    'Remove this address' => '',
+    'Remove' => '',
+    'Search a product' => '',
+    'Search Result for' => '',
+    'Search' => '',
+    'Search...' => '',
+    'Secure payment' => '',
+    'Secure Payment' => '',
+    'Select Country' => '',
+    'Select Title' => '',
+    'Send us a message' => '',
+    'Send' => '',
+    'Shipping Tax' => '',
+    'Show' => '',
+    'Sign In' => '',
+    'Sign up to receive our latest news.' => '',
+    'Skip to content' => '',
+    'Sort By' => '',
+    'Special Price:' => '',
+    'Status' => '',
+    'Subscribe' => '',
+    'Tax Inclusive' => '',
+    'Thank you for the trust you place in us.' => '',
+    'Thanks !' => '',
+    'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => '',
+    'Thanks for your message, we will contact as soon as possible.' => '',
+    'The page cannot be found' => '',
+    'Thelia V2' => '',
+    'Toggle navigation' => '',
+    'Total' => '',
+    'TTC' => '',
+    'Unit Price' => '',
+    'Update Profile' => '',
+    'Update' => '',
+    'Upsell Products' => '',
+    'Useful links' => '',
+    'View all' => '',
+    'View as' => '',
+    'View Cart' => '',
+    'View order %ref as pdf document' => '',
+    'View product' => '',
+    'View' => '',
+    'Warning' => '',
+    'Yes' => '',
+    'You are here:' => '',
+    'You choose to pay by' => '',
+    'You don\'t have orders yet.' => '',
+    'You have no items in your shopping cart.' => '',
+    'You may have a coupon ?' => '',
+    'You want to subscribe to the newsletter? Please enter your email address below.' => '',
+    'You will receive a link to reset your password.' => '',
+    'Your Cart' => '',
+    'Your email address' => '',
+    'Your order will be confirmed by us upon receipt of your payment.' => '',
+);
\ No newline at end of file
diff --git a/templates/default/account.html b/templates/default/account.html
index 863104615..639ea25a2 100644
--- a/templates/default/account.html
+++ b/templates/default/account.html
@@ -26,7 +26,7 @@
                     <div class="panel-heading">
                         <h4 class="panel-title">
                             <a class="accordion-toggle" data-toggle="collapse" data-parent="#account" href="#account-info">
-                                {intl l="Personal Information"}
+                                {intl l="Personal Informations"}
                             </a>
                         </h4>
                     </div>
@@ -144,7 +144,7 @@
                             <table class="table table-orders" summary="{intl l="List of orders"}">
                                 <thead>
                                 <tr>
-                                    <th>{intl l="Order Number"}</th>
+                                    <th>{intl l="Order number"}</th>
                                     <th>{intl l="Date"}</th>
                                     <th>{intl l="Amount"}</th>
                                     <th>{intl l="Status"}</th>
diff --git a/templates/default/address.html b/templates/default/address.html
index fea5c5dd5..ac625af2b 100644
--- a/templates/default/address.html
+++ b/templates/default/address.html
@@ -12,7 +12,7 @@
 {block name='no-return-functions' append}
     {$breadcrumbs = [
         ['title' => {intl l="Account"}, 'url'=>{url path="/account"}],
-        ['title' => {intl l="Add a New Address"}, 'url'=>{url path="/address/create"}]
+        ['title' => {intl l="Add a new address"}, 'url'=>{url path="/address/create"}]
     ]}
 {/block}
 
diff --git a/templates/default/contact.html b/templates/default/contact.html
index 66fc784f6..863314391 100644
--- a/templates/default/contact.html
+++ b/templates/default/contact.html
@@ -2,13 +2,13 @@
 
 {* Breadcrumb *}
 {block name='no-return-functions' append}
-    {$breadcrumbs = [['title' => {intl l="Contact us"}, 'url'=>{url path="/contact"}]]}
+    {$breadcrumbs = [['title' => {intl l="Contact Us"}, 'url'=>{url path="/contact"}]]}
 {/block}
 
 {block name="main-content"}
     <div class="main">
         <article class="col-main" role="main" aria-labelledby="main-label">
-        <h1 id="main-label" class="page-header">{intl l="Contact us"}</h1>
+        <h1 id="main-label" class="page-header">{intl l="Contact Us"}</h1>
 
         <div id="google-map">
             <iframe class="map" width="100%" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.co.uk/maps?f=q&source=s_q&hl=en&geocode=&q=london&aq=&sll=52.8382,-2.327815&sspn=9.377429,22.126465&ie=UTF8&hq=&hnear=London,+United+Kingdom&t=m&z=10&ll=51.511214,-0.119824&output=embed&iwloc=near"></iframe>
diff --git a/templates/default/includes/addedToCart.html b/templates/default/includes/addedToCart.html
index 5a82d761f..273162529 100644
--- a/templates/default/includes/addedToCart.html
+++ b/templates/default/includes/addedToCart.html
@@ -30,7 +30,7 @@
         </table>
     {/loop}
 
-    <a href="{url path="/cart"}" role="button" class="btn btn_add_to_cart pull-right"><span>{intl l="View cart"}</span></a>
+    <a href="{url path="/cart"}" role="button" class="btn btn_add_to_cart pull-right"><span>{intl l="View Cart"}</span></a>
     <button type="button" class="btn btn-checkout pull-right" data-dismiss="modal"><span>{intl l="Continue Shopping"}</span></button>
 </div>
 
diff --git a/templates/default/product.html b/templates/default/product.html
index 3fa011d97..ddea559a2 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -114,7 +114,7 @@
                     <div class="availability">
                         <span class="availibity-label">{intl l="Availability"}: </span>
                         <span itemprop="availability" href="{$current_stock_href}" class="{$current_stock_class}" id="stockInformations">
-                            <span class="in">{intl l='In stock'}</span><span class="out">{intl l='Out of stock'}</span>
+                            <span class="in">{intl l='In Stock'}</span><span class="out">{intl l='Out of Stock'}</span>
                         </span>
                     </div>
 
diff --git a/templates/default/register.html b/templates/default/register.html
index 0fda003b0..66fd5e052 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -262,7 +262,7 @@
 
                 <div class="form-group group-btn">
                     <div class="control-btn">
-                        <button type="submit" class="btn btn-register">{intl l="Sign in"}</button>
+                        <button type="submit" class="btn btn-register">{intl l="Sign In"}</button>
                     </div>
                 </div><!--/.form-group-->
             </form>