Corrected strings not translated and typos in English language

htdocs/core/modules/modAgenda.class.php

@@ -368,7 +368,7 @@ class modAgenda extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]="ExportDataset_event1";
 		$this->export_permission[$r]=array(array("agenda","export"));
-		$this->export_fields_array[$r]=array('a.id'=>'IdAgenda','a.label'=>'Actions','a.datep'=>'DateActionStart',
+		$this->export_fields_array[$r]=array('a.id'=>'IdAgenda','a.label'=>'Title','a.datep'=>'DateActionStart',
 		'a.datea'=>'DateActionEnd','a.percent'=>'PercentDone','a.fk_user_author'=>'ActionAskedBy','a.fk_user_action'=>'ActionAffectedTo',
 		'a.fk_user_done'=>"ActionDoneBy","a.priority"=>"Priority","a.fulldayevent"=>"EventOnFullDay","a.location"=>"Location",
 		"a.fk_soc"=>"ThirdParty","a.fk_contact"=>"ThirdPartyContact","a.fk_action"=>"Type");

htdocs/core/modules/modProduct.class.php

@@ -254,15 +254,15 @@ class modProduct extends DolibarrModules
 		$this->export_label[$r]="ProductsMultiPrice";	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("produit","export"));
 		$this->export_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",
-			'pr.price_base_type'=>"PriceLevelPriceBase",'pr.price_level'=>"PriceLevel",
-			'pr.price'=>"PriceLevelUnitPriceHT",'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
-			'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
-			'pr.tva_tx'=>'PriceLevelVATRate',
+			'pr.price_base_type'=>"PriceBase",'pr.price_level'=>"PriceLevel",
+			'pr.price'=>"HT",'pr.price_ttc'=>"TTC",
+			'pr.price_min'=>"MinPriceHT",'pr.price_min_ttc'=>"MinPriceTTC",
+			'pr.tva_tx'=>'VAT',
 			'pr.date_price'=>'DateCreation');
 		$this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",
 			'pr.price_base_type'=>"product",'pr.price_level'=>"product",'pr.price'=>"product",
 			'pr.price_ttc'=>"product",
-			'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
+			'pr.price_min'=>"product",'pr.price_min_ttc'=>"product",
 			'pr.tva_tx'=>'product',
 			'pr.date_price'=>"product");
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
@@ -282,11 +282,11 @@ class modProduct extends DolibarrModules
 		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r]=array('pr'=>MAIN_DB_PREFIX.'product_price');
 		$this->import_tables_creator_array[$r]=array('pr'=>'fk_user_author');	// Fields to store import user id
-		$this->import_fields_array[$r]=array('pr.fk_product'=>"ProductRowid*",
-			'pr.price_base_type'=>"PriceLevelPriceBase",'pr.price_level'=>"PriceLevel",
-			'pr.price'=>"PriceLevelUnitPriceHT",'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
-			'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
-			'pr.tva_tx'=>'PriceLevelVATRate',
+		$this->import_fields_array[$r]=array('pr.fk_product'=>"Id*",
+			'pr.price_base_type'=>"PriceBase",'pr.price_level'=>"PriceLevel",
+			'pr.price'=>"HT",'pr.price_ttc'=>"TTC",
+			'pr.price_min'=>"MinPriceHT",'pr.price_min_ttc'=>"MinPriceTTC",
+			'pr.tva_tx'=>'VAT',
 			'pr.date_price'=>'DateCreation*');
 		$this->import_regex_array[$r]=array('pr.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
 		$this->import_examplevalues_array[$r]=array('pr.fk_product'=>"1",

htdocs/exports/export.php

@@ -94,7 +94,8 @@ $entitytolang = array(
     'shipment_line'=> 'ShipmentLine',
     'project'      => 'Projects',
     'projecttask'  => 'Tasks',
-    'task_time'    => 'TaskTimeSpent'
+    'task_time'    => 'TaskTimeSpent',
+	'action'       => 'Action'
 );
 
 $array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array();

htdocs/langs/en_US/exports.lang

@@ -8,7 +8,7 @@ ImportableDatas=Importable dataset
 SelectExportDataSet=Choose dataset you want to export...
 SelectImportDataSet=Choose dataset you want to import...
 SelectExportFields=Choose fields you want to export, or select a predefined export profile
-SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profil:
+SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
 NotImportedFields=Fields of source file not imported
 SaveExportModel=Save this export profile if you plan to reuse it later...
 SaveImportModel=Save this import profile if you plan to reuse it later...
@@ -81,7 +81,7 @@ DoNotImportFirstLine=Do not import first line of source file
 NbOfSourceLines=Number of lines in source file
 NowClickToTestTheImport=Check import parameters you have defined. If they are correct, click on button "<b>%s</b>" to launch a simulation of import process (no data will be changed in your database, it's only a simulation for the moment)...
 RunSimulateImportFile=Launch the import simulation 
-FieldNeedSource=This fiels in database require a data from source file
+FieldNeedSource=This field requires data from the source file
 SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
 InformationOnSourceFile=Information on source file
 InformationOnTargetTables=Information on target fields

htdocs/langs/en_US/products.lang

@@ -66,6 +66,8 @@ PublicPrice=Public price
 CurrentPrice=Current price
 NewPrice=New price
 MinPrice=Minim. selling price
+MinPriceHT=Minim. selling price (net of tax)
+MinPriceTTC=Minim. selling price (inc. tax)
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatus=Contract status
 ContractStatusClosed=Closed