Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/langs/en_US/donations.lang

@@ -56,3 +56,4 @@ project=Cause
 donAnonymous=Anonymous donation
 AnonymousDonationTooltip=Check this box if you want your donation to remain anonymous. Your personal information will not be asked.
 publicDonationFieldHelp=%s can publish my donation in the public register
+listOfPublicDonations=List of public donations

htdocs/langs/en_US/website.lang

@@ -392,7 +392,7 @@ makeDonation=Make a Donation
 contact=Contact
 memberArea=Member Area
 noCompanyInfoSlogan=No company information defined
-noCompanyInfoDescription=No company %s and %s provided. Please update it in Company & Organization settings.
+noCompanyInfoDescription=No company %s provided. Please update it in Company & Organization settings.
 highlights=Highlights
 volunteer=Volunteer
 member=Member
@@ -429,3 +429,19 @@ joinUs=Join US
 home=Home
 anonymous=Anonymous
 words=words
+eventsArea=Events Area
+membersArea=Members Area
+USE_TEXT_LOGO=Use Text Logo
+CUSTOM_SLOGAN=Custom Slogan
+CUSTOM_DESCRIPTION=Custom Description
+SUPPORTED_LANGS=Supported Languages
+MAIN_COLOR=Hexa main color
+SECONDARY_COLOR=Hexa secondary color
+ENABLE_MEMBER_REGISTRATION_PAGE=Enable Member Registration Page
+ENABLE_MEMBER_LIST_PAGE=Enable Member List Page
+ENABLE_MEMBER_AREA_PAGE=Enable Member Area Page
+ENABLE_EVENTS_SECTION=Enable Events Section
+SHOW_EVENT_PARTICIPATE_LINK=Show Event Participate Link
+ENABLE_DONATION_PAGE=Enable Donation Page
+TEMPLATE_MODULES_NOTICE=This template supports the following modules: <strong>Members</strong>, <strong>Events</strong>, <strong>webportal</strong>, and <strong>Donations</strong>. If any of these modules are not enabled, you can activate them to unlock additional configuration options.
+SetupAndProperties=Setup And Properties