[-] BO : fix small bug for translations

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12164 b9a71923-0436-4b27-9f14-aed3839534dd

controllers/admin/AdminCurrenciesController.php

@@ -144,8 +144,7 @@ class AdminCurrenciesControllerCore extends AdminController
 					'size' => 3,
 					'maxlength' => 11,
 					'required' => true,
-					'desc' => $this->l('Conversion rate from one unit of your shop\'s default currency (for example, 1€) to this currency. 
+					'desc' => $this->l('Conversion rate from one unit of your shop\'s default currency (for example, 1€) to this currency. For example, if the default currency is euros and this currency is dollars, type \'1.20\'').' 1€ = $1.20',
-						For example, if the default currency is euros and this currency is dollars, type \'1.20\'').' 1€ = $1.20',
 				),
 				array(
 					'type' => 'select',

controllers/admin/AdminInvoicesController.php

@@ -49,8 +49,7 @@ class AdminInvoicesControllerCore extends AdminController
 					),
 					'PS_INVOICE_START_NUMBER' => array(
 						'title' => $this->l('Invoice number:'),
-						'desc' => $this->l('The next invoice will begin with this number, and then increase with each additional invoice.
+						'desc' => $this->l('The next invoice will begin with this number, and then increase with each additional invoice. Set to 0 if you want to keep the current number (#').(Order::getLastInvoiceNumber() + 1).').',
-							Set to 0 if you want to keep the current number (#').(Order::getLastInvoiceNumber() + 1).').',
 						'size' => 6,
 						'type' => 'text',
 						'cast' => 'intval'

controllers/admin/AdminPPreferencesController.php

@@ -102,8 +102,7 @@ class AdminPPreferencesControllerCore extends AdminController
 					),
 					'PS_ATTRIBUTE_CATEGORY_DISPLAY' => array(
 						'title' => $this->l('Display "add to cart" button when product has attributes:'),
-						'desc' => $this->l('Display or hide the "add to cart" button on category pages for products
+						'desc' => $this->l('Display or hide the "add to cart" button on category pages for products that have attributes to force customers to see the product detail'),
-							that have attributes to force customers to see the product detail'),
 						'validation' => 'isBool',
 						'cast' => 'intval',
 						'type' => 'bool'

controllers/admin/AdminPerformanceController.php

@@ -56,16 +56,13 @@ class AdminPerformanceControllerCore extends AdminController
 							'id' => 'smarty_force_compile_'._PS_SMARTY_CHECK_COMPILE_,
 							'value' => _PS_SMARTY_CHECK_COMPILE_,
 							'label' => $this->l('Compile cache if templates are updated'),
-							'desc' => $this->l('Templates are recompiled when they are updated, if you experience compilation troubles 
+							'desc' => $this->l('Templates are recompiled when they are updated, if you experience compilation troubles when you update your templates files, you should use force compile instead of this option. It should never be used in a production environment.')
-								when you update your templates files, you should use force compile instead of this option. 
-								It should never be used in a production environment.')
 						),
 						array(
 							'id' => 'smarty_force_compile_'._PS_SMARTY_FORCE_COMPILE_,
 							'value' => _PS_SMARTY_FORCE_COMPILE_,
 							'label' => $this->l('Force compile'),
-							'desc' => $this->l('This forces Smarty to (re)compile templates on every invocation. 
+							'desc' => $this->l('This forces Smarty to (re)compile templates on every invocation. This is handy for development and debugging. It should never be used in a production environment.')
-								This is handy for development and debugging. It should never be used in a production environment.')
 						)
 					)
 				),
@@ -191,9 +188,7 @@ class AdminPerformanceControllerCore extends AdminController
 				'title' => $this->l('CCC (Combine, Compress and Cache)'),
 				'image' => '../img/admin/arrow_in.png'
 			),
-			'desc' => $this->l('CCC allows you to reduce the loading time of your page. 
+			'desc' => $this->l('CCC allows you to reduce the loading time of your page. With these settings you will gain performance without even touching the code of your theme. Make sure, however, that your theme is compatible with PrestaShop 1.4+. Otherwise, CCC will cause problems.'),
-				With these settings you will gain performance without even touching the code of your theme. 
-				Make sure, however, that your theme is compatible with PrestaShop 1.4+. Otherwise, CCC will cause problems.'),
 			'input' => array(
 				array(
 					'type' => 'hidden',
@@ -322,24 +317,21 @@ class AdminPerformanceControllerCore extends AdminController
 					'label' => $this->l('Media server #1:'),
 					'name' => '_MEDIA_SERVER_1_',
 					'size' => 30,
-					'desc' => $this->l('Name of the second domain of your shop, (e.g., myshop-media-server-1.com). 
+					'desc' => $this->l('Name of the second domain of your shop, (e.g., myshop-media-server-1.com). If you do not have another domain, leave this field blank')
-						If you do not have another domain, leave this field blank')
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Media server #2:'),
 					'name' => '_MEDIA_SERVER_2_',
 					'size' => 30,
-					'desc' => $this->l('Name of the third domain of your shop, (e.g., myshop-media-server-2.com). 
+					'desc' => $this->l('Name of the third domain of your shop, (e.g., myshop-media-server-2.com). If you do not have another domain, leave this field blank')
-						If you do not have another domain, leave this field blank')
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Media server #3:'),
 					'name' => '_MEDIA_SERVER_3_',
 					'size' => 30,
-					'desc' => $this->l('Name of the fourth domain of your shop, (e.g., myshop-media-server-3.com). 
+					'desc' => $this->l('Name of the fourth domain of your shop, (e.g., myshop-media-server-3.com). If you do not have another domain, leave this field blank')
-						If you do not have another domain, leave this field blank')
 				),
 			)
 		);
@@ -356,8 +348,7 @@ class AdminPerformanceControllerCore extends AdminController
 				'title' => $this->l('Ciphering'),
 				'image' => '../img/admin/computer_key.png'
 			),
-			'desc' => $this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension "mcrypt". 
+			'desc' => $this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension "mcrypt". If you change this configuration, all cookies will be reset.'),
-				If you change this configuration, all cookies will be reset.'),
 			'input' => array(
 				array(
 					'type' => 'hidden',

controllers/admin/AdminStockConfigurationController.php

@@ -241,8 +241,7 @@ class AdminStockConfigurationControllerCore extends AdminController
 									'label' => $this->l('No')
 								)
 							),
-							'desc' => $this->l('For this status, you have to define if it is possible to edit the order.
+							'desc' => $this->l('For this status, you have to define if it is possible to edit the order. An editable order is an order not valid to send to the supplier.')
-												An editable order is an order not valid to send to the supplier.')
 						),
 						array(
 							'type' => 'radio',
@@ -284,8 +283,7 @@ class AdminStockConfigurationControllerCore extends AdminController
 									'label' => $this->l('No')
 								)
 							),
-							'desc' => $this->l('For this status, you have to define if products have been partially/completely received.
+							'desc' => $this->l('For this status, you have to define if products have been partially/completely received. This allows to know if the products ordered have to be added to the corresponding warehouse.'),
-												This allows to know if the products ordered have to be added to the corresponding warehouse.'),
 						),
 						array(
 							'type' => 'radio',