Merge remote-tracking branch 'upstream/develop' into 14a15

htdocs/langs/en_US/admin.lang

@@ -2105,3 +2105,4 @@ AskThisIDToYourBank=Contact your bank to get this ID
 AdvancedModeOnly=Permision available in Advanced permission mode only
 ConfFileIsReadableOrWritableByAnyUsers=The conf file is reabable or writable by any users. Give permission to web server user and group only.
 MailToSendEventOrganization=Event Organization
+AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form

htdocs/langs/en_US/dict.lang

@@ -21,7 +21,7 @@ CountryNL=Netherlands
 CountryHU=Hungary
 CountryRU=Russia
 CountrySE=Sweden
-CountryCI=Ivoiry Coast
+CountryCI=Ivory Coast
 CountrySN=Senegal
 CountryAR=Argentina
 CountryCM=Cameroon

htdocs/langs/en_US/donations.lang

@@ -32,3 +32,4 @@ DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
 DonationPayment=Donation payment
 DonationValidated=Donation %s validated
+DonationUseThirdparties=Use an existing thirdparty as coordinates of donators

htdocs/langs/en_US/main.lang

@@ -361,7 +361,7 @@ UnitPriceHTCurrency=Unit price (excl.) (currency)
 UnitPriceTTC=Unit price
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
@@ -1125,3 +1125,4 @@ ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
 CopiedToClipboard=Copied to clipboard
+InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.

htdocs/langs/en_US/website.lang

@@ -136,4 +136,8 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 PagesRegenerated=%s page(s)/container(s) regenerated
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
+GenerateSitemaps=Generate website sitemap file
+ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
+ConfirmSitemapsCreation=Confirm sitemap generation
+SitemapGenerated=Sitemap Generated

htdocs/langs/fr_FR/main.lang

@@ -361,7 +361,7 @@ UnitPriceHTCurrency=Prix ​​unitaire (HT) (devise)
 UnitPriceTTC=Prix unitaire TTC
 PriceU=P.U.
 PriceUHT=P.U. HT
-PriceUHTCurrency=P.U. (devise)
+PriceUHTCurrency=P.U. HT (devise)
 PriceUTTC=P.U TTC
 Amount=Montant
 AmountInvoice=Montant facture