Merge remote-tracking branch 'upstream/develop' into socialnetworks

htdocs/langs/en_US/boxes.lang

@@ -66,6 +66,7 @@ NoContractedProducts=No products/services contracted
 NoRecordedContracts=No recorded contracts
 NoRecordedInterventions=No recorded interventions
 BoxLatestSupplierOrders=Latest purchase orders
+BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
 NoSupplierOrder=No recorded purchase order
 BoxCustomersInvoicesPerMonth=Customer Invoices per month
 BoxSuppliersInvoicesPerMonth=Vendor Invoices per month

htdocs/langs/en_US/interventions.lang

@@ -60,6 +60,7 @@ InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
 InterNote=Note intervention
+InterLine=Line of intervention
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention

htdocs/langs/en_US/main.lang

@@ -169,6 +169,7 @@ ToValidate=To validate
 NotValidated=Not validated
 Save=Save
 SaveAs=Save As
+SaveAndStay=Save and stay
 TestConnection=Test connection
 ToClone=Clone
 ConfirmClone=Choose data you want to clone:
@@ -475,7 +476,9 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromLocation=From
 to=to
+To=to
 and=and
 or=or
 Other=Other

htdocs/langs/en_US/modulebuilder.lang

@@ -60,6 +60,8 @@ HooksFile=File for hooks code
 ArrayOfKeyValues=Array of key-val
 ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
 WidgetFile=Widget file
+CSSFile=CSS file
+JSFile=Javascript file
 ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
@@ -77,6 +79,7 @@ NoTrigger=No trigger
 NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfMenusEntries=List of menu entries
+ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
@@ -86,8 +89,10 @@ SearchAllDesc=Is the field used to make a search from the quick search tool? (Ex
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
 MenusDefDesc=Define here the menus provided by your module
+DictionariesDefDesc=Define here the dictionaries provided by your module
 PermissionsDefDesc=Define here the new permissions provided by your module
 MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
 PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
@@ -109,6 +114,8 @@ ContentOfREADMECustomized=Note: The content of the README.md file has been repla
 RealPathOfModule=Real path of module
 ContentCantBeEmpty=Content of file can't be empty
 WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
+CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
+JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
 CLIDesc=You can generate here some command line scripts you want to provide with your module.
 CLIFile=CLI File
 NoCLIFile=No CLI files

htdocs/langs/en_US/mrp.lang

@@ -1,4 +1,5 @@
 Mrp=Manufacturing Orders
+MO=Manufacturing Order
 MRPDescription=Module to manage Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MO

htdocs/langs/en_US/orders.lang

@@ -11,6 +11,7 @@ OrderDate=Order date
 OrderDateShort=Order date
 OrderToProcess=Order to process
 NewOrder=New order
+NewOrderSupplier=New Purchase Order
 ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
@@ -70,6 +71,7 @@ DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s Reopened
 AddOrder=Create order
+AddPurchaseOrder=Create purchase order
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
 OrdersOpened=Orders to process

htdocs/langs/en_US/products.lang

@@ -292,6 +292,7 @@ ProductWeight=Weight for 1 product
 ProductVolume=Volume for 1 product
 WeightUnits=Weight unit
 VolumeUnits=Volume unit
+SurfaceUnits=Surface unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?